Changeset 2938 for SRUClient

Timestamp:

05/27/13 16:45:50 (11 years ago)

Author:

oschonef

Message:

• upgrade to slf4j version 1.7.2

Location:

SRUClient/trunk

Files:

• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/sru/client/SRUExplainRecordDataParser.java (modified) (1 diff)
• src/main/java/eu/clarin/sru/client/SRUSimpleClient.java (modified) (7 diffs)
• src/main/java/eu/clarin/sru/client/fcs/DataViewParserKWIC.java (modified) (1 diff)
• src/test/java/eu/clarin/sru/client/TestSimpleClient.java (modified) (4 diffs)
• src/test/java/eu/clarin/sru/client/TestUtils.java (modified) (7 diffs)

SRUClient/trunk/pom.xml

@@ -20 +20 @@
         <maven.compiler.target>1.6</maven.compiler.target>
         <!-- versions of common dependencies -->
-        <slf4j.version>1.6.4</slf4j.version>
+        <slf4j.version>1.7.2</slf4j.version>
     </properties>
 

SRUClient/trunk/src/main/java/eu/clarin/sru/client/SRUExplainRecordDataParser.java

@@ -167 +167 @@
         }
         XmlStreamReaderUtils.readEnd(reader, ZEEREX_NS, "serverInfo", true);
-        logger.debug(
-                "serverInfo: host={}, port={}, database={}, version={}, protocol={}, transport={}",
-                new Object[] { host, port, database, version, protocol,
-                        transports });
+        logger.debug("serverInfo: host={}, port={}, database={}, version={}, protocol={}, transport={}",
+                host, port, database, version, protocol, transports);
         return new ServerInfo(host, port, database, protocol, version,
                 transports);

SRUClient/trunk/src/main/java/eu/clarin/sru/client/SRUSimpleClient.java

@@ -275 +275 @@
             logger.debug("{} byte(s) in {} milli(s) " +
                     "({} milli(s) network / {} milli(s) processing)",
-                    new Object[] { reader.getByteCount(),
-                            millisTotal, millisNetwork, millisProcessing });
+                    reader.getByteCount(), millisTotal, millisNetwork,
+                    millisProcessing);
             handler.onRequestStatistics((int) reader.getByteCount(),
                     millisTotal, millisNetwork, millisProcessing);
@@ -361 +361 @@
             logger.debug("{} byte(s) in {} milli(s) " +
                     "({} milli(s) network / {} milli(s) processing)",
-                    new Object[] { reader.getByteCount(),
-                            millisTotal, millisNetwork, millisProcessing });
+                    reader.getByteCount(), millisTotal, millisNetwork,
+                    millisProcessing);
             handler.onRequestStatistics((int) reader.getByteCount(),
                     millisTotal, millisNetwork, millisProcessing);
@@ -447 +447 @@
             logger.debug("{} byte(s) in {} milli(s) " +
                     "({} milli(s) network / {} milli(s) processing)",
-                    new Object[] { reader.getByteCount(),
-                            millisTotal, millisNetwork, millisProcessing });
+                    reader.getByteCount(), millisTotal, millisNetwork,
+                    millisProcessing);
             handler.onRequestStatistics((int) reader.getByteCount(),
                     millisTotal, millisNetwork, millisProcessing);
@@ -798 +798 @@
                             }
                         }
-                        logger.debug("value = {}, numberOfRecords = {}, "
-                                + "displayTerm = {}, whereInList = {}",
-                                new Object[] { value, numberOfRecords,
-                                        displayTerm, whereInList });
+                        logger.debug("value = {}, numberOfRecords = {}, " +
+                                "displayTerm = {}, whereInList = {}", value,
+                                numberOfRecords, displayTerm, whereInList);
                         handler.onTerm(value, numberOfRecords, displayTerm,
                                 whereInList);
@@ -948 +947 @@
                         "resultSetIdleTime", false, -1);
 
-                logger.debug("numberOfRecords = {}, resultSetId = {}, "
-                        + "resultSetIdleTime = {}", new Object[] {
-                        numberOfRecords, resultSetId, resultSetIdleTime });
+                logger.debug("numberOfRecords = {}, resultSetId = {}, " +
+                        "resultSetIdleTime = {}", numberOfRecords,
+                        resultSetId, resultSetIdleTime);
 
                 // searchRetrieveResponse/results
@@ -992 +991 @@
                             logger.debug("schema = {}, packing = {}, " +
                                     "requested packing = {}",
-                                    new Object[] { schema, packing,
-                                            request.getRecordPacking() });
+                                    schema, packing,
+                                    request.getRecordPacking());
 
                             if ((request.getRecordPacking() != null) &&
@@ -1327 +1326 @@
 
             logger.debug("diagnostic: uri={}, detail={}, message={}",
-                    new Object[] { uri, details, message });
+                    uri, details, message);
             return new SRUDiagnostic(uri, details, message);
         } else {

SRUClient/trunk/src/main/java/eu/clarin/sru/client/fcs/DataViewParserKWIC.java

@@ -65 +65 @@
         XmlStreamReaderUtils.readEnd(reader, FCS_KWIC_NS, "kwic");
 
-        logger.debug("left='{}' keyword='{}', right='{}'", new Object[] {
-                left, keyword, right }
-        );
+        logger.debug("left='{}' keyword='{}', right='{}'",
+                left, keyword, right);
         return new DataViewKWIC(pid, ref, left, keyword, right);
     }

SRUClient/trunk/src/test/java/eu/clarin/sru/client/TestSimpleClient.java

@@ -49 +49 @@
                     for (SRUDiagnostic diagnostic : diagnostics) {
                         logger.info("onDiagnostics: uri={}, detail={}, message={}",
-                                new Object[] { diagnostic.getURI(),
-                                        diagnostic.getDetails(),
-                                        diagnostic.getMessage() });
+                                diagnostic.getURI(), diagnostic.getDetails(),
+                                diagnostic.getMessage());
                     }
                 }
@@ -76 +75 @@
                         String displayTerm, SRUWhereInList whereInList)
                         throws SRUClientException {
-                    logger.info("onTerm(): value = {}, numberOfRecords = {}, displayTerm = {}, whereInList = {}",
-                            new Object[] { value, numberOfRecords, displayTerm,
-                                    whereInList });
+                    logger.info("onTerm(): value = {}, numberOfRecords = {}, " +
+                            "displayTerm = {}, whereInList = {}",
+                            value, numberOfRecords, displayTerm, whereInList);
                 }
 
@@ -100 +99 @@
                         SRURecordData data) throws SRUClientException {
                     logger.info("onRecord(): identifier = {}, position = {}, schema = {}",
-                            new Object[] { identifier, position,
-                                    data.getRecordSchema() });
-                    if (ClarinFCSRecordData.RECORD_SCHEMA
-                            .equals(data.getRecordSchema())) {
+                                identifier, position, data.getRecordSchema());
+                    if (ClarinFCSRecordData.RECORD_SCHEMA.equals(data.getRecordSchema())) {
                         ClarinFCSRecordData record =
                                 (ClarinFCSRecordData) data;
                         TestUtils.dumpResource(record.getResource());
-                    } else if (SRUExplainRecordData.RECORD_SCHEMA
-                            .equals(data.getRecordSchema())) {
+                    } else if (SRUExplainRecordData.RECORD_SCHEMA.equals(data.getRecordSchema())) {
                         TestUtils.dumpExplainRecordData(data);
                     }
@@ -117 +113 @@
                         SRUDiagnostic data) throws SRUClientException {
                     logger.info("onSurrogateRecord: identifier = {}, position = {}, uri={}, detail={}, message={}",
-                            new Object[] { identifier, position, data.getURI(),
-                                    data.getDetails(), data.getMessage() });
+                            identifier, position, data.getURI(), data.getDetails(), data.getMessage());
                 }
             };

SRUClient/trunk/src/test/java/eu/clarin/sru/client/TestUtils.java

@@ -67 +67 @@
             for (SRUDiagnostic diagnostic : response.getDiagnostics()) {
                 logger.info("uri={}, message={}, detail={}",
-                        new Object[] { diagnostic.getURI(),
-                                diagnostic.getMessage(),
-                                diagnostic.getDetails() });
+                        diagnostic.getURI(),
+                        diagnostic.getMessage(),
+                        diagnostic.getDetails());
             }
         }
@@ -87 +87 @@
             for (SRUDiagnostic diagnostic : response.getDiagnostics()) {
                 logger.info("uri={}, message={}, detail={}",
-                        new Object[] {
-                            diagnostic.getURI(),
-                            diagnostic.getMessage(),
-                            diagnostic.getDetails()
-                            });
+                        diagnostic.getURI(),
+                        diagnostic.getMessage(),
+                        diagnostic.getDetails());
             }
         }
         if (response.hasTerms()) {
             for (SRUTerm term : response.getTerms()) {
-                logger.info(
-                        "value={}, numberOfRecords={}, displayTerm={}",
-                        new Object[] { term.getValue(),
-                                term.getNumberOfRecords(),
-                                term.getDisplayTerm() });
+                logger.info("value={}, numberOfRecords={}, displayTerm={}",
+                            term.getValue(),
+                            term.getNumberOfRecords(),
+                            term.getDisplayTerm());
             }
         } else {
@@ -111 +108 @@
         logger.info("displaying results of 'searchRetrieve' request ...");
         logger.info("numberOfRecords = {}, nextResultPosition = {}",
-                new Object[] { response.getNumberOfRecords(),
-                        response.getNextRecordPosition() });
+                response.getNumberOfRecords(),
+                response.getNextRecordPosition());
         if (response.hasDiagnostics()) {
             for (SRUDiagnostic diagnostic : response.getDiagnostics()) {
                 logger.info("uri={}, message={}, detail={}",
-                        new Object[] { diagnostic.getURI(),
-                                diagnostic.getMessage(),
-                                diagnostic.getDetails() });
+                        diagnostic.getURI(),
+                        diagnostic.getMessage(),
+                        diagnostic.getDetails());
             }
         }
@@ -124 +121 @@
             for (SRURecord record : response.getRecords()) {
                 logger.info("schema = {}, identifier = {}, position = {}",
-                        new Object[] { record.getRecordSchema(),
-                                record.getRecordIdentifier(),
-                                record.getRecordPosition() });
+                        record.getRecordSchema(),
+                        record.getRecordIdentifier(),
+                        record.getRecordPosition());
                 if (record.isRecordSchema(ClarinFCSRecordData.RECORD_SCHEMA)) {
                     ClarinFCSRecordData rd =
@@ -135 +132 @@
                             (SRUSurrogateRecordData) record.getRecordData();
                     logger.info("SURROGATE DIAGNOSTIC: uri={}, message={}, detail={}",
-                            new Object[] { r.getURI(), r.getMessage(),
-                                    r.getDetails() });
+                                r.getURI(), r.getMessage(), r.getDetails());
                 } else {
                     logger.info("UNSUPPORTED SCHEMA: {}",
@@ -151 +147 @@
         if (SRUExplainRecordData.RECORD_SCHEMA.equals(recordData.getRecordSchema())) {
             SRUExplainRecordData data = (SRUExplainRecordData) recordData;
-            logger.info("host={}, port={}, database={}", new Object[] {
+            logger.info("host={}, port={}, database={}",
                     data.getServerInfo().getHost(),
                     data.getServerInfo().getPort(),
-                    data.getServerInfo().getDatabase()
-            });
-            
+                    data.getServerInfo().getDatabase());
         }
     }
@@ -182 +176 @@
         for (DataView dataview : dataviews) {
             logger.info("{}DataView: type={}, pid={}, ref={}",
-                    new Object[] {
-                        s,
-                        dataview.getMimeType(),
-                        dataview.getPid(),
-                        dataview.getRef()
-                    });
+                    s, dataview.getMimeType(), dataview.getPid(),
+                    dataview.getRef());
             if (dataview instanceof DataViewGenericDOM) {
                 final DataViewGenericDOM view = (DataViewGenericDOM) dataview;
                 final Node root = view.getDocument().getFirstChild();
                 logger.info("{}DataView: root element <{}> / {}",
-                        new Object[] {
-                            s,
-                            root.getNodeName(),
-                            root.getOwnerDocument().hashCode() });
+                        s, root.getNodeName(),
+                        root.getOwnerDocument().hashCode());
             } else if (dataview instanceof DataViewGenericString) {
                 final DataViewGenericString view = (DataViewGenericString) dataview;
-                logger.info("{}DataView: data = {}",
-                        new Object[] {
-                            s,
-                            view.getContent() });
+                logger.info("{}DataView: data = {}", s, view.getContent());
             } else if (dataview.isMimeType(DataViewKWIC.TYPE)) {
                 final DataViewKWIC kw = (DataViewKWIC) dataview;
                 logger.info("{}DataView: {} / {} / {}",
-                        new Object[] {
-                            s,
-                            kw.getLeft(),
-                            kw.getKeyword(),
-                            kw.getRight() });
+                        s, kw.getLeft(), kw.getKeyword(), kw.getRight());
             }
         }