Skip to content

update log message && add some info logs #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yndu13 merged 1 commit into from
Feb 8, 2023
Merged

update log message && add some info logs #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 48 additions & 23 deletions src/main/java/com/aliyun/tea/TeaModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public static Object parseObject(Object o) {
}
}

private static Object buildObject(Object o, Class self, Type subType) {
private static Object buildObject(Object o, Class self, Type subType, String objectName) {
Class valueClass = o.getClass();
if (Map.class.isAssignableFrom(self) && Map.class.isAssignableFrom(valueClass)) {
Map<String, Object> valueMap = (Map<String, Object>) o;
Expand All @@ -120,11 +120,11 @@ private static Object buildObject(Object o, Class self, Type subType) {
if (null == subType || subType instanceof WildcardType) {
result.put(entry.getKey(), entry.getValue());
} else if (subType instanceof Class) {
result.put(entry.getKey(), buildObject(entry.getValue(), (Class) subType, null));
result.put(entry.getKey(), buildObject(entry.getValue(), (Class) subType, null, objectName));
} else {
ParameterizedType parameterizedType = (ParameterizedType) subType;
Type[] types = parameterizedType.getActualTypeArguments();
result.put(entry.getKey(), buildObject(entry.getValue(), (Class) parameterizedType.getRawType(), types[types.length - 1]));
result.put(entry.getKey(), buildObject(entry.getValue(), (Class) parameterizedType.getRawType(), types[types.length - 1], objectName));
}
}
return result;
Expand All @@ -135,11 +135,11 @@ private static Object buildObject(Object o, Class self, Type subType) {
if (null == subType || subType instanceof WildcardType) {
result.add(object);
} else if (subType instanceof Class) {
result.add(buildObject(object, (Class) subType, null));
result.add(buildObject(object, (Class) subType, null, objectName));
} else {
ParameterizedType parameterizedType = (ParameterizedType) subType;
Type[] types = parameterizedType.getActualTypeArguments();
result.add(buildObject(object, (Class) parameterizedType.getRawType(), types[types.length - 1]));
result.add(buildObject(object, (Class) parameterizedType.getRawType(), types[types.length - 1], objectName));
}
}
return result;
Expand All @@ -150,7 +150,7 @@ private static Object buildObject(Object o, Class self, Type subType) {
throw new TeaException(e.getMessage(), e);
}
} else {
return confirmType(self, o);
return confirmType(self, o, objectName);
}
}

Expand All @@ -177,13 +177,13 @@ public static <T extends TeaModel> T toModel(Map<String, ?> map, T model) {
if (value == null) {
continue;
}
result = setTeaModelField(result, field, value, false);
result = setTeaModelField(result, field, value, result.getClass().getName() + "." + field.getName(), false);
}
return result;
}

@SuppressWarnings("unchecked")
private static <T extends TeaModel> T setTeaModelField(T model, Field field, Object value, boolean userBuild) {
private static <T extends TeaModel> T setTeaModelField(T model, Field field, Object value, String objectName, boolean userBuild) {
try {
Class<?> clazz = field.getType();
Object resultValue = parseNumber(value, clazz);
Expand All @@ -198,11 +198,11 @@ private static <T extends TeaModel> T setTeaModelField(T model, Field field, Obj
field.set(result, resultValue);
}
} else if (Map.class.isAssignableFrom(clazz)) {
field.set(result, buildObject(resultValue, Map.class, getType(field, 1)));
field.set(result, buildObject(resultValue, Map.class, getType(field, 1), objectName));
} else if (List.class.isAssignableFrom(clazz)) {
field.set(result, buildObject(resultValue, List.class, getType(field, 0)));
field.set(result, buildObject(resultValue, List.class, getType(field, 0), objectName));
} else {
field.set(result, confirmType(clazz, resultValue));
field.set(result, confirmType(clazz, resultValue, objectName));
}
return result;
} catch (Exception e) {
Expand All @@ -227,7 +227,7 @@ public static <T extends TeaModel> T build(Map<String, ?> map, T model) {
continue;
}
}
result = setTeaModelField(result, field, value, true);
result = setTeaModelField(result, field, value, result.getClass().getName() + "." + field.getName(), true);
}
return result;
}
Expand Down Expand Up @@ -348,21 +348,35 @@ public static void validateParams(TeaModel teaModel, String paramName) {
}

public static Object confirmType(Class expect, Object object) {
return confirmType(expect, object, "unknown");
}

public static Object confirmType(Class expect, Object object, String objectName) {
BigDecimal bigDecimal;
if (String.class.isAssignableFrom(expect)) {
if (object instanceof Number || object instanceof Boolean) {
logger.info("[{}] There are some cast events happening. expect: {}, but: {}, value: {}.",
objectName, String.class.getName(), object.getClass().getName(), object.toString());
return object.toString();
}
if (object instanceof Map || object instanceof List) {
logger.info("[{}] There are some cast events happening. expect: {}, but: {}, value: {}.",
objectName, String.class.getName(), object.getClass().getName(), object.toString());
return new Gson().toJson(object);
}
} else if (Boolean.class.isAssignableFrom(expect)) {
if (object instanceof String) {
logger.info("[{}] There are some cast events happening. expect: {}, but: {}, value: {}.",
objectName, Boolean.class.getName(), object.getClass().getName(), object.toString());
return Boolean.parseBoolean(String.valueOf(object));
} else if (object instanceof Integer) {
if (object.toString().equals("1")) {
logger.info("[{}] There are some cast events happening. expect: {}, but: {}, value: {}.",
objectName, Boolean.class.getName(), object.getClass().getName(), object.toString());
return true;
} else if (object.toString().equals("0")) {
logger.info("[{}] There are some cast events happening. expect: {}, but: {}, value: {}.",
objectName, Boolean.class.getName(), object.getClass().getName(), object.toString());
return false;
}
}
Expand All @@ -371,77 +385,88 @@ public static Object confirmType(Class expect, Object object) {
try {
Integer.parseInt(object.toString());
} catch (NumberFormatException e) {
logger.warning("There are some cast events happening. expect: {}, but: {}, value: {}.", Integer.class.getName(), object.getClass().getName(), object.toString());
logger.warning("[{}] There are some cast events happening. expect: {}, but: {}, value: {}.",
objectName, Integer.class.getName(), object.getClass().getName(), object.toString());
}
bigDecimal = new BigDecimal(object.toString());
return bigDecimal.intValue();
}
if (object instanceof Boolean) {
logger.warning("There are some cast events happening. expect: {}, but: {}, value: {}.", Integer.class.getName(), object.getClass().getName(), object.toString());
logger.warning("[{}] There are some cast events happening. expect: {}, but: {}, value: {}.",
objectName, Integer.class.getName(), object.getClass().getName(), object.toString());
return object.toString().equalsIgnoreCase("true") ? 1 : 0;
}
if (object instanceof Long) {
if ((Long) object > Integer.MAX_VALUE) {
logger.warning("There are some cast events happening. expect: {}, but: {}, value: {}.", Integer.class.getName(), object.getClass().getName(), object.toString());
logger.warning("[{}] There are some cast events happening. expect: {}, but: {}, value: {}.",
objectName, Integer.class.getName(), object.getClass().getName(), object.toString());
}
bigDecimal = new BigDecimal(object.toString());
return bigDecimal.intValue();
}
if (object instanceof Float || object instanceof Double) {
bigDecimal = new BigDecimal(object.toString());
logger.warning("There are some cast events happening. expect: {}, but: {}, value: {}.", Integer.class.getName(), object.getClass().getName(), object.toString());
logger.warning("[{}] There are some cast events happening. expect: {}, but: {}, value: {}.",
objectName, Integer.class.getName(), object.getClass().getName(), object.toString());
return bigDecimal.intValue();
}
} else if (Long.class.isAssignableFrom(expect)) {
if (object instanceof String || object instanceof Integer) {
try {
Long.parseLong(object.toString());
} catch (NumberFormatException e) {
logger.warning("There are some cast events happening. expect: {}, but: {}, value: {}.", Long.class.getName(), object.getClass().getName(), object.toString());
logger.warning("[{}] There are some cast events happening. expect: {}, but: {}, value: {}.",
objectName, Long.class.getName(), object.getClass().getName(), object.toString());
}
bigDecimal = new BigDecimal(object.toString());
return bigDecimal.longValue();
}
if (object instanceof Float || object instanceof Double) {
bigDecimal = new BigDecimal(object.toString());
logger.warning("There are some cast events happening. expect: {}, but: {}, value: {}.", Long.class.getName(), object.getClass().getName(), object.toString());
logger.warning("[{}] There are some cast events happening. expect: {}, but: {}, value: {}.",
objectName, Long.class.getName(), object.getClass().getName(), object.toString());
return bigDecimal.longValue();
}
} else if (Float.class.isAssignableFrom(expect)) {
if (object instanceof String) {
try {
Float.parseFloat(object.toString());
} catch (NumberFormatException e) {
logger.warning("There are some cast events happening. expect: {}, but: {}, value: {}.", Float.class.getName(), object.getClass().getName(), object.toString());
logger.warning("[{}] There are some cast events happening. expect: {}, but: {}, value: {}.",
objectName, Float.class.getName(), object.getClass().getName(), object.toString());
}
bigDecimal = new BigDecimal(object.toString());
return bigDecimal.floatValue();
}
if (object instanceof Double) {
if ((Double) object > Float.MAX_VALUE) {
logger.warning("There are some cast events happening. expect: {}, but: {}, value: {}.", Float.class.getName(), object.getClass().getName(), object.toString());
logger.warning("[{}] There are some cast events happening. expect: {}, but: {}, value: {}.",
objectName, Float.class.getName(), object.getClass().getName(), object.toString());
}
bigDecimal = new BigDecimal(object.toString());
return bigDecimal.floatValue();
}
if (object instanceof Integer || object instanceof Long) {
bigDecimal = new BigDecimal(object.toString());
logger.warning("There are some cast events happening. expect: {}, but: {}, value: {}.", Float.class.getName(), object.getClass().getName(), object.toString());
logger.warning("[{}] There are some cast events happening. expect: {}, but: {}, value: {}.",
objectName, Float.class.getName(), object.getClass().getName(), object.toString());
return bigDecimal.floatValue();
}
} else if (Double.class.isAssignableFrom(expect)) {
if (object instanceof String || object instanceof Float) {
try {
Double.parseDouble(object.toString());
} catch (NumberFormatException e) {
logger.warning("There are some cast events happening. expect: {}, but: {}, value: {}.", Double.class.getName(), object.getClass().getName(), object.toString());
logger.warning("[{}] There are some cast events happening. expect: {}, but: {}, value: {}.",
objectName, Double.class.getName(), object.getClass().getName(), object.toString());
}
bigDecimal = new BigDecimal(object.toString());
return bigDecimal.doubleValue();
}
if (object instanceof Integer || object instanceof Long) {
bigDecimal = new BigDecimal(object.toString());
logger.warning("There are some cast events happening. expect: {}, but: {}, value: {}.", Double.class.getName(), object.getClass().getName(), object.toString());
logger.warning("[{}] There are some cast events happening. expect: {}, but: {}, value: {}.",
objectName, Double.class.getName(), object.getClass().getName(), object.toString());
return bigDecimal.doubleValue();
}
}
Expand Down
15 changes: 11 additions & 4 deletions src/test/java/com/aliyun/tea/TeaModelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.aliyun.tea;

import com.aliyun.tea.logging.DefaultLogger;
import com.google.gson.internal.LinkedTreeMap;
import org.junit.Assert;
import org.junit.Test;
Expand Down Expand Up @@ -62,16 +63,21 @@ public static class SubModel extends TeaModel {

@Test
public void toModelTest() {
System.setProperty(DefaultLogger.SDK_LOG_LEVEL, "info");
Map<String, Object> map = new HashMap<>();
ArrayList testList = new ArrayList();
testList.add("test");
testList.add(1);
testList.add(true);
map.put("listTest", testList);
SubModel submodel = TeaModel.toModel(map, new SubModel());
Assert.assertNull(submodel.accessKeyId);
Assert.assertNull(submodel.limit);
Assert.assertNull(submodel.size);
Assert.assertNull(submodel.accessToken);
Assert.assertEquals("test", submodel.list.get(0));
Assert.assertEquals("1", submodel.list.get(1));
Assert.assertEquals("true", submodel.list.get(2));

map.put("accessToken", null);
map.put("limit", 1);
Expand All @@ -98,7 +104,7 @@ public void toModelTest() {
Assert.assertEquals("1", submodel.baseDriveResponse.driveId);

Map<String, Object> teaModelMap = new HashMap<>();
teaModelMap.put("driveId", "2");
teaModelMap.put("driveId", 2);
map.put("teaModel", teaModelMap);
submodel = TeaModel.toModel(map, new SubModel());
Assert.assertEquals("2", submodel.baseDriveResponse.driveId);
Expand Down Expand Up @@ -578,6 +584,7 @@ public void validateParamsTest() {

@Test
public void confirmTypeTest() {
System.setProperty(DefaultLogger.SDK_LOG_LEVEL, "info");
String str = "1";
Object object = TeaModel.confirmType(Integer.class, str);
Assert.assertEquals(1, object);
Expand Down Expand Up @@ -681,8 +688,8 @@ public void confirmTypeTest() {
object6 = TeaModel.confirmType(Float.class, doubleTest);
Float f = 1.0f;
Assert.assertTrue(Float.isInfinite((Float) object6));
Assert.assertTrue(Float.isInfinite((Float)object6 + f));
Assert.assertTrue(Float.isInfinite((Float)object6 * f));
Assert.assertTrue(Float.isInfinite((Float) object6 + f));
Assert.assertTrue(Float.isInfinite((Float) object6 * f));

doubleTest = Double.parseDouble(String.valueOf(Float.MAX_VALUE));
object6 = TeaModel.confirmType(Float.class, doubleTest);
Expand Down Expand Up @@ -713,7 +720,7 @@ public void confirmTypeTest() {
map.put("test4", sub);
object6 = TeaModel.confirmType(String.class, map);
Assert.assertEquals(String.class, object6.getClass());
String mapStr = (String)object6;
String mapStr = (String) object6;
Assert.assertTrue(mapStr.contains("\"test1\":\"1\""));
Assert.assertTrue(mapStr.contains("\"test2\":2"));
Assert.assertTrue(mapStr.contains("\"test3\":true"));
Expand Down