Use java streams and try resources

Author: nf-PostQuantum

src/main/java/com/authenteq/util/DriverUtils.java

@@ -24,9 +24,6 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * The Class DriverUtils.
  */
@@ -85,7 +82,7 @@ public static JsonObject makeSelfSortingGson(JsonObject input ) {
 
 	    JsonObject json = new JsonObject();
 
-        for( String key: input.keySet().stream().sorted().collect( Collectors.toList() ) ) {
+        input.keySet().stream().sorted().forEach(key -> {
             JsonElement j = input.get(key);
             if (j instanceof JsonObject) {
                 json.add(key, makeSelfSortingGson((JsonObject) j));
@@ -105,7 +102,7 @@ public static JsonObject makeSelfSortingGson(JsonObject input ) {
             } else {
                 json.add(key, j);
             }
-        }
+        });
 
         return json;
     }

src/main/java/com/authenteq/util/JsonUtils.java

@@ -7,6 +7,7 @@
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Stream;
 
 /**
  * Utility class for handling JSON serialization and deserialization.
@@ -35,7 +36,7 @@ public class JsonUtils {
 	 */
 	private JsonUtils() {
 	}
-	
+
 	private static synchronized GsonBuilder base()
 	{
 		GsonBuilder builder = new GsonBuilder();
@@ -58,11 +59,8 @@ private static synchronized GsonBuilder base()
 	public static Gson getGson() {
 		GsonBuilder builder = base();
 
-		for( TypeAdapter value : typeAdaptersDeserialize.values() )
-			builder.registerTypeAdapter( value.getType(), value.getSerializer() );
-
-		for( TypeAdapter value : typeAdaptersSerialize.values() )
-			builder.registerTypeAdapter( value.getType(), value.getSerializer() );
+		Stream.concat(typeAdaptersDeserialize.values().stream(), typeAdaptersSerialize.values().stream())
+				.forEach(value -> builder.registerTypeAdapter(value.getType(), value.getSerializer()));
 
 		return builder.create();
 	}
@@ -83,18 +81,9 @@ public static Gson getGson( Class ignoreClass, ExclusionStrategy... exclusionStr
 	{
 		GsonBuilder builder = base();
 
-		for( TypeAdapter value : typeAdaptersDeserialize.values() ) {
-			if( ignoreClass != null && value.getType().equals( ignoreClass ) )
-				continue;
-			builder.registerTypeAdapter( value.getType(), value.getSerializer() );
-		}
-
-		for( TypeAdapter value : typeAdaptersSerialize.values() ) {
-			if( ignoreClass != null && value.getType().equals( ignoreClass ) )
-				continue;
-
-			builder.registerTypeAdapter( value.getType(), value.getSerializer() );
-		}
+		Stream.concat(typeAdaptersDeserialize.values().stream(), typeAdaptersSerialize.values().stream())
+				.filter(value -> !value.getType().equals(ignoreClass))
+				.forEach(value -> builder.registerTypeAdapter(value.getType(), value.getSerializer()));
 
 		return builder.setExclusionStrategies( exclusionStrategies ).create();
 	}
@@ -171,7 +160,7 @@ public static String toJson(Object src, ExclusionStrategy ... exclusionStrategie
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#toString()
 	 */
 	@Override

src/main/java/com/authenteq/util/ScannerUtil.java

@@ -12,18 +12,13 @@ public class ScannerUtil {
 	 * exit when enter string "exit".
 	 */
 	public static void monitorExit() {
-		Scanner scanner = new Scanner(System.in);
-		try{
-	        while (true) { 
-		        String line = scanner.nextLine();
-		        if("exit".equals(line)){
-		        	break;
-		        }
-	        }
-		} catch (Exception ex) {
-			
-		} finally {
-			scanner.close();
+		try (Scanner scanner = new Scanner(System.in)) {
+			while (true) {
+				String line = scanner.nextLine();
+				if ("exit".equals(line)) {
+					break;
+				}
+			}
 		}
 	}
 }