cleanup: remove unused code

replay-framework · Sep 18, 2019 · fd13bec · fd13bec
1 parent f4dfbcf
commit fd13bec
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 216 deletions.
diff --git a/framework/src/play/classloading/ApplicationClasses.java b/framework/src/play/classloading/ApplicationClasses.java
@@ -6,7 +6,9 @@
 import java.util.Map;
 import java.util.function.BinaryOperator;
 
-import static java.util.Collections.*;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.unmodifiableList;
+import static java.util.Collections.unmodifiableMap;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 import static org.apache.commons.lang.StringUtils.replace;
@@ -79,17 +81,6 @@ public Class<?> getClassIgnoreCase(String name) {
         return allClassesByNormalizedName().get(nameLowerCased);
     }
 
-    /**
-     * Get a class by name
-     * 
-     * @param name
-     *            The fully qualified class name
-     * @return The ApplicationClass or null
-     */
-    public Class getApplicationClass(String name) {
-        return classes().get(name);
-    }
-
     /**
      * Retrieve all application classes with a specific annotation.
      *
@@ -103,17 +94,6 @@ public List<Class> getAnnotatedClasses(Class<? extends Annotation> clazz) {
           .collect(toList());
     }
 
-    /**
-     * Does this class is already loaded ?
-     * 
-     * @param name
-     *            The fully qualified class name
-     * @return true if the class is loaded
-     */
-    public boolean hasClass(String name) {
-        return classes().containsKey(name);
-    }
-
     @Override
     public String toString() {
         return String.format("%s classes", classes().size());

diff --git a/framework/src/play/data/binding/As.java b/framework/src/play/data/binding/As.java
@@ -3,7 +3,11 @@
 import play.mvc.Http;
 import play.mvc.Scope;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.lang.reflect.Type;
 import java.util.Map;
 
@@ -14,7 +18,6 @@
 
     String[] value() default {""};
     String[] lang() default {"*"};
-    String[] format() default {"html"};
     Class<? extends TypeBinder<?>> binder() default DEFAULT.class;
     Class<? extends TypeUnbinder<?>> unbinder() default DEFAULT.class;
 

diff --git a/framework/src/play/data/binding/BindingAnnotations.java b/framework/src/play/data/binding/BindingAnnotations.java
@@ -7,10 +7,6 @@ public class BindingAnnotations {
     private String[] profiles;
     private String[] noBindingProfiles;
 
-    public BindingAnnotations() {
-        this(null);
-    }
-
     public BindingAnnotations(Annotation[] annotations) {
         this.annotations = annotations;
     }

diff --git a/framework/src/play/data/validation/Check.java b/framework/src/play/data/validation/Check.java
@@ -4,10 +4,6 @@ public abstract class Check {
 
     public CheckWithCheck checkWithCheck;
 
-    public Check() {
-
-    }
-
     public abstract boolean isSatisfied(Object validatedObject, Object value);
 
     public void setMessage(String message, String... vars) {
@@ -18,9 +14,4 @@ public void setMessage(String message, String... vars) {
         }
         checkWithCheck.setVariables();
     }
-
-    public CheckWithCheck getCheckWithCheck() {
-        return this.checkWithCheck;
-    }
-
 }
diff --git a/framework/src/play/mvc/After.java b/framework/src/play/mvc/After.java
@@ -25,12 +25,4 @@
      * @return List of actions to intercept
      */
     String[] only() default {};
-
-    /**
-     * Interceptor priority (0 is high priority)
-     * 
-     * @return The Interceptor priority
-     */
-    int priority() default 0;
-
 }
diff --git a/framework/src/play/mvc/Before.java b/framework/src/play/mvc/Before.java
@@ -25,12 +25,4 @@
      * @return List of actions to intercept
      */
     String[] only() default {};
-
-    /**
-     * Interceptor priority (0 is high priority)
-     * 
-     * @return The Interceptor priority
-     */
-    int priority() default 0;
-
 }
diff --git a/framework/src/play/mvc/Catch.java b/framework/src/play/mvc/Catch.java
@@ -11,14 +11,5 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface Catch {
-
     Class<?>[] value() default {};
-
-    /**
-     * Interceptor priority (0 is high priority)
-     * 
-     * @return The Interceptor priority
-     */
-    int priority() default 0;
-
 }
diff --git a/framework/src/play/utils/ANSIConsoleAppender.java b/framework/src/play/utils/ANSIConsoleAppender.java
diff --git a/framework/src/play/utils/SmartFuture.java b/framework/src/play/utils/SmartFuture.java
diff --git a/framework/test/play/data/binding/BinderTest.java b/framework/test/play/data/binding/BinderTest.java
@@ -4,22 +4,16 @@
 import org.junit.Test;
 import play.PlayBuilder;
 import play.mvc.Http;
-import play.mvc.Scope;
 import play.mvc.Scope.Session;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static java.math.BigDecimal.TEN;
+import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -142,7 +136,7 @@ public void verifyBindingOfStringMaps() {
     }
 
      @Test
-     public void verify_binding_of_simple_bean_collections() {
+     public void verify_binding_of_simple_bean_collections() throws NoSuchFieldException {
 
          Map<String, String[]> params = new HashMap<>();
 
@@ -164,7 +158,7 @@ public void verify_binding_of_simple_bean_collections() {
          RootParamNode rootParamNode = ParamNode.convert(params);
 
          lst = (List<Data2>) Binder.bind(request, session, rootParamNode, "data2", lst.getClass(),
-           GenericListProvider.class.getDeclaredFields()[0].getGenericType(), noAnnotations);
+           GenericListProvider.class.getDeclaredField("listOfData2").getGenericType(), noAnnotations);
          //check the size and the order
          assertThat(lst.size()).isEqualTo(13);
          assertThat(lst.get(0).a).isEqualTo("a0");
@@ -206,7 +200,7 @@ public void test_unbinding_of_collection_of_complex_types() {
         d3.b = 3;
 
         Data1[] datasArray = {d1, d2};
-        List<Data1> datas = Arrays.asList(new Data1[]{d2, d1, d3});
+        List<Data1> datas = asList(d2, d1, d3);
 
         Map<String, Data1> mapData = new HashMap<>();
         mapData.put(d1.a, d1);

diff --git a/pdf/src/org/allcolor/yahp/cl/converter/CHtmlToPdfFlyingSaucerTransformer.java b/pdf/src/org/allcolor/yahp/cl/converter/CHtmlToPdfFlyingSaucerTransformer.java
@@ -17,7 +17,11 @@
 
 import java.io.*;
 import java.text.NumberFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -56,7 +60,7 @@ private boolean isKnown(final String path) {
 
   private static final Logger log = LoggerFactory.getLogger(CHtmlToPdfFlyingSaucerTransformer.class);
 
-  private static boolean accept(final File dir, final String name) {
+  private static boolean accept(String name) {
     return name.toLowerCase().endsWith(".ttf");
   }
 
@@ -69,7 +73,7 @@ private static void registerTTF(final File f, final _ITextRenderer renderer) {
         }
       }
     }
-    else if (accept(f.getParentFile(), f.getName())) {
+    else if (accept(f.getName())) {
       if (!renderer.isKnown(f.getAbsolutePath())) {
         try {
           renderer.getFontResolver().addFont(f.getAbsolutePath(),