Merge pull request #17 from KoenDG/infrecur

Infinite recursion fix + static code analysis

Author: rbygrave

src/main/java/io/ebean/BeanCapture.java

@@ -17,30 +17,30 @@ public class BeanCapture {
   /**
    * The captured beans sent to the save() methods.
    */
-  public List<Object> save = new ArrayList<Object>();
+  public List<Object> save = new ArrayList<>();
 
   /**
    * The captured beans sent to the insert() methods.
    */
-  public List<Object> insert = new ArrayList<Object>();
+  public List<Object> insert = new ArrayList<>();
 
   /**
    * The captured beans sent to the update() methods.
    */
-  public List<Object> update = new ArrayList<Object>();
+  public List<Object> update = new ArrayList<>();
 
   /**
    * The captured beans sent to the delete() methods.
    * <p/>
    * Note that these can include MethodCall objects for the cases when
    * delete by id is called.
    */
-  public List<Object> delete = new ArrayList<Object>();
+  public List<Object> delete = new ArrayList<>();
 
   /**
    * Captured beans sent to deletePermanent() methods.
    */
-  public List<Object> deletePermanent = new ArrayList<Object>();
+  public List<Object> deletePermanent = new ArrayList<>();
 
 
   protected void addSaved(Object bean) {

src/main/java/io/ebean/MethodCall.java

@@ -12,14 +12,14 @@ public class MethodCall {
 
   String name;
 
-  Map<String,Object> args = new LinkedHashMap<String, Object>();
+  Map<String, Object> args = new LinkedHashMap<>();
 
   public MethodCall(String name) {
     this.name = name;
   }
 
   public String toString() {
-    return name+":"+args;
+    return name + ':' + args;
   }
 
 

src/main/java/io/ebean/MethodCalls.java

@@ -8,9 +8,7 @@
  */
 public class MethodCalls {
 
-
-
-  List<MethodCall> list = new ArrayList<MethodCall>();
+  List<MethodCall> list = new ArrayList<>();
 
   public void add(MethodCall call) {
     list.add(call);
@@ -42,7 +40,7 @@ public List<MethodCall> delete() {
 
   protected List<MethodCall> matches(String methodName) {
 
-    List<MethodCall> matches = new ArrayList<MethodCall>();
+    List<MethodCall> matches = new ArrayList<>();
     for (MethodCall call : list) {
       if (isMatch(call, methodName)) {
         matches.add(call);
@@ -51,7 +49,7 @@ protected List<MethodCall> matches(String methodName) {
     return matches;
   }
 
-  protected boolean isMatch(MethodCall call, String methodName) {
+  protected static boolean isMatch(MethodCall call, String methodName) {
     return call.name.equals(methodName);
   }
 }

src/main/java/io/ebean/WhenFind.java

@@ -10,9 +10,9 @@
  */
 public class WhenFind {
 
-  List<WhenBeanReturn<?>> byId = new ArrayList();
+  List<WhenBeanReturn<?>> byId = new ArrayList<>();
 
-  Map<Class<?>,WhenBeanReturn<?>> byUnique = new HashMap<Class<?>,WhenBeanReturn<?>>();
+  Map<Class<?>, WhenBeanReturn<?>> byUnique = new HashMap<>();
 
   public <T> WhenBeanReturn<T> byId(Class<T> beanType) {
 
@@ -21,14 +21,14 @@ public <T> WhenBeanReturn<T> byId(Class<T> beanType) {
 
   public <T> WhenBeanReturn<T> byId(Class<T> beanType, Object id) {
 
-    WhenBeanReturn<T> ret = new WhenBeanReturn<T>(beanType, id);
+    WhenBeanReturn<T> ret = new WhenBeanReturn<>(beanType, id);
     byId.add(ret);
     return ret;
   }
 
   public <T> WhenBeanReturn<T> byUnique(Class<T> beanType) {
 
-    WhenBeanReturn<T> ret = new WhenBeanReturn<T>(beanType);
+    WhenBeanReturn<T> ret = new WhenBeanReturn<>(beanType);
     byUnique.put(beanType, ret);
     return ret;
   }

src/main/java/io/ebean/WithStaticFinder.java

@@ -2,6 +2,8 @@
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 
 /**
  * Used to replace a "Finder" that is located as a static field (typically on an Model entity bean).
@@ -11,7 +13,7 @@
  */
 public class WithStaticFinder<T> {
 
-  Class<T> beanType;
+  final Class<T> beanType;
 
   String fieldName;
 
@@ -41,7 +43,7 @@ public WithStaticFinder(Class<T> beanType, String fieldName) {
    * <p/>
    * Note that the test double instance is not set until <code>useTestDouble()</code> is called.
    */
-  public WithStaticFinder as(Object testDouble) throws FinderFieldNotFoundException {
+  public WithStaticFinder<T> as(Object testDouble) throws FinderFieldNotFoundException {
 
     try {
       this.testDouble = testDouble;
@@ -50,7 +52,16 @@ public WithStaticFinder as(Object testDouble) throws FinderFieldNotFoundExceptio
       this.field.setAccessible(true);
       try {
         Field modifiersField = Field.class.getDeclaredField("modifiers");
-        modifiersField.setAccessible(true);
+
+        /**
+         * If the project using this library has a SecurityManager set up, permission may be denied.
+         * Therefor, running this as a privileged action.
+         */
+        AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
+            modifiersField.setAccessible(true);
+            return null;
+        });
+
         modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
       } catch (NoSuchFieldException e) {
         throw new RuntimeException(e);

src/main/java/io/ebean/WithStaticFinders.java

@@ -9,13 +9,13 @@
  */
 public class WithStaticFinders {
 
-  protected List<WithStaticFinder<?>> staticFinderReplacement = new ArrayList<WithStaticFinder<?>>();
+  protected List<WithStaticFinder<?>> staticFinderReplacement = new ArrayList<>();
 
   /**
    * Create and return a WithStaticFinder. Expects a static 'finder' field on the beanType class.
    */
   public <T> WithStaticFinder<T> withFinder(Class<T> beanType) {
-    WithStaticFinder withFinder = new WithStaticFinder<T>(beanType);
+    WithStaticFinder<T> withFinder = new WithStaticFinder<>(beanType);
     staticFinderReplacement.add(withFinder);
     return withFinder;
   }

src/main/java/io/ebean/delegate/DelegateDelete.java

@@ -90,6 +90,6 @@ public int deleteAllPermanent(Class<?> beanType, Collection<?> ids) {
 
   @Override
   public int deleteAllPermanent(Class<?> beanType, Collection<?> ids, Transaction transaction) {
-    return deleteAllPermanent(beanType, ids, transaction);
+    return delegate.deleteAllPermanent(beanType, ids, transaction);
   }
 }

src/main/java/io/ebean/delegate/DelegateFind.java

@@ -88,9 +88,6 @@ public <T> void findEachWhile(Query<T> query, Predicate<T> consumer, Transaction
 
   @Override
   public <T> List<T> findList(Query<T> query, Transaction transaction) {
-
-    SpiQuery q = (SpiQuery)query;
-    q.getBeanType();
     return delegate.findList(query, transaction);
   }
 

src/main/java/io/ebeantest/LoggedSql.java

@@ -21,7 +21,7 @@
  */
 public class LoggedSql {
 
-  private static BasicAppender basicAppender = new BasicAppender();
+  private static final BasicAppender basicAppender = new BasicAppender();
 
   static {
 
@@ -52,7 +52,7 @@ public static List<String> stop() {
 
   private static class BasicAppender extends UnsynchronizedAppenderBase<ILoggingEvent> {
 
-    List<String> messages = new ArrayList<String>();
+    List<String> messages = new ArrayList<>();
 
     @Override
     protected void append(ILoggingEvent eventObject) {

src/test/java/io/ebean/MockiEbeanTest.java

@@ -36,7 +36,7 @@ public void testRunWithMock() throws Exception {
       public void run() {
         Object value = Ebean.getServer(null).getBeanId(null);
 
-        assertEquals(magicBeanId, value);
+        assertEquals(value, magicBeanId);
       }
     });
 
@@ -59,7 +59,7 @@ public void testRunWithMock_when_exceptionThrow_should_restoreServer() throws Ex
         public void run() {
           Object value = Ebean.getServer(null).getBeanId(null);
 
-          assertEquals(magicBeanId, value);
+          assertEquals(value, magicBeanId);
           throw new IllegalStateException();
         }
       });