Changeset 6781

Timestamp:

11/09/15 18:07:09 (9 years ago)

Author:

Oliver Schonefeld

Message:

• remove legacy/deprecated Servlet context parameters (2)

File:

• SRUServer/trunk/src/main/java/eu/clarin/sru/server/utils/SRUServerServlet.java (modified) (5 diffs)

SRUServer/trunk/src/main/java/eu/clarin/sru/server/utils/SRUServerServlet.java

@@ -84 +84 @@
             "eu.clarin.sru.server.utils.sruServerConfigLocation";
     /**
-     * @deprecated use {@link #SRU_SERVER_CONFIG_LOCATION_PARAM}
-     */
-    @Deprecated
-    private static final String LEGACY_SRU_SERVER_CONFIG_LOCATION_PARAM =
-            "sruServerConfigLocation";
-    /**
      * Servlet initialization parameter name for the class that implements the
      * SRU search engine.
@@ -95 +89 @@
     public static final String SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM =
             "eu.clarin.sru.server.utils.sruServerSearchEngineClass";
-    /**
-     * @deprecated use {@link #SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM}
-     */
-    @Deprecated
-    private static final String LEGACY_SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM_1 =
-            "sruServerSerachEngineClass";
-    /**
-     * @deprecated use {@link #SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM}
-     */
-    @Deprecated
-    private static final String LEGACY_SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM_2 =
-            "eu.clarin.sru.server.utils.sruServerSerachEngineClass";
     /**
      * Default value for the location of the SRU server configuration.
@@ -132 +114 @@
                 cfg.getInitParameter(SRU_SERVER_CONFIG_LOCATION_PARAM);
         if (sruServerConfigLocation == null) {
-            sruServerConfigLocation = cfg.getInitParameter(
-                    LEGACY_SRU_SERVER_CONFIG_LOCATION_PARAM);
-            if (sruServerConfigLocation != null) {
-                logger.warn("init parameter '" +
-                        LEGACY_SRU_SERVER_CONFIG_LOCATION_PARAM +
-                        "' is deprecated, please use init-parameter '" +
-                        SRU_SERVER_CONFIG_LOCATION_PARAM + "' instead!");
-            } else {
-                sruServerConfigLocation = SRU_SERVER_CONFIG_LOCATION_DEFAULT;
-            }
+            sruServerConfigLocation = SRU_SERVER_CONFIG_LOCATION_DEFAULT;
         }
 
@@ -162 +135 @@
         String sruServerSearchEngineClass =
                 cfg.getInitParameter(SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM);
-
-        /* legacy compatibility (first try) */
-        if (sruServerSearchEngineClass == null) {
-            sruServerSearchEngineClass = cfg.getInitParameter(
-                    LEGACY_SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM_1);
-            if (sruServerSearchEngineClass != null) {
-                logger.warn("init-parameter '" +
-                        LEGACY_SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM_1 +
-                        "' is deprecated, please use init-parameter '" +
-                        SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM + "' instead!");
-            }
-        }
-
-        /* legacy compatibility (second try) */
-        if (sruServerSearchEngineClass == null) {
-            sruServerSearchEngineClass = cfg.getInitParameter(
-                    LEGACY_SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM_2);
-            if (sruServerSearchEngineClass != null) {
-                logger.warn("init-parameter '" +
-                        LEGACY_SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM_2 +
-                        "' is deprecated, please use init-parameter '" +
-                        SRU_SERVER_SEARCH_ENGINE_CLASS_PARAM + "' instead!");
-            }
-        }
-
-        /* if still nothing, give up */
         if (sruServerSearchEngineClass == null) {
             throw new ServletException("init-parameter '" +
@@ -270 +217 @@
          */
         try {
+            logger.debug("creating new serach engine from class {}",
+                    sruServerSearchEngineClass);
             @SuppressWarnings("unchecked")
             Class<SRUSearchEngineBase> clazz = (Class<SRUSearchEngineBase>)