Merge pull request #1547 from aleksandy/cleanup

cleanup code

Author: xael-fry

framework/src/play/Invoker.java

@@ -443,8 +443,7 @@ public void run() {
                     if (!queue.isEmpty()) {
                         for (Future<?> task : new HashSet<>(queue.keySet())) {
                             if (task.isDone()) {
-                                executor.submit(queue.get(task));
-                                queue.remove(task);
+                                executor.submit(queue.remove(task));
                             }
                         }
                     }

framework/src/play/Logger.java

@@ -592,8 +592,7 @@ static boolean niceThrowable(org.apache.logging.log4j.Level level, Throwable e,
             StringWriter sw = new StringWriter();
 
             // Better format for Play exceptions
-            if (e instanceof PlayException) {
-                PlayException playException = (PlayException) e;
+            if (e instanceof PlayException playException) {
                 PrintWriter errorOut = new PrintWriter(sw);
                 errorOut.println("");
                 errorOut.println("");

framework/src/play/cache/MemcachedImpl.java

@@ -165,7 +165,7 @@ public Map<String, Object> get(String[] keys) {
         } catch (Exception e) {
             future.cancel(false);
         }
-        return Collections.<String, Object>emptyMap();
+        return Collections.emptyMap();
     }
 
     @Override

framework/src/play/classloading/BytecodeCache.java

@@ -61,7 +61,7 @@ public static byte[] getBytecode(String name, String source) {
                     hash.append((char) read);
                     offset++;
                 }
-                if (!hash(source).equals(hash.toString())) {
+                if (!hash(source).contentEquals(hash)) {
                     if (Logger.isTraceEnabled()) {
                         Logger.trace("Bytecode too old (%s != %s)", hash, hash(source));
                     }

framework/src/play/data/binding/Binder.java

@@ -799,7 +799,7 @@ private static Object internalDirectBind(String name, Annotation[] annotations,
                 return clazz.isPrimitive() ? false : null;
             }
 
-            if (value.equals("1") || value.toLowerCase().equals("on") || value.toLowerCase().equals("yes")) {
+            if (value.equals("1") || value.equalsIgnoreCase("on") || value.equalsIgnoreCase("yes")) {
                 return true;
             }
 

framework/src/play/data/binding/Unbinder.java

@@ -72,7 +72,7 @@ private static void unbindMap(Map<String, Object> result, Object src, Class<?> s
                 if (!isDirect(key.getClass())) {
                     throw new UnsupportedOperationException("Unbind won't work with indirect map keys yet");
                 }
-                String paramKey = name + '.' + key.toString();
+                String paramKey = name + '.' + key;
                 Unbinder.unBind(result, entry.getValue(), paramKey, annotations);
             }
         }
@@ -118,8 +118,7 @@ private static void internalUnbind(Map<String, Object> result, Object src, Class
                 for (Annotation annotation : annotations) {
                     if (annotation.annotationType().equals(As.class)) {
                         // Check the unbinder param first
-                        Class<? extends TypeUnbinder<?>> toInstantiate = (Class<? extends TypeUnbinder<?>>) ((As) annotation)
-                                .unbinder();
+                        Class<? extends TypeUnbinder<?>> toInstantiate = ((As) annotation).unbinder();
                         if (!(toInstantiate.equals(As.DEFAULT.class))) {
                             TypeUnbinder<?> myInstance = toInstantiate.getDeclaredConstructor().newInstance();
                             isExtendedTypeBinder = myInstance.unBind(result, src, srcClazz, name, annotations);

framework/src/play/data/parsing/ApacheMultipartParser.java

@@ -482,7 +482,7 @@ private static String getUniqueId() {
 
         @Override
         public String toString() {
-            return "name=" + this.getName() + ", StoreLocation=" + String.valueOf(this.getStoreLocation()) + ", size=" + this.getSize()
+            return "name=" + this.getName() + ", StoreLocation=" + this.getStoreLocation() + ", size=" + this.getSize()
                     + "bytes, " + "isFormField=" + isFormField() + ", FieldName=" + this.getFieldName();
         }
 

framework/src/play/data/parsing/TextParser.java

@@ -18,8 +18,7 @@ public Map<String, String[]> parse(InputStream is) {
             while ((b = is.read()) != -1) {
                 os.write(b);
             }
-            byte[] data = os.toByteArray();
-            params.put("body", new String[] {new String(data, Http.Request.current().encoding)});
+            params.put("body", new String[] {os.toString(Http.Request.current().encoding)});
             return params;
         } catch (Exception e) {
             throw new UnexpectedException(e);

framework/src/play/data/parsing/UrlEncodedParser.java

@@ -55,7 +55,7 @@ public Map<String, String[]> parse(InputStream is) {
                 os.write( buffer, 0, bytesRead);
             }
 
-            String data = new String(os.toByteArray(), encoding);
+            String data = os.toString(encoding);
             if (data.length() == 0) {
                 //data is empty - can skip the rest
                 return new HashMap<>(0);

framework/src/play/data/validation/EqualsCheck.java

@@ -36,8 +36,7 @@ public boolean isSatisfied(Object validatedObject, Object value, OValContext con
         requireMessageVariablesRecreation();
         try {
             if (context != null) {
-                if (context instanceof MethodParameterContext) {
-                    MethodParameterContext ctx = (MethodParameterContext) context;
+                if (context instanceof MethodParameterContext ctx) {
                     Method method = ctx.getMethod();
                     String[] paramNames = Java.parameterNames(method);
                     int index = -1;
@@ -60,8 +59,7 @@ public boolean isSatisfied(Object validatedObject, Object value, OValContext con
 
 
                 }
-                if (context instanceof FieldContext) {
-                    FieldContext ctx = (FieldContext) context;
+                if (context instanceof FieldContext ctx) {
                     try {
                         Field otherField = ctx.getField().getDeclaringClass().getDeclaredField(to);
                         otherKey = to;