Copilot commented on code in PR #801:
URL: https://github.com/apache/ranger/pull/801#discussion_r2684812491
##########
agents-common/src/main/java/org/apache/ranger/authorization/utils/JsonUtils.java:
##########
@@ -47,235 +46,228 @@
public class JsonUtils {
private static final Logger LOG = LoggerFactory.getLogger(JsonUtils.class);
- private static final TypeReference TYPE_MAP_STRING_STRING =
new TypeReference<Map<String, String>>() {};
- private static final TypeReference TYPE_SET_STRING =
new TypeReference<Set<String>>() {};
- private static final TypeReference TYPE_LIST_STRING =
new TypeReference<List<String>>() {};
- private static final TypeReference TYPE_LIST_RANGER_VALIDITY_SCHEDULE =
new TypeReference<List<RangerValiditySchedule>>() {};
- private static final TypeReference TYPE_LIST_AUDIT_FILTER =
new TypeReference<List<AuditFilter>>() {};
- private static final TypeReference TYPE_LIST_RANGER_VALIDITY_RECURRENCE =
new TypeReference<List<RangerValidityRecurrence>>() {};
- private static final TypeReference TYPE_LIST_RANGER_PRINCIPAL =
new TypeReference<List<RangerPrincipal>>() {};
- private static final TypeReference TYPE_MAP_RANGER_MASK_INFO =
new TypeReference<Map<String, RangerPolicyItemDataMaskInfo>>() {};
- private static final TypeReference TYPE_MAP_RANGER_POLICY_RESOURCE =
new TypeReference<Map<String, RangerPolicyResource>>() {};
- private static final TypeReference TYPE_LIST_RANGER_TAG =
new TypeReference<List<RangerTag>>() {};
-
- static private final ThreadLocal<ObjectMapper> MAPPER = new
ThreadLocal<ObjectMapper>() {
- @Override
- protected ObjectMapper initialValue() {
- ObjectMapper objectMapper = new ObjectMapper();
- objectMapper.setDateFormat(new
SimpleDateFormat("yyyyMMdd-HH:mm:ss.SSS-Z"));
- objectMapper.configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES,
true);
- objectMapper.configure(FAIL_ON_UNKNOWN_PROPERTIES, false);
- return objectMapper;
- }
- };
+ private static final TypeReference<Map<String, String>>
TYPE_MAP_STRING_STRING = new TypeReference<Map<String,
String>>() {};
+ private static final TypeReference<Set<String>>
TYPE_SET_STRING = new TypeReference<Set<String>>() {};
+ private static final TypeReference<List<String>>
TYPE_LIST_STRING = new TypeReference<List<String>>() {};
+ private static final TypeReference<List<RangerValiditySchedule>>
TYPE_LIST_RANGER_VALIDITY_SCHEDULE = new
TypeReference<List<RangerValiditySchedule>>() {};
+ private static final TypeReference<List<AuditFilter>>
TYPE_LIST_AUDIT_FILTER = new
TypeReference<List<AuditFilter>>() {};
+ private static final TypeReference<List<RangerValidityRecurrence>>
TYPE_LIST_RANGER_VALIDITY_RECURRENCE = new
TypeReference<List<RangerValidityRecurrence>>() {};
+ private static final TypeReference<List<RangerPrincipal>>
TYPE_LIST_RANGER_PRINCIPAL = new
TypeReference<List<RangerPrincipal>>() {};
+ private static final TypeReference<Map<String,
RangerPolicyItemDataMaskInfo>> TYPE_MAP_RANGER_MASK_INFO = new
TypeReference<Map<String, RangerPolicyItemDataMaskInfo>>() {};
+ private static final TypeReference<Map<String, RangerPolicyResource>>
TYPE_MAP_RANGER_POLICY_RESOURCE = new TypeReference<Map<String,
RangerPolicyResource>>() {};
+ private static final TypeReference<List<RangerTag>>
TYPE_LIST_RANGER_TAG = new TypeReference<List<RangerTag>>()
{};
+
+ private static final ThreadLocal<ObjectMapper> MAPPER =
ThreadLocal.withInitial(() -> {
+ ObjectMapper objectMapper = new ObjectMapper();
+
+ objectMapper.setDateFormat(new
SimpleDateFormat("yyyyMMdd-HH:mm:ss.SSS-Z"));
+ objectMapper.configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true);
+ objectMapper.configure(FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+ return objectMapper;
+ });
static public ObjectMapper getMapper() {
return MAPPER.get();
}
public static String mapToJson(Map<?, ?> map) {
- String ret = null;
if (MapUtils.isNotEmpty(map)) {
try {
- ret = getMapper().writeValueAsString(map);
+ return getMapper().writeValueAsString(map);
} catch (Exception e) {
LOG.error("Invalid input data: ", e);
}
}
- return ret;
+
+ return null;
}
public static String listToJson(List<?> list) {
- String ret = null;
if (CollectionUtils.isNotEmpty(list)) {
try {
- ret = getMapper().writeValueAsString(list);
+ return getMapper().writeValueAsString(list);
} catch (Exception e) {
LOG.error("Invalid input data: ", e);
}
}
- return ret;
+
+ return null;
}
public static String setToJson(Set<?> set) {
- String ret = null;
if (CollectionUtils.isNotEmpty(set)) {
try {
- ret = getMapper().writeValueAsString(set);
+ return getMapper().writeValueAsString(set);
} catch (Exception e) {
LOG.error("Invalid input data: ", e);
}
}
- return ret;
+
+ return null;
}
public static String objectToJson(Object object) {
- String ret = null;
-
- if(object != null) {
+ if (object != null) {
try {
- ret = getMapper().writeValueAsString(object);
+ return getMapper().writeValueAsString(object);
} catch(Exception excp) {
LOG.warn("objectToJson() failed to convert object to Json",
excp);
}
}
- return ret;
+ return null;
}
- public static <T> T jsonToObject(Reader reader, Class<T> clz) {
- T ret = null;
-
- if(null != reader) {
+ public static <T> T jsonToObject(Reader reader, Class<T> clz) {
+ if (null != reader) {
try {
- ret = getMapper().readValue(reader, clz);
+ return getMapper().readValue(reader, clz);
} catch(Exception excp) {
- LOG.warn("jsonToObject() failed to convert json to object:
class " + clz + " reader ", excp);
+ LOG.warn("jsonToObject() failed to convert json to object:
class {} reader ", clz, excp);
}
}
- return ret;
+ return null;
}
- public static <T> void objectToWriter(Writer writer, T object) {
- if(null != writer) {
+ public static <T> void objectToWriter(Writer writer, T object) {
+ if (null != writer) {
try {
getMapper().writeValue(writer, object);
} catch(Exception excp) {
- LOG.warn("objectToWriter() failed to write oject to writer:
class " + object + " writer ", excp);
+ LOG.warn("objectToWriter() failed to write oject to writer:
class {} writer ", object, excp);
Review Comment:
Corrected spelling of 'oject' to 'object'.
```suggestion
LOG.warn("objectToWriter() failed to write object to writer:
class {} writer ", object, excp);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
