From 1d48e2afb3eb4e5582d8c199cb97bb1e33cfe7ac Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Wed, 4 Jan 2023 13:59:51 +0100
Subject: [PATCH] Ignore private/package private classes from CP-scan

---
 .../io/ebeaninternal/server/core/bootup/BootupClasses.java  | 5 +++--
 .../java/io/ebean/xtest/event/BeanFindControllerTest.java   | 1 -
 .../ebean/xtest/event}/TestBeanFindController.java          | 5 +++--
 .../src/test/java/org/tests/changelog/TestChangeLog.java    | 6 +++---
 .../java/org/tests/model/basic/MyEBasicConfigStartup.java   | 4 ++--
 5 files changed, 11 insertions(+), 10 deletions(-)
 rename ebean-test/src/test/java/{org/tests/model/controller => io/ebean/xtest/event}/TestBeanFindController.java (94%)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
index 464731024..bd84a9066 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
@@ -342,8 +342,9 @@ public class BootupClasses implements Predicate<Class<?>> {
    */
   @SuppressWarnings("unchecked")
   private boolean isInterestingInterface(Class<?> cls) {
-    if (Modifier.isAbstract(cls.getModifiers())) {
-      // do not include abstract classes as we can
+    if (Modifier.isAbstract(cls.getModifiers())
+      || !(Modifier.isPublic(cls.getModifiers()) || Modifier.isProtected(cls.getModifiers()))) {
+      // do not include abstract and non pupbic/protected classes as we can
       // not instantiate them
       return false;
     }
diff --git a/ebean-test/src/test/java/io/ebean/xtest/event/BeanFindControllerTest.java b/ebean-test/src/test/java/io/ebean/xtest/event/BeanFindControllerTest.java
index 33b275f02..5f97319e6 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/event/BeanFindControllerTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/event/BeanFindControllerTest.java
@@ -15,7 +15,6 @@ import org.tests.model.basic.ECustomId;
 import org.tests.model.controller.FindControllerMain;
 import org.tests.model.controller.SoftRefA;
 import org.tests.model.controller.SoftRefB;
-import org.tests.model.controller.TestBeanFindController;
 
 import java.util.List;
 
diff --git a/ebean-test/src/test/java/org/tests/model/controller/TestBeanFindController.java b/ebean-test/src/test/java/io/ebean/xtest/event/TestBeanFindController.java
similarity index 94%
rename from ebean-test/src/test/java/org/tests/model/controller/TestBeanFindController.java
rename to ebean-test/src/test/java/io/ebean/xtest/event/TestBeanFindController.java
index 2e51847eb..9f7a14d82 100644
--- a/ebean-test/src/test/java/org/tests/model/controller/TestBeanFindController.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/event/TestBeanFindController.java
@@ -1,16 +1,17 @@
-package org.tests.model.controller;
+package io.ebean.xtest.event;
 
 import io.ebean.bean.BeanCollection;
 import io.ebean.event.BeanFindController;
 import io.ebean.event.BeanQueryRequest;
 import io.ebean.plugin.BeanType;
+import org.tests.model.controller.FindControllerMain;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class TestBeanFindController implements BeanFindController {
+class TestBeanFindController implements BeanFindController {
 
   @Override
   public boolean isRegisterFor(final Class<?> cls) {
diff --git a/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java b/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java
index 34e3a330b..2145b38d6 100644
--- a/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java
+++ b/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java
@@ -189,7 +189,7 @@ public class TestChangeLog extends BaseTestCase {
     return DatabaseFactory.create(config);
   }
 
-  public static class TDChangeLogPrepare implements ChangeLogPrepare {
+  static class TDChangeLogPrepare implements ChangeLogPrepare {
     @Override
     public boolean prepare(ChangeSet changes) {
       changes.setUserId("appUser1");
@@ -198,7 +198,7 @@ public class TestChangeLog extends BaseTestCase {
     }
   }
 
-  public static class TDChangeLogListener implements ChangeLogListener {
+  static class TDChangeLogListener implements ChangeLogListener {
 
     ObjectMapper objectMapper = new ObjectMapper();
 
@@ -226,7 +226,7 @@ public class TestChangeLog extends BaseTestCase {
 
   }
 
-  public static class TDChangeLogRegister implements ChangeLogRegister {
+  static class TDChangeLogRegister implements ChangeLogRegister {
 
     @Override
     public ChangeLogFilter getChangeFilter(Class<?> beanType) {
diff --git a/ebean-test/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java b/ebean-test/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java
index c27c5e79b..71ea07436 100644
--- a/ebean-test/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java
+++ b/ebean-test/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java
@@ -29,7 +29,7 @@ public class MyEBasicConfigStartup implements ServerConfigStartup {
     serverConfig.add(new EbasicBulkListener());
   }
 
-  public static class EbasicBulkListener implements BulkTableEventListener {
+  private static class EbasicBulkListener implements BulkTableEventListener {
 
     final Set<String> s = new HashSet<>();
 
@@ -49,7 +49,7 @@ public class MyEBasicConfigStartup implements ServerConfigStartup {
 
   }
 
-  public static class EbasicPersistList extends AbstractBeanPersistListener {
+  private static class EbasicPersistList extends AbstractBeanPersistListener {
 
     @Override
     public boolean isRegisterFor(Class<?> cls) {