From 9ff4e63c32ab66cd07fe872b78d3adf91b298461 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Mon, 11 May 2015 23:51:23 +1200
Subject: [PATCH] #290 - Tries to register abstract class that implements
 custom ScalarType interface

---
 .../server/core/BootupClasses.java            | 42 ++++---------------
 1 file changed, 9 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/BootupClasses.java b/src/main/java/com/avaje/ebeaninternal/server/core/BootupClasses.java
index d8c6d6cff..0f03a4679 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/BootupClasses.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/BootupClasses.java
@@ -1,6 +1,7 @@
 package com.avaje.ebeaninternal.server.core;
 
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -71,27 +72,6 @@ public class BootupClasses implements ClassPathSearchMatcher {
         }
     }
 
-    private BootupClasses(BootupClasses parent) {
-        this.embeddableList.addAll(parent.embeddableList);
-        this.entityList.addAll(parent.entityList);
-        this.scalarTypeList.addAll(parent.scalarTypeList);
-        this.scalarConverterList.addAll(parent.scalarConverterList);
-        this.compoundTypeList.addAll(parent.compoundTypeList);
-        this.beanControllerList.addAll(parent.beanControllerList);
-        this.transactionEventListenerList.addAll(parent.transactionEventListenerList);
-        this.beanFinderList.addAll(parent.beanFinderList);
-        this.beanListenerList.addAll(parent.beanListenerList);
-        this.beanQueryAdapterList.addAll(parent.beanQueryAdapterList);
-        this.serverConfigStartupList.addAll(parent.serverConfigStartupList);
-    }
-
-    /**
-     * Create a copy of this object so that classes can be added to it.
-     */
-    public BootupClasses createCopy() {
-        return new BootupClasses(this);
-    }
-
     /**
      * Run any ServerConfigStartup listeners.
      */
@@ -300,11 +280,8 @@ public class BootupClasses implements ClassPathSearchMatcher {
         } else if (isEntity(cls)) {
             entityList.add(cls);
 
-        } else if (isInterestingInterface(cls)) {
-            return true;
-
         } else {
-            return false;
+            return isInterestingInterface(cls);
         }
 
         return true;
@@ -318,6 +295,11 @@ public class BootupClasses implements ClassPathSearchMatcher {
      */
     private boolean isInterestingInterface(Class<?> cls) {
 
+        if (Modifier.isAbstract(cls.getModifiers())) {
+            // do not include abstract classes as we can
+            // not instantiate them
+            return false;
+        }
         boolean interesting = false;
 
         if (BeanPersistController.class.isAssignableFrom(cls)) {
@@ -375,18 +357,12 @@ public class BootupClasses implements ClassPathSearchMatcher {
             return true;
         }
         ann = cls.getAnnotation(Table.class);
-        if (ann != null) {
-            return true;
-        }
-        return false;
+        return ann != null;
     }
 
     private boolean isEmbeddable(Class<?> cls) {
 
         Annotation ann = cls.getAnnotation(Embeddable.class);
-        if (ann != null) {
-            return true;
-        }
-        return false;
+        return ann != null;
     }
 }