From 9797502ef2e3e86a80866e3c3ff27a0e84885195 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Thu, 2 Jun 2016 13:55:14 +1200 Subject: [PATCH] #729 - Remove unused ServerConfig.addJar(...); serverConfig.setJars(...); ... as "search jars" is no longer used in classpath scanning (since 7.8.1) --- .../com/avaje/ebean/config/ServerConfig.java | 55 ------------------- 1 file changed, 55 deletions(-) diff --git a/src/main/java/com/avaje/ebean/config/ServerConfig.java b/src/main/java/com/avaje/ebean/config/ServerConfig.java index e4f8d33c8..accbd3ccc 100644 --- a/src/main/java/com/avaje/ebean/config/ServerConfig.java +++ b/src/main/java/com/avaje/ebean/config/ServerConfig.java @@ -128,12 +128,6 @@ public class ServerConfig { */ private List packages = new ArrayList(); - /** - * The names of Jar files that are searched for entities and other interesting - * classes. Only used when classes is empty/not explicitly specified. - */ - private List searchJars = new ArrayList(); - /** * Class name of a classPathReader implementation. */ @@ -1790,50 +1784,6 @@ public class ServerConfig { this.packages = packages; } - /** - * Add the name of a Jar to search for entities via class path search. - *

- * This is only used if classes have not been explicitly specified. - *

- *

- * If you are using ebean.properties you can specify jars to search by setting - * a ebean.search.jars property. - *

- * - *
{@code
-   * # EBean will search through classes for entities, but will not search jar files
-   * # unless you tell it to do so, for performance reasons.  Set this value to a
-   * # comma-delimited list of jar files you want ebean to search.
-   * ebean.search.jars=example.jar
-   * }
- */ - public void addJar(String jarName) { - if (searchJars == null) { - searchJars = new ArrayList(); - } - searchJars.add(jarName); - } - - /** - * Return packages to search for entities via class path search. - *

- * This is only used if classes have not been explicitly specified. - *

- */ - public List getJars() { - return searchJars; - } - - /** - * Set the names of Jars to search for entities via class path search. - *

- * This is only used if classes have not been explicitly specified. - *

- */ - public void setJars(List searchJars) { - this.searchJars = searchJars; - } - /** * Return the class name of a classPathReader implementation. */ @@ -2384,11 +2334,6 @@ public class ServerConfig { cacheWarmingDelay = p.getInt("cacheWarmingDelay", cacheWarmingDelay); classPathReaderClassName = p.get("classpathreader"); - String jarsProp = p.get("search.jars", p.get("jars", null)); - if (jarsProp != null) { - searchJars = getSearchJarsPackages(jarsProp); - } - if (packages != null) { String packagesProp = p.get("search.packages", p.get("packages", null)); packages = getSearchJarsPackages(packagesProp);