code cleanup

Author: david-blasby

modules/services/ogc-api-records/src/main/java/org/fao/geonet/ogcapi/records/controller/ItemApiController.java

@@ -171,18 +171,7 @@ public ResponseEntity<Void> collectionsCollectionIdItemsRecordIdGet(
         || mediaType.equals(GnMediaType.APPLICATION_GEOJSON)
         || mediaType.equals(GnMediaType.APPLICATION_ELASTICJSON)) {
       try {
-        String type = "gnindex";
-        if (mediaType.equals(MediaType.APPLICATION_JSON)) {
-          type = "json";
-        } else {
-          if (mediaType.equals(GnMediaType.APPLICATION_GEOJSON)) {
-            type = "geojson";
-          } else {
-            if (mediaType.equals(GnMediaType.APPLICATION_ELASTICJSON)) {
-              type = "gnindex";
-            }
-          }
-        }
+        String type = getSimplifiedMediaType(mediaType);
 
         JsonNode recordAsJson = recordService.getRecordAsJson(collectionId, recordId,
             request, source, type);
@@ -212,6 +201,22 @@ public ResponseEntity<Void> collectionsCollectionIdItemsRecordIdGet(
     }
   }
 
+  private String getSimplifiedMediaType(MediaType mediaType) {
+    String type = "gnindex";
+    if (mediaType.equals(MediaType.APPLICATION_JSON)) {
+      type = "json";
+    } else {
+      if (mediaType.equals(GnMediaType.APPLICATION_GEOJSON)) {
+        type = "geojson";
+      } else {
+        if (mediaType.equals(GnMediaType.APPLICATION_ELASTICJSON)) {
+          type = "gnindex";
+        }
+      }
+    }
+    return type;
+  }
+
 
   /**
    * Describe the collection items.

modules/services/ogc-api-records/src/test/java/org/fao/geonet/ogcapi/records/service/QueryBuilderTest.java

@@ -65,15 +65,15 @@ public void testSimple() {
     assertIterableEquals(query.bbox,
         Arrays.asList(new Double(0), new Double(0),
             new Double(100), new Double(100)));
-    assertEquals(query.datetime, "2024-10-22T21:10:03Z");
-    assertEquals(query.limit, new Integer(100));
-    assertEquals(query.startIndex, new Integer(10));
-    assertEquals(query.type, "type");
-    assertEquals(query.q, Arrays.asList("abc", "def"));
-    assertEquals(query.ids, Arrays.asList("id1", "id2"));
-    assertEquals(query.externalIds, Arrays.asList("ex-id1", "ex-id2"));
-    assertEquals(query.sortBy, Arrays.asList("sort-p1", "sort-p2"));
-    assertEquals(query.propValues, new LinkedHashMap<>());
+    assertEquals( "2024-10-22T21:10:03Z",query.datetime);
+    assertEquals( new Integer(100),query.limit);
+    assertEquals(new Integer(10),query.startIndex);
+    assertEquals("type",query.type );
+    assertEquals(Arrays.asList("abc", "def"),query.q);
+    assertEquals( Arrays.asList("id1", "id2"),query.ids);
+    assertEquals(Arrays.asList("ex-id1", "ex-id2"),query.externalIds);
+    assertEquals(Arrays.asList("sort-p1", "sort-p2"),query.sortBy);
+    assertEquals(new LinkedHashMap<>(),query.propValues);
   }
 
   /**

modules/services/ogc-api-records/src/test/java/org/fao/geonet/ogcapi/records/service/QueryToElasticTest.java

@@ -58,10 +58,12 @@ public QueryablesService initQueryablesService(String pname, JsonProperty proper
     queryables.getProperties().put(pname, property);
 
     QueryablesService queryablesService = new QueryablesService() {
+      @Override
       public JsonSchema buildQueryables(String collectionId) {
         return queryables;
       }
 
+      @Override
       public JsonSchema getFullQueryables(String collectionId){
         return queryables;
       }