Resolve PR review comments

Author: RovinKYK

components/org.wso2.carbon.identity.api.server.common/src/main/java/org/wso2/carbon/identity/api/server/common/file/FileSerializationConfig.java

@@ -39,14 +39,14 @@ public enum DefaultFormat {
     private DefaultFormat serializeDefault = DefaultFormat.YAML;
     private DefaultFormat deserializeDefault = DefaultFormat.YAML;
 
-    public FileSerializationConfig() {
-    }
+    public FileSerializationConfig() {}
 
     public XmlConfig getXmlConfig() {
         return xmlConfig;
     }
 
     public void setXmlConfig(XmlConfig config) {
+
         if (config == null) {
             throw new IllegalArgumentException("XmlConfig cannot be null");
         }
@@ -58,6 +58,7 @@ public JsonConfig getJsonConfig() {
     }
 
     public void setJsonConfig(JsonConfig config) {
+
         if (config == null) {
             throw new IllegalArgumentException("JsonConfig cannot be null");
         }
@@ -69,6 +70,7 @@ public YamlConfig getYamlConfig() {
     }
 
     public void setYamlConfig(YamlConfig config) {
+
         if (config == null) {
             throw new IllegalArgumentException("YamlConfig cannot be null");
         }
@@ -80,6 +82,7 @@ public DefaultFormat getSerializeDefault() {
     }
 
     public void setSerializeDefault(DefaultFormat serializeDefault) {
+
         this.serializeDefault = serializeDefault;
     }
 
@@ -88,6 +91,6 @@ public DefaultFormat getDeserializeDefault() {
     }
 
     public void setDeserializeDefault(DefaultFormat deserializeDefault) {
-        this.deserializeDefault = deserializeDefault;
-    }
+
+        this.deserializeDefault = deserializeDefault; }
 }

components/org.wso2.carbon.identity.api.server.common/src/main/java/org/wso2/carbon/identity/api/server/common/file/FileSerializationException.java

@@ -39,6 +39,7 @@ public enum Operation {
 
     public FileSerializationException(String message, Throwable cause,
                                       String fileName, String mediaType, Operation operation) {
+
         super(buildMessage(message, fileName, mediaType, operation), cause);
         this.fileName = fileName;
         this.mediaType = mediaType;
@@ -47,6 +48,7 @@ public FileSerializationException(String message, Throwable cause,
 
     private static String buildMessage(String message, String fileName,
                                         String mediaType, Operation operation) {
+
         return String.format("Error during %s operation for file '%s' (media type: %s): %s",
                 operation.name().toLowerCase(Locale.ENGLISH), fileName, mediaType, message);
     }

components/org.wso2.carbon.identity.api.server.common/src/main/java/org/wso2/carbon/identity/api/server/common/file/FileSerializationUtil.java

@@ -63,6 +63,7 @@ public class FileSerializationUtil {
      */
     public static <T> FileContent serialize(T entity, String fileName, String fileType,
                                             FileSerializationConfig config) throws FileSerializationException {
+
         if (LOG.isDebugEnabled()) {
             LOG.debug(String.format("Serializing entity of type %s to file %s with type %s", 
                     entity.getClass().getSimpleName(), fileName, fileType));
@@ -96,6 +97,7 @@ public static <T> FileContent serialize(T entity, String fileName, String fileTy
      */
     public static <T> FileContent serialize(T entity, String fileName, String fileType)
             throws FileSerializationException {
+
         return serialize(entity, fileName, fileType, new FileSerializationConfig());
     }
 
@@ -111,6 +113,7 @@ public static <T> FileContent serialize(T entity, String fileName, String fileTy
      */
     public static <T> T deserialize(FileContent fileContent, Class<T> targetClass,
                                     FileSerializationConfig config) throws FileSerializationException {
+
         if (LOG.isDebugEnabled()) {
             LOG.debug(String.format("Deserializing file %s of type %s to class %s",
                     fileContent.getFileName(), fileContent.getFileType(), targetClass.getSimpleName()));
@@ -143,6 +146,7 @@ public static <T> T deserialize(FileContent fileContent, Class<T> targetClass,
      */
     public static <T> T deserialize(FileContent fileContent, Class<T> targetClass)
             throws FileSerializationException {
+
         return deserialize(fileContent, targetClass, new FileSerializationConfig());
     }
 
@@ -152,6 +156,7 @@ public static <T> T deserialize(FileContent fileContent, Class<T> targetClass)
     private static <T> FileContent handleUnsupportedSerialize(T entity, String fileName, String fileType,
                                                               FileSerializationConfig config)
             throws FileSerializationException {
+
         FileSerializationConfig.DefaultFormat defaultFormat = config.getSerializeDefault();
 
         switch (defaultFormat) {
@@ -183,6 +188,7 @@ private static <T> FileContent handleUnsupportedSerialize(T entity, String fileN
     private static <T> T handleUnsupportedDeserialize(FileContent fileContent, Class<T> targetClass,
                                                       FileSerializationConfig config)
             throws FileSerializationException {
+
         FileSerializationConfig.DefaultFormat defaultFormat = config.getDeserializeDefault();
 
         switch (defaultFormat) {
@@ -214,6 +220,7 @@ private static <T> T handleUnsupportedDeserialize(FileContent fileContent, Class
      */
     private static <T> FileContent serializeToXml(T entity, String fileName, XmlConfig config)
             throws FileSerializationException {
+
         StringBuilder fileNameBuilder = new StringBuilder(fileName);
         fileNameBuilder.append(Constants.XML_FILE_EXTENSION);
 
@@ -246,6 +253,7 @@ private static <T> FileContent serializeToXml(T entity, String fileName, XmlConf
      */
     private static <T> FileContent serializeToJson(T entity, String fileName, JsonConfig config)
             throws FileSerializationException {
+
         StringBuilder fileNameBuilder = new StringBuilder(fileName);
         fileNameBuilder.append(Constants.JSON_FILE_EXTENSION);
 
@@ -268,6 +276,7 @@ private static <T> FileContent serializeToJson(T entity, String fileName, JsonCo
      */
     private static <T> FileContent serializeToYaml(T entity, String fileName, YamlConfig config)
             throws FileSerializationException {
+
         StringBuilder fileNameBuilder = new StringBuilder(fileName);
         fileNameBuilder.append(Constants.YAML_FILE_EXTENSION);
 
@@ -307,6 +316,7 @@ private static <T> FileContent serializeToYaml(T entity, String fileName, YamlCo
      */
     private static <T> T deserializeFromXml(FileContent fileContent, Class<T> targetClass,
                                             FileSerializationConfig config) throws FileSerializationException {
+
         try {
             List<Class<?>> classList = new ArrayList<>();
             classList.add(targetClass);
@@ -331,6 +341,7 @@ private static <T> T deserializeFromXml(FileContent fileContent, Class<T> target
      */
     private static <T> T deserializeFromJson(FileContent fileContent, Class<T> targetClass,
                                              FileSerializationConfig config) throws FileSerializationException {
+
         try {
             ObjectMapper objectMapper = new ObjectMapper();
 
@@ -352,6 +363,7 @@ private static <T> T deserializeFromJson(FileContent fileContent, Class<T> targe
      */
     private static <T> T deserializeFromYaml(FileContent fileContent, Class<T> targetClass,
                                              FileSerializationConfig config) throws FileSerializationException {
+
         try {
             LoaderOptions loaderOptions = new LoaderOptions();
 

components/org.wso2.carbon.identity.api.server.common/src/main/java/org/wso2/carbon/identity/api/server/common/file/JsonConfig.java

@@ -25,14 +25,15 @@ public class JsonConfig {
 
     private Class<?>[] subtypes = new Class<?>[0];
 
-    public JsonConfig() {
-    }
+    public JsonConfig() {}
 
     public Class<?>[] getSubtypes() {
+
         return subtypes != null ? subtypes.clone() : new Class<?>[0];
     }
 
     public void setSubtypes(Class<?>... classes) {
+
         this.subtypes = classes;
     }
 }

components/org.wso2.carbon.identity.api.server.common/src/main/java/org/wso2/carbon/identity/api/server/common/file/XmlConfig.java

@@ -30,14 +30,15 @@ public class XmlConfig {
     private Class<?>[] additionalJaxbClasses = new Class<?>[0];
     private Consumer<Marshaller> marshallerCustomizer = null;
 
-    public XmlConfig() {
-    }
+    public XmlConfig() {}
 
     public Class<?>[] getAdditionalJaxbClasses() {
+
         return additionalJaxbClasses != null ? additionalJaxbClasses.clone() : new Class<?>[0];
     }
 
     public void setAdditionalJaxbClasses(Class<?>... classes) {
+
         this.additionalJaxbClasses = classes;
     }
 
@@ -46,6 +47,7 @@ public Consumer<Marshaller> getMarshallerCustomizer() {
     }
 
     public void setMarshallerCustomizer(Consumer<Marshaller> customizer) {
+
         this.marshallerCustomizer = customizer;
     }
 }

components/org.wso2.carbon.identity.api.server.common/src/main/java/org/wso2/carbon/identity/api/server/common/file/YamlConfig.java

@@ -38,14 +38,14 @@ public class YamlConfig {
     private Function<DumperOptions, Representer> representerFactory = null;
     private List<String> additionalTrustedClassNames = new ArrayList<>();
 
-    public YamlConfig() {
-    }
+    public YamlConfig() {}
 
     public Consumer<DumperOptions> getDumperOptionsCustomizer() {
         return dumperOptionsCustomizer;
     }
 
     public void setDumperOptionsCustomizer(Consumer<DumperOptions> customizer) {
+
         this.dumperOptionsCustomizer = customizer;
     }
 
@@ -54,6 +54,7 @@ public Consumer<Constructor> getConstructorCustomizer() {
     }
 
     public void setConstructorCustomizer(Consumer<Constructor> customizer) {
+
         this.constructorCustomizer = customizer;
     }
 
@@ -62,6 +63,7 @@ public Consumer<Representer> getRepresenterCustomizer() {
     }
 
     public void setRepresenterCustomizer(Consumer<Representer> customizer) {
+
         this.representerCustomizer = customizer;
     }
 
@@ -70,14 +72,17 @@ public Function<DumperOptions, Representer> getRepresenterFactory() {
     }
 
     public void setRepresenterFactory(Function<DumperOptions, Representer> factory) {
+
         this.representerFactory = factory;
     }
 
     public List<String> getAdditionalTrustedClassNames() {
+
         return new ArrayList<>(additionalTrustedClassNames);
     }
 
     public void setAdditionalTrustedClasses(Class<?>... classes) {
+
         this.additionalTrustedClassNames = new ArrayList<>();
         for (Class<?> clazz : classes) {
             this.additionalTrustedClassNames.add(clazz.getName());