Changeset 6780


Ignore:
Timestamp:
11/09/15 18:03:50 (9 years ago)
Author:
Oliver Schonefeld
Message:
  • remove legacy/deprecated Servlet context parameters
Location:
SRUServer/trunk/src/main/java/eu/clarin/sru/server
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRUServerConfig.java

    r6779 r6780  
    4343import javax.xml.xpath.XPathFactory;
    4444
    45 import org.slf4j.Logger;
    46 import org.slf4j.LoggerFactory;
    4745import org.w3c.dom.Attr;
    4846import org.w3c.dom.Document;
    … …  
    266264    public static final String SRU_RESPONSE_BUFFER_SIZE =
    267265            "eu.clarin.sru.server.responseBufferSize";
    268     /**
    269      * @deprecated use {@link #SRU_TRANSPORT}
    270      */
    271     @Deprecated
    272     private static final String LEGACY_SRU_TRANSPORT =
    273             "sru.transport";
    274     /**
    275      * @deprecated use {@link #SRU_HOST}
    276      */
    277     @Deprecated
    278     private static final String LEGACY_SRU_HOST =
    279             "sru.host";
    280     /**
    281      * @deprecated use {@link #SRU_PORT}
    282      */
    283     @Deprecated
    284     private static final String LEGACY_SRU_PORT =
    285             "sru.port";
    286     /**
    287      * @deprecated use {@link #SRU_DATABASE}
    288      */
    289     @Deprecated
    290     private static final String LEGACY_SRU_DATABASE =
    291             "sru.database";
    292     /**
    293      * @deprecated use {@link #SRU_NUMBER_OF_RECORDS}
    294      */
    295     @Deprecated
    296     private static final String LEGACY_SRU_NUMBER_OF_RECORDS =
    297             "sru.numberOfRecords";
    298     /**
    299      * @deprecated use {@link #SRU_MAXIMUM_RECORDS}
    300      */
    301     @Deprecated
    302     private static final String LEGACY_SRU_MAXIMUM_RECORDS =
    303             "sru.maximumRecords";
    304     /**
    305      * @deprecated use {@link #SRU_ECHO_REQUESTS}
    306      */
    307     @Deprecated
    308     private static final String LEGACY_SRU_ECHO_REQUESTS =
    309             "sru.echoRequests";
    310     /**
    311      * @deprecated use {@link #SRU_INDENT_RESPONSE}
    312      */
    313     @Deprecated
    314     private static final String LEGACY_SRU_INDENT_RESPONSE =
    315             "sru.indentResponse";
    316     /**
    317      * @deprecated use {@link #SRU_ALLOW_OVERRIDE_MAXIMUM_RECORDS}
    318      */
    319     @Deprecated
    320     private static final String LEGACY_SRU_ALLOW_OVERRIDE_MAXIMUM_RECORDS =
    321             "sru.allowOverrideMaximumRecords";
    322     /**
    323      * @deprecated use {@link #SRU_ALLOW_OVERRIDE_INDENT_RESPONSE}
    324      */
    325     @Deprecated
    326     private static final String LEGACY_SRU_ALLOW_OVERRIDE_INDENT_RESPONSE =
    327             "sru.allowOverrideIndentResponse";
    328266    private static final SRUVersion DEFAULT_SRU_VERSION_MIN =
    329267            SRUVersion.VERSION_1_1;
    … …  
    662600    } // IndexInfo
    663601
    664     private static final Logger logger =
    665             LoggerFactory.getLogger(SRUServerConfig.class);
    666602    private final SRUVersion minVersion;
    667603    private final SRUVersion maxVersion;
    … …  
    984920
    985921            List<SchemaInfo> schemaInfo = buildSchemaInfo(xpath, doc);
    986 
    987             /*
    988              * convert legacy parameters
    989              */
    990             convertLegacyParameter(params);
    991922
    992923            /*
    … …  
    14091340    }
    14101341
    1411 
    1412     public static void convertLegacyParameter(Map<String, String> params) {
    1413         if ((params != null) && !params.isEmpty()) {
    1414             convertLegacyParameter1(params,
    1415                     LEGACY_SRU_TRANSPORT,
    1416                     SRU_TRANSPORT);
    1417             convertLegacyParameter1(params,
    1418                     LEGACY_SRU_HOST,
    1419                     SRU_HOST);
    1420             convertLegacyParameter1(params,
    1421                     LEGACY_SRU_PORT,
    1422                     SRU_PORT);
    1423             convertLegacyParameter1(params,
    1424                     LEGACY_SRU_DATABASE,
    1425                     SRU_DATABASE);
    1426             convertLegacyParameter1(params,
    1427                     LEGACY_SRU_NUMBER_OF_RECORDS,
    1428                     SRU_NUMBER_OF_RECORDS);
    1429             convertLegacyParameter1(params,
    1430                     LEGACY_SRU_MAXIMUM_RECORDS,
    1431                     SRU_MAXIMUM_RECORDS);
    1432             convertLegacyParameter1(params,
    1433                     LEGACY_SRU_ECHO_REQUESTS,
    1434                     SRU_ECHO_REQUESTS);
    1435             convertLegacyParameter1(params,
    1436                     LEGACY_SRU_INDENT_RESPONSE,
    1437                     SRU_INDENT_RESPONSE);
    1438             convertLegacyParameter1(params,
    1439                     LEGACY_SRU_ALLOW_OVERRIDE_MAXIMUM_RECORDS,
    1440                     SRU_ALLOW_OVERRIDE_MAXIMUM_RECORDS);
    1441             convertLegacyParameter1(params,
    1442                     LEGACY_SRU_ALLOW_OVERRIDE_INDENT_RESPONSE,
    1443                     SRU_ALLOW_OVERRIDE_INDENT_RESPONSE);
    1444         }
    1445     }
    1446 
    1447 
    1448     private static void convertLegacyParameter1(Map<String, String> params,
    1449             String legacyName, String name) {
    1450         final String value = params.get(legacyName);
    1451         if (value != null) {
    1452             params.put(name, value);
    1453             params.remove(legacyName);
    1454             logger.warn("parameter '{}' is deprecated, please use "
    1455                     + "parameter '{}' instead!", legacyName, name);
    1456         }
    1457     }
    1458 
    14591342} // class SRUEndpointConfig

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

    r2665 r6780  
    220220        }
    221221
    222         /* convert legacy parameters */
    223         SRUServerConfig.convertLegacyParameter(params);
    224 
    225222        /*
    226223         * Set some defaults (aka "plug and play" for development deployment)
Note: See TracChangeset for help on using the changeset viewer.