Skip to content

Commit 9340e9a

Browse files
robinhood-jimrobinhood-jim
committed
ConvertUtil refactor
1 parent 0ee39b8 commit 9340e9a

File tree

44 files changed

+328
-169
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+328
-169
lines changed

‎common/src/main/java/com/robin/core/fileaccess/fs/ApacheVfsFileSystemAccessor.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public Pair<BufferedReader, InputStream> getInResourceByReader(String resourcePa
4949
VfsParam param = new VfsParam();
5050
InputStream stream;
5151
try {
52-
ConvertUtil.convertToTarget(param, colmeta.getResourceCfgMap());
52+
ConvertUtil.convertToTarget(colmeta.getResourceCfgMap(), param);
5353
FileObject fileObject = manager.resolveFile(getUriByParam(param, resourcePath).toString(), getOptions(param));
5454
checkAndSetFileObject(fileObject);
5555
stream = getInResource(fileObject, colmeta);
@@ -92,7 +92,7 @@ public OutputStream getOutResourceByStream(String resourcePath) throws IOExcepti
9292
public InputStream getInResourceByStream(String resourcePath) throws IOException {
9393
VfsParam param = new VfsParam();
9494
try {
95-
ConvertUtil.convertToTarget(param, colmeta.getResourceCfgMap());
95+
ConvertUtil.convertToTarget(colmeta.getResourceCfgMap(), param);
9696
FileObject fileObject = manager.resolveFile(getUriByParam(param, resourcePath).toString(), getOptions(param));
9797
checkAndSetFileObject(fileObject);
9898
return getInResource(fileObject, colmeta);
@@ -104,7 +104,7 @@ public InputStream getInResourceByStream(String resourcePath) throws IOException
104104
public static FileObject getFileObject(FileSystemManager manager, DataCollectionMeta meta, String resPath) throws IOException {
105105
VfsParam param = new VfsParam();
106106
try {
107-
ConvertUtil.convertToTarget(param, meta.getResourceCfgMap());
107+
ConvertUtil.convertToTarget(meta.getResourceCfgMap(), param);
108108
return manager.resolveFile(getUriByParam(param, resPath).toString(), getOptions(param));
109109
} catch (Exception ex) {
110110
throw new IOException(ex);
@@ -162,7 +162,7 @@ public List<String> listFilePath(VfsParam param, String path) {
162162

163163
public FileObject createNotExists(DataCollectionMeta meta, String resourcePath) throws Exception {
164164
VfsParam param = new VfsParam();
165-
ConvertUtil.convertToTarget(param, meta.getResourceCfgMap());
165+
ConvertUtil.convertToTarget(meta.getResourceCfgMap(), param);
166166
try (FileObject fo = manager.resolveFile(getUriByParam(param, resourcePath).toString(), getOptions(param))) {
167167
if (fo.exists()) {
168168
if (FileType.FOLDER.equals(fo.getType())) {
@@ -209,7 +209,7 @@ public OutputStream getRawOutputStream(String resourcePath) throws IOException {
209209
public InputStream getRawInputStream(String resourcePath) throws IOException {
210210
VfsParam param = new VfsParam();
211211
try {
212-
ConvertUtil.convertToTarget(param, colmeta.getResourceCfgMap());
212+
ConvertUtil.convertToTarget(colmeta.getResourceCfgMap(), param);
213213
FileObject fileObject = manager.resolveFile(getUriByParam(param, resourcePath).toString(), getOptions(param));
214214
checkAndSetFileObject(fileObject);
215215
return getRawInResource(fileObject, colmeta);
@@ -284,7 +284,7 @@ public VfsParam returnFtpParam(String hostName, int port, String userName, Strin
284284
public boolean exists(String resourcePath) throws IOException {
285285
VfsParam param = new VfsParam();
286286
try {
287-
ConvertUtil.convertToTarget(param, colmeta.getResourceCfgMap());
287+
ConvertUtil.convertToTarget(colmeta.getResourceCfgMap(), param);
288288
} catch (Exception ex) {
289289
throw new IOException(ex);
290290
}
@@ -299,7 +299,7 @@ public boolean exists(String resourcePath) throws IOException {
299299
public long getInputStreamSize(String resourcePath) throws IOException {
300300
VfsParam param = new VfsParam();
301301
try {
302-
ConvertUtil.convertToTarget(param, colmeta.getResourceCfgMap());
302+
ConvertUtil.convertToTarget(colmeta.getResourceCfgMap(), param);
303303
} catch (Exception ex) {
304304
throw new IOException(ex);
305305
}

‎core/src/main/java/com/robin/core/base/dao/SqlMapperDao.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import javax.sql.DataSource;
2525
import java.lang.invoke.MethodHandle;
26-
import java.lang.reflect.Method;
2726
import java.sql.ResultSetMetaData;
2827
import java.sql.SQLException;
2928
import java.util.ArrayList;
@@ -120,7 +119,7 @@ private Map<String, Object> wrapSqlAndParameter(String nameSpace, String id, Str
120119
}
121120
} else {
122121
try {
123-
ConvertUtil.objectToMapObj(paramMap, params[0]);
122+
ConvertUtil.objectToMapObj(params[0], paramMap);
124123
} catch (Exception ex) {
125124
throw new DAOException(ex);
126125
}

‎core/src/main/java/com/robin/core/base/datameta/BaseDataBaseMeta.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public String getUrl(){
6161
return param.getUrlByMeta(this);
6262
}
6363
protected void processParam(Map<String,String> map) throws Exception{
64-
ConvertUtil.objectToMap(map, param);
64+
ConvertUtil.objectToMap(param, map);
6565
}
6666

6767
protected BaseDataBaseMeta(DataBaseParam param){

‎core/src/main/java/com/robin/core/base/datameta/DataBaseParam.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public String getUrlByMeta(BaseDataBaseMeta dbMeta){
7070
}
7171
protected Map<String,String> processParam() throws Exception{
7272
Map<String,String> map=new HashMap<>();
73-
ConvertUtil.objectToMap(map, this);
73+
ConvertUtil.objectToMap(this, map);
7474
return map;
7575
}
7676

‎core/src/main/java/com/robin/core/base/reflect/ReflectUtils.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
import java.lang.invoke.MethodHandles;
1515
import java.lang.reflect.Field;
1616
import java.lang.reflect.InvocationTargetException;
17-
1817
import java.lang.reflect.Method;
19-
import java.lang.reflect.Type;
2018
import java.math.BigDecimal;
2119
import java.util.ArrayList;
2220
import java.util.HashMap;

‎core/src/main/java/com/robin/core/base/service/AbstractMybatisService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ public boolean createWithRequest(Object requsetObj) {
467467
try {
468468
T obj = voType.newInstance();
469469
if (requsetObj.getClass().getInterfaces().length > 0 && requsetObj.getClass().getInterfaces()[0].isAssignableFrom(Map.class)) {
470-
ConvertUtil.mapToBaseObject(obj, (HashMap) requsetObj);
470+
ConvertUtil.mapToBaseObject((HashMap) requsetObj, obj);
471471
} else {
472472
Map<String, MethodHandle> modelGetMetholds = ReflectUtils.returnGetMethodHandle(requsetObj.getClass());
473473
Iterator<Map.Entry<String, MethodHandle>> iter = modelGetMetholds.entrySet().iterator();

‎core/src/main/java/com/robin/core/base/service/util/QueryWrapperUtils.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,12 @@
1111
import com.robin.core.convert.util.ConvertUtil;
1212
import com.robin.core.query.util.Condition;
1313
import lombok.extern.slf4j.Slf4j;
14-
import org.springframework.beans.BeanUtils;
1514
import org.springframework.util.Assert;
1615
import org.springframework.util.CollectionUtils;
1716
import org.springframework.util.ObjectUtils;
1817
import org.springframework.util.StringUtils;
1918

2019
import java.lang.invoke.MethodHandle;
21-
import java.lang.reflect.Field;
22-
import java.lang.reflect.Method;
2320
import java.sql.Timestamp;
2421
import java.time.LocalDate;
2522
import java.time.LocalDateTime;
@@ -185,7 +182,7 @@ protected static Object returnTimeColumn(String value, Class<?> clazz) {
185182
}
186183
private static Map<String, Object> returnValueMap(PageDTO targetObj) throws Exception {
187184
Map<String, Object> getMap = new HashMap<>();
188-
ConvertUtil.objectToMapObj(getMap,targetObj,"param","order","page","limit","size","orderField","orderBy");
185+
ConvertUtil.objectToMapObj(targetObj, getMap, "param","order","page","limit","size","orderField","orderBy");
189186
if (!CollectionUtils.isEmpty(targetObj.getParam())) {
190187
getMap.putAll(targetObj.getParam());
191188
}

‎core/src/main/java/com/robin/core/collection/util/CollectionMapConvert.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import javax.script.CompiledScript;
3030
import java.lang.invoke.MethodHandle;
3131
import java.lang.reflect.InvocationTargetException;
32-
import java.lang.reflect.Method;
3332
import java.util.ArrayList;
3433
import java.util.HashMap;
3534
import java.util.List;
@@ -181,7 +180,7 @@ public static <T> List<T> filterListByColumnCondition(List<T> listobj, String sc
181180
Map<String, Object> valueMap = new HashMap<>();
182181
try {
183182
bindings.clear();
184-
ConvertUtil.objectToMapObj(valueMap, f);
183+
ConvertUtil.objectToMapObj(f, valueMap);
185184
bindings.putAll(valueMap);
186185
return (Boolean) script.eval(bindings);
187186
}catch (Exception ex){

0 commit comments

Comments
 (0)