From bae32e96c1199519fab47b277475483f892a9366 Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Mon, 28 Oct 2019 19:31:25 +0100
Subject: [PATCH] Removed some warnings
---
.../middleware/DublinCoreFieldLoader.java | 282 +++++++++---------
.../middleware/IdentifierListDelivererDC.java | 4 -
.../MetadataFormatListDeliverer.java | 2 -
.../middleware/RecordDelivererDC.java | 10 +-
.../middleware/RecordDelivererIDIOM.java | 11 +-
.../java/info/textgrid/middleware/Rest.java | 4 -
.../textgrid/middleware/SetDeliverer.java | 3 +
7 files changed, 150 insertions(+), 166 deletions(-)
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java b/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java
index f111ec06..3254d1ae 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java
@@ -4,32 +4,28 @@ import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-
import javax.xml.datatype.DatatypeConfigurationException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.elasticsearch.action.get.GetResponse;
import org.elasticsearch.search.SearchHit;
/**
* <p>
- * The Dublin Core Field Loader takes the results of the
- * ElasticSearch request and puts them into a String-List.
- * For each element of Dublin Core exists a seperate list.
+ * The Dublin Core Field Loader takes the results of the ElasticSearch request and puts them into a
+ * String-List. For each element of Dublin Core exists a separate list.
+ * </p>
*
- * For each element two functions are necessary because the datatype "SeachHit"
- * could contain more then one results and the GetResponse just one
+ * <p>
+ * For each element two functions are necessary because the datatype "SeachHit" could contain more
+ * then one results and the GetResponse just one.
* </p>
*
- * @author Maximilian Brodhun, SUB Goettingen
- * @author Stefan E. Funk, SUB Goettingen
- * @version 24.05.2019
- * @since 18.02.2014
+ * @author Maximilian Brodhun, SUB Göttingen
+ * @author Stefan E. Funk, SUB Göttingen
+ * @version 2019-05-24
+ * @since 2014-02-18
*/
public class DublinCoreFieldLoader {
- private static Log log = LogFactory.getLog(OAIPMHImpl.class);
-
/**
* @param hit contains results of the ElasticSearch request
* @param fields containing all fields from ElasticSearch related to this Dublin Core field
@@ -39,12 +35,10 @@ public class DublinCoreFieldLoader {
List<String> contributors = new ArrayList<String>();
-/* for (String field : fields) {
- if (hit.getFields().get(field) != null) {
- contributors.add(hit.getFields().get(field).getValues().get(0)
- .toString());
- }
- }*/
+ /*
+ * for (String field : fields) { if (hit.getFields().get(field) != null) {
+ * contributors.add(hit.getFields().get(field).getValues().get(0) .toString()); } }
+ */
return fillList(hit, fields);
}
@@ -55,21 +49,16 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setContributor(GetResponse responseWorkValues, String[] fields) {
-
- return fillList(responseWorkValues, fields);
+ return fillList(responseWorkValues, fields);
}
-
/**
* @param responseWorkValues contains results of the ElasticSearch request
* @param fields containing all fields from ElasticSearch related to this Dublin Core field
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setCreator(GetResponse responseWorkValues, String[] fields) {
-
- return fillList(responseWorkValues, fields);
-
-
+ return fillList(responseWorkValues, fields);
}
/**
@@ -78,8 +67,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setCreator(SearchHit hit, String[] fields) {
-
- return fillList(hit, fields);
+ return fillList(hit, fields);
}
/**
@@ -88,7 +76,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setCoverage(GetResponse responseWorkValues, String[] fields) {
- return fillList(responseWorkValues, fields);
+ return fillList(responseWorkValues, fields);
}
/**
@@ -97,7 +85,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setCoverage(SearchHit hit, String[] fields) {
- return fillList(hit, fields);
+ return fillList(hit, fields);
}
/**
@@ -106,8 +94,8 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setDate(GetResponse responseWorkValues, String[] fields) {
- //TODO: transform to OAI-PMH certificated time stamp
- return fillList(responseWorkValues, fields);
+ // TODO: transform to OAI-PMH certificated time stamp
+ return fillList(responseWorkValues, fields);
}
/**
@@ -118,10 +106,12 @@ public class DublinCoreFieldLoader {
public static List<String> setDate(SearchHit hit, String[] fields) {
List<String> dates = new ArrayList<String>();
+
+ // FIXME TADAA?
System.out.println("TADA");
+
for (String field : fields) {
if (hit.getFields().get(field) != null) {
-
try {
dates.add(OAIPMHUtillities.convertDateFormat(
hit.getFields().get(field).getValues().get(0).toString()).toXMLFormat());
@@ -144,8 +134,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setDescription(GetResponse responseWorkValues, String[] fields) {
-
- return fillList(responseWorkValues, fields);
+ return fillList(responseWorkValues, fields);
}
/**
@@ -154,7 +143,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setDescription(SearchHit hit, String[] fields) {
- return fillList(hit, fields);
+ return fillList(hit, fields);
}
/**
@@ -163,7 +152,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setFormat(SearchHit hit, String[] fields) {
- return fillList(hit, fields);
+ return fillList(hit, fields);
}
/**
@@ -172,8 +161,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setFormat(GetResponse responseWorkValues, String[] fields) {
-
- return fillList(responseWorkValues, fields);
+ return fillList(responseWorkValues, fields);
}
/**
@@ -182,7 +170,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setIdentifier(SearchHit hit, String[] fields) {
- return fillList(hit, fields);
+ return fillList(hit, fields);
}
/**
@@ -191,8 +179,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setIdentifier(GetResponse responseWorkValues, String[] fields) {
-
- return fillList(responseWorkValues, fields);
+ return fillList(responseWorkValues, fields);
}
/**
@@ -201,7 +188,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setLanguage(SearchHit hit, String[] fields) {
- return fillList(hit, fields);
+ return fillList(hit, fields);
}
/**
@@ -210,8 +197,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setLanguage(GetResponse responseWorkValues, String[] fields) {
-
- return fillList(responseWorkValues, fields);
+ return fillList(responseWorkValues, fields);
}
/**
@@ -220,7 +206,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setPublisher(SearchHit hit, String[] fields) {
- return fillList(hit, fields);
+ return fillList(hit, fields);
}
/**
@@ -229,8 +215,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setPublisher(GetResponse responseWorkValues, String[] fields) {
-
- return fillList(responseWorkValues, fields);
+ return fillList(responseWorkValues, fields);
}
/**
@@ -239,7 +224,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setRelation(SearchHit hit, String[] fields) {
- return fillList(hit, fields);
+ return fillList(hit, fields);
}
/**
@@ -248,8 +233,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setRelation(GetResponse responseWorkValues, String[] fields) {
-
- return fillList(responseWorkValues, fields);
+ return fillList(responseWorkValues, fields);
}
/**
@@ -259,11 +243,11 @@ public class DublinCoreFieldLoader {
*/
public static List<String> setRelationForWork(GetResponse responseWorkValues, String[] fields) {
- /*for(String field : fields) {
- System.out.println(field);
- }*/
-
- return fillList(responseWorkValues, fields);
+ /*
+ * for(String field : fields) { System.out.println(field); }
+ */
+
+ return fillList(responseWorkValues, fields);
}
/**
@@ -272,7 +256,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setRights(SearchHit hit, String[] fields) {
- return fillList(hit, fields);
+ return fillList(hit, fields);
}
/**
@@ -281,7 +265,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setRights(GetResponse responseWorkValues, String[] fields) {
- return fillList(responseWorkValues, fields);
+ return fillList(responseWorkValues, fields);
}
/**
@@ -290,7 +274,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setSources(SearchHit hit, String[] fields) {
- return fillList(hit, fields);
+ return fillList(hit, fields);
}
/**
@@ -299,8 +283,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setSources(GetResponse responseWorkValues, String[] fields) {
-
- return fillList(responseWorkValues, fields);
+ return fillList(responseWorkValues, fields);
}
/**
@@ -309,8 +292,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setSubject(GetResponse responseWorkValues, String[] fields) {
-
- return fillList(responseWorkValues, fields);
+ return fillList(responseWorkValues, fields);
}
/**
@@ -319,7 +301,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setSubject(SearchHit hit, String[] fields) {
- return fillList(hit, fields);
+ return fillList(hit, fields);
}
/**
@@ -328,7 +310,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setTitle(SearchHit hit, String[] fields) {
- return fillList(hit, fields);
+ return fillList(hit, fields);
}
/**
@@ -337,8 +319,7 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setTitle(GetResponse responseWorkValues, String[] fields) {
-
- return fillList(responseWorkValues, fields);
+ return fillList(responseWorkValues, fields);
}
/**
@@ -347,12 +328,10 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setType(GetResponse responseWorkValues, String[] fields) {
-
- //List<String> types = new ArrayList<String>();
-
+ // List<String> types = new ArrayList<String>();
return fillList(responseWorkValues, fields);
- }
-
+ }
+
/**
* @param hit contains results of the ElasticSearch request
@@ -360,78 +339,91 @@ public class DublinCoreFieldLoader {
* @return all elements mapped from TetxGrid metadata scheme to Dublin Core
*/
public static List<String> setType(SearchHit hit, String[] fields) {
- return fillList(hit, fields);
- }
-
- public static List<String> fillList(GetResponse responseWorkValues, String[] fields){
- List<String> list = new ArrayList<String>();
-
- if (responseWorkValues.isExists()) {
- if (fields != null) {
- for (String field : fields) {
- if(responseWorkValues.getSourceAsMap().get(field)==null ) {
- String[] requestedField = field.split("\\.");
- Map<String, Object> nestedMap = responseWorkValues.getSourceAsMap();
- String valueOfRequestedField=null;
- Map<String, Object> nestedMap2 = null;
- for(int i=0; i<requestedField.length; i++) {
- if(i<requestedField.length-1 && nestedMap!=null && nestedMap.get(requestedField[i])!=null) {
- nestedMap2 = (Map<String, Object>)nestedMap.get(requestedField[i]);
- }
- if(i==requestedField.length-1 &&
- nestedMap2!=null && nestedMap2.get(requestedField[i])!=null ) {
- valueOfRequestedField =nestedMap2.get(requestedField[i]).toString();
- if(valueOfRequestedField.length()>0) {
- list.add(valueOfRequestedField);
- }
- }
- nestedMap= nestedMap2;
- }
- }else {
- list.add(responseWorkValues.getSourceAsMap().get(field).toString());
- }
- }
- }
- }
-
- return list;
- }
-
- public static List<String> fillList(SearchHit hit, String[] fields){
- List<String> list = new ArrayList<String>();
-
- if (fields != null) {
- for (String field : fields) {
- if(hit.getSourceAsMap().get(field)==null ) {
- String[] requestedField = field.split("\\.");
- Map<String, Object> nestedMap = hit.getSourceAsMap();
- String valueOfRequestedField=null;
- Map<String, Object> nestedMap2 = null;
- for(int i=0; i<requestedField.length; i++) {
- if(i<requestedField.length-1 && nestedMap!=null && nestedMap.get(requestedField[i])!=null) {
- try {
- nestedMap2 = (Map<String, Object>)nestedMap.get(requestedField[i]);
- }catch(ClassCastException cce) {
-
- }
- }
- if(i==requestedField.length-1 &&
- nestedMap2!=null && nestedMap2.get(requestedField[i])!=null ) {
- valueOfRequestedField =nestedMap2.get(requestedField[i]).toString();
- if(valueOfRequestedField.length()>0) {
- list.add(valueOfRequestedField);
- }
- }
- nestedMap= nestedMap2;
- }
- }else {
- list.add(hit.getSourceAsMap().get(field).toString());
- }
- }
- }
-
-
- return list;
+ return fillList(hit, fields);
+ }
+
+ /**
+ * @param responseWorkValues
+ * @param fields
+ * @return
+ */
+ public static List<String> fillList(GetResponse responseWorkValues, String[] fields) {
+
+ List<String> list = new ArrayList<String>();
+
+ if (responseWorkValues.isExists()) {
+ if (fields != null) {
+ for (String field : fields) {
+ if (responseWorkValues.getSourceAsMap().get(field) == null) {
+ String[] requestedField = field.split("\\.");
+ Map<String, Object> nestedMap = responseWorkValues.getSourceAsMap();
+ String valueOfRequestedField = null;
+ Map<String, Object> nestedMap2 = null;
+ for (int i = 0; i < requestedField.length; i++) {
+ if (i < requestedField.length - 1 && nestedMap != null
+ && nestedMap.get(requestedField[i]) != null) {
+ nestedMap2 = (Map<String, Object>) nestedMap.get(requestedField[i]);
+ }
+ if (i == requestedField.length - 1 &&
+ nestedMap2 != null && nestedMap2.get(requestedField[i]) != null) {
+ valueOfRequestedField = nestedMap2.get(requestedField[i]).toString();
+ if (valueOfRequestedField.length() > 0) {
+ list.add(valueOfRequestedField);
+ }
+ }
+ nestedMap = nestedMap2;
+ }
+ } else {
+ list.add(responseWorkValues.getSourceAsMap().get(field).toString());
+ }
+ }
+ }
+ }
+
+ return list;
+ }
+
+ /**
+ * @param hit
+ * @param fields
+ * @return
+ */
+ public static List<String> fillList(SearchHit hit, String[] fields) {
+
+ List<String> list = new ArrayList<String>();
+
+ if (fields != null) {
+ for (String field : fields) {
+ if (hit.getSourceAsMap().get(field) == null) {
+ String[] requestedField = field.split("\\.");
+ Map<String, Object> nestedMap = hit.getSourceAsMap();
+ String valueOfRequestedField = null;
+ Map<String, Object> nestedMap2 = null;
+ for (int i = 0; i < requestedField.length; i++) {
+ if (i < requestedField.length - 1 && nestedMap != null
+ && nestedMap.get(requestedField[i]) != null) {
+ try {
+ nestedMap2 = (Map<String, Object>) nestedMap.get(requestedField[i]);
+ } catch (ClassCastException cce) {
+
+ }
+ }
+ if (i == requestedField.length - 1 &&
+ nestedMap2 != null && nestedMap2.get(requestedField[i]) != null) {
+ valueOfRequestedField = nestedMap2.get(requestedField[i]).toString();
+ if (valueOfRequestedField.length() > 0) {
+ list.add(valueOfRequestedField);
+ }
+ }
+ nestedMap = nestedMap2;
+ }
+ } else {
+ list.add(hit.getSourceAsMap().get(field).toString());
+ }
+ }
+ }
+
+ return list;
}
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java
index 4162bed9..8da344ed 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java
@@ -1,9 +1,5 @@
package info.textgrid.middleware;
-import info.textgrid.middleware.oaipmh.HeaderType;
-import info.textgrid.middleware.oaipmh.ListIdentifiersType;
-import info.textgrid.middleware.oaipmh.ResumptionTokenType;
-import info.textgrid.namespaces.middleware.tgcrud.common.TextGridMimetypes;
import java.io.IOException;
import java.text.ParseException;
import java.util.Hashtable;
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDeliverer.java
index acc971a1..1930ba0c 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDeliverer.java
@@ -1,9 +1,7 @@
package info.textgrid.middleware;
import java.io.IOException;
-import org.elasticsearch.action.get.GetAction;
import org.elasticsearch.action.get.GetRequest;
-import org.elasticsearch.action.get.GetRequestBuilder;
import org.elasticsearch.action.get.GetResponse;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.common.Strings;
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java
index abf24cc6..fe7de636 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java
@@ -3,23 +3,18 @@ package info.textgrid.middleware;
import java.io.IOException;
import java.text.ParseException;
import java.util.Map;
-import javax.swing.plaf.synth.SynthSpinnerUI;
import javax.xml.datatype.DatatypeConfigurationException;
import org.apache.commons.logging.LogFactory;
import org.elasticsearch.action.get.GetRequest;
-import org.elasticsearch.action.get.GetRequestBuilder;
import org.elasticsearch.action.get.GetResponse;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.common.Strings;
import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
import info.textgrid.middleware.oaipmh.GetRecordType;
import info.textgrid.middleware.oaipmh.HeaderType;
import info.textgrid.middleware.oaipmh.RecordType;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
/**
* FIXME
@@ -33,7 +28,6 @@ public class RecordDelivererDC extends RecordDelivererAbstract {
private String[] fields;
private String[] workFields;
-
private String formatField;
private String formatToFilter;
private String dateOfObjectCreation;
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
index 15127438..7804bc97 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
@@ -5,16 +5,15 @@ import java.io.StringReader;
import java.text.ParseException;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
import org.apache.commons.logging.LogFactory;
import org.classicmayan.tools.ClassicMayanMetsMods;
import org.elasticsearch.action.get.GetRequest;
-import org.elasticsearch.action.get.GetRequestBuilder;
import org.elasticsearch.action.get.GetResponse;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.common.Strings;
import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
import info.textgrid.middleware.oaipmh.GetRecordType;
import info.textgrid.middleware.oaipmh.HeaderType;
import info.textgrid.middleware.oaipmh.MetadataType;
@@ -173,10 +172,16 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract {
// return recordHeader;
}
+ /**
+ * @return
+ */
public OAI_ESClient getOaiEsClient() {
return this.oaiEsClient;
}
+ /**
+ * @param oaiEsClient
+ */
public void setOaiEsClient(OAI_ESClient oaiEsClient) {
this.oaiEsClient = oaiEsClient;
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/Rest.java b/oaipmh-core/src/main/java/info/textgrid/middleware/Rest.java
index 84c2adfa..25f68a22 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/Rest.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/Rest.java
@@ -4,8 +4,6 @@ import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Response;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import info.textgrid.utils.httpclient.TGHttpConnection;
/**
@@ -13,8 +11,6 @@ import info.textgrid.utils.httpclient.TGHttpConnection;
*/
public class Rest {
- private Log log = LogFactory.getLog(Rest.class);
-
/**
* @return
*/
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
index e2a29c71..3fb24ce7 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
@@ -186,6 +186,9 @@ public class SetDeliverer {
this.formatField = formatField;
}
+ /**
+ * @return
+ */
public String getFormatToFilter() {
return this.formatToFilter;
}
--
GitLab