Merge branch 'main' into _ogcapi_records_geojson

Author: davidblasby

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

@@ -288,13 +288,12 @@ public ResponseEntity<Void> collectionsCollectionIdItemsGet(
 
       boolean allSourceFields =
           mediaType.equals(GnMediaType.APPLICATION_DCAT2_XML)
-
           || mediaType.equals(GnMediaType.APPLICATION_RDF_XML)
           || mediaType.equals(GnMediaType.APPLICATION_GEOJSON)
           || mediaType.equals(GnMediaType.APPLICATION_JSON_LD)
           || mediaType.equals(MediaType.APPLICATION_JSON)
           || mediaType.equals(GnMediaType.APPLICATION_RDF_XML);
-
+          || mediaType.equals(GnMediaType.APPLICATION_RDF_XML);
 
       return collectionsCollectionIdItemsGetInternal(
           query,
@@ -504,6 +503,7 @@ private String search(
       Query requestQuery,
       HttpServletRequest request,
       boolean allSourceFields) {
+      HttpServletRequest request, boolean allSourceFields) {
 
     Source source = collectionService.retrieveSourceForCollection(requestQuery.getCollectionId());
 

modules/services/ogc-api-records/src/main/java/org/fao/geonet/ogcapi/records/util/RecordsEsQueryBuilder.java

@@ -32,6 +32,8 @@
 @Slf4j(topic = "org.fao.geonet.ogcapi")
 public class RecordsEsQueryBuilder {
 
+
+  private static final String SORT_BY_SEPARATOR = ",";
   // TODO: Sources depends on output type
   private static final List<String> defaultSources = Arrays.asList(
       "resourceTitleObject", "resourceAbstractObject",
@@ -44,9 +46,6 @@ public class RecordsEsQueryBuilder {
       "createDate", "mainLanguage", "geom", "formats",
       "resourceTemporalDateRange","resourceTemporalExtentDateRange");
 
-  private static final String SORT_BY_SEPARATOR = ",";
-
-
   private static final String defaultSpatialOperation = "intersects";
   @Autowired
   QueryToElastic queryToElastic;