Changeset 7279 for FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/utils/SimpleEndpointDescriptionParser.java

Timestamp:

01/10/22 12:04:49 (2 years ago)

Author:

Oliver Schonefeld

Message:

• cleanup

File:

• FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/utils/SimpleEndpointDescriptionParser.java (modified) (12 diffs)

FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/utils/SimpleEndpointDescriptionParser.java

@@ -185 +185 @@
 
         // capabilities
-        List<URI> capabilities = new ArrayList<URI>();
+        List<URI> capabilities = new ArrayList<>();
         exp = xpath.compile("//ed:Capabilities/ed:Capability");
         NodeList list =
@@ -225 +225 @@
 
         // used to check for uniqueness of id attribute
-        final Set<String> xml_ids = new HashSet<String>();
+        final Set<String> xml_ids = new HashSet<>();
 
         // supported data views
-        List<DataView> supportedDataViews = new ArrayList<DataView>();
+        List<DataView> supportedDataViews = new ArrayList<>();
         exp = xpath.compile("//ed:SupportedDataViews/ed:SupportedDataView");
         list = (NodeList) exp.evaluate(doc, XPathConstants.NODESET);
@@ -406 +406 @@
 
                 if (supportedLayers == null) {
-                    supportedLayers = new ArrayList<Layer>(list.getLength());
+                    supportedLayers = new ArrayList<>(list.getLength());
                 }
                 supportedLayers.add(new Layer(id, resultId, type, encoding,
@@ -426 +426 @@
         exp = xpath.compile("/ed:EndpointDescription/ed:Resources/ed:Resource");
         list = (NodeList) exp.evaluate(doc, XPathConstants.NODESET);
-        final Set<String> pids = new HashSet<String>();
+        final Set<String> pids = new HashSet<>();
         List<ResourceInfo> resources = parseResources(xpath, list, pids,
                 supportedDataViews, supportedLayers, version, hasAdvView);
@@ -511 +511 @@
 
                     if (titles == null) {
-                        titles = new HashMap<String, String>();
+                        titles = new HashMap<>();
                     }
                     if (titles.containsKey(lang)) {
@@ -542 +542 @@
 
                     if (descrs == null) {
-                        descrs = new HashMap<String, String>();
+                        descrs = new HashMap<>();
                     }
 
@@ -592 +592 @@
 
                     if (langs == null) {
-                        langs = new ArrayList<String>();
+                        langs = new ArrayList<>();
                     }
                     langs.add(s);
@@ -614 +614 @@
                 }
 
-                for (int i = 0; i < refs.length; i++) {
+                for (String ref2 : refs) {
                     DataView dataview = null;
                     for (DataView dv : supportedDataViews) {
-                        if (refs[i].equals(dv.getIdentifier())) {
+                        if (ref2.equals(dv.getIdentifier())) {
                             dataview = dv;
                             break;
@@ -624 +624 @@
                     if (dataview != null) {
                         if (availableDataViews == null) {
-                            availableDataViews = new ArrayList<DataView>();
+                            availableDataViews = new ArrayList<>();
                         }
                         availableDataViews.add(dataview);
                     } else {
                         throw new SRUConfigException(
-                                "A data view with " + "identifier '" + refs[i] +
+                                "A data view with " + "identifier '" + ref2 +
                                         "' was not defined " +
                                         "in <SupportedDataViews>");
@@ -658 +658 @@
                 }
 
-                for (int i = 0; i < refs.length; i++) {
+                for (String ref2 : refs) {
                     Layer layer = null;
                     for (Layer l : supportedLayers) {
-                        if (refs[i].equals(l.getId())) {
+                        if (ref2.equals(l.getId())) {
                             layer = l;
                             break;
@@ -668 +668 @@
                     if (layer != null) {
                         if (availableLayers == null) {
-                            availableLayers = new ArrayList<Layer>();
+                            availableLayers = new ArrayList<>();
                         }
                         availableLayers.add(layer);
                     } else {
                         throw new SRUConfigException("A layer with " +
-                                "identifier '" + refs[i] +
+                                "identifier '" + ref2 +
                                 "' was not defined " + "in <SupportedLayers>");
                     }
@@ -692 +692 @@
 
             if (ris == null) {
-                ris = new ArrayList<ResourceInfo>();
+                ris = new ArrayList<>();
             }
             if ((availableLayers != null) && (version < 1)) {