From 670c434662d715eb45ab39fdee0cdd9c5afbff32 Mon Sep 17 00:00:00 2001 From: Rod Scott Date: Fri, 14 Feb 2025 14:31:25 +0000 Subject: [PATCH 1/2] Quieten constructor logging EMC-436 --- .gitignore | 2 +- .../catalogue/auth/oidc/DataLabsAuthenticationProvider.java | 2 +- .../catalogue/auth/oidc/DatalabsCatalogueUserProvider.java | 2 +- .../catalogue/auth/oidc/RememberMeServicesDataLabs.java | 2 +- .../catalogue/catalogue/InMemoryCatalogueService.java | 2 +- .../ac/ceh/gateway/catalogue/citation/CitationService.java | 2 +- .../gateway/catalogue/config/IndexingServicesConfig.java | 2 +- .../gateway/catalogue/controllers/DataciteController.java | 2 +- .../gateway/catalogue/controllers/DocumentController.java | 2 +- .../controllers/DocumentPublicationController.java | 2 +- .../gateway/catalogue/controllers/DownloadController.java | 2 +- .../catalogue/controllers/ErammpModelController.java | 2 +- .../gateway/catalogue/controllers/GeminiWafController.java | 2 +- .../gateway/catalogue/controllers/MapViewerController.java | 2 +- .../gateway/catalogue/controllers/NercWafController.java | 2 +- .../catalogue/controllers/OnlineResourceController.java | 2 +- .../catalogue/controllers/OsdpDocumentController.java | 2 +- .../gateway/catalogue/controllers/PermissionController.java | 2 +- .../catalogue/controllers/SampleArchiveController.java | 2 +- .../ceh/gateway/catalogue/controllers/SparqlController.java | 2 +- .../gateway/catalogue/controllers/SparqlUiController.java | 2 +- .../converters/Gml2WmsFeatureInfoMessageConverter.java | 2 +- .../catalogue/converters/Jaxb2HttpMessageConverter.java | 2 +- .../converters/Object2TemplatedMessageConverter.java | 2 +- .../converters/TransparentProxyMessageConverter.java | 2 +- .../converters/UkeofXml2EFDocumentMessageConverter.java | 2 +- .../converters/WmsFeatureInfo2XmlMessageConverter.java | 2 +- .../converters/Xml2WmsCapabilitiesMessageConverter.java | 2 +- .../converters/wmsCapabilities/LayerConverter.java | 2 +- .../ac/ceh/gateway/catalogue/datacite/DataciteService.java | 2 +- .../catalogue/deims/DeimsSolrScheduledSiteService.java | 2 +- .../catalogue/document/DocumentIdentifierService.java | 2 +- .../catalogue/document/ExtensionDocumentListingService.java | 2 +- .../catalogue/document/JacksonDocumentInfoMapper.java | 2 +- .../gateway/catalogue/document/reading/DocumentReader.java | 2 +- .../document/reading/HashMapDocumentTypeLookupService.java | 2 +- .../document/writing/MessageConverterWritingService.java | 2 +- .../catalogue/indexing/IndexingFileEventListener.java | 2 +- .../indexing/datacite/DataciteIndexingService.java | 2 +- .../indexing/jena/JenaIndexBaseMonitoringTypeGenerator.java | 2 +- .../indexing/jena/JenaIndexCodeDocumentGenerator.java | 2 +- .../indexing/jena/JenaIndexElterDocumentGenerator.java | 2 +- .../indexing/jena/JenaIndexGeminiDocumentGenerator.java | 2 +- .../jena/JenaIndexInfrastructureRecordGenerator.java | 2 +- .../indexing/jena/JenaIndexLinkDocumentGenerator.java | 2 +- .../indexing/jena/JenaIndexMonitoringFacilityGenerator.java | 2 +- .../indexing/mapserver/MapServerIndexGenerator.java | 2 +- .../indexing/mapserver/MapServerIndexingService.java | 2 +- .../indexing/network/NetworkFileEventListener.java | 2 +- .../catalogue/indexing/solr/IndexGeneratorRegistry.java | 2 +- .../indexing/solr/SolrIndexElterDocumentGenerator.java | 2 +- .../indexing/solr/SolrIndexLinkDocumentGenerator.java | 2 +- .../indexing/solr/SolrIndexMetadataDocumentGenerator.java | 2 +- .../indexing/solr/SolrIndexMonitoringActivityGenerator.java | 2 +- .../indexing/solr/SolrIndexMonitoringFacilityGenerator.java | 2 +- .../indexing/solr/SolrIndexMonitoringNetworkGenerator.java | 2 +- .../solr/SolrIndexMonitoringProgrammeGenerator.java | 2 +- .../catalogue/indexing/solr/SolrIndexingService.java | 2 +- .../indexing/validation/ValidationIndexGenerator.java | 2 +- .../indexing/validation/ValidationIndexingService.java | 2 +- .../ceh/gateway/catalogue/metrics/JDBCMetricsService.java | 2 +- .../BaseMonitoringTypePostProcessingService.java | 2 +- .../postprocess/ClassMapPostProcessingService.java | 2 +- .../postprocess/GeminiDocumentPostProcessingService.java | 2 +- .../gateway/catalogue/prometheus/DocumentCountService.java | 2 +- .../catalogue/publication/DocumentPublicationService.java | 2 +- .../ac/ceh/gateway/catalogue/quality/QualityController.java | 2 +- .../gateway/catalogue/repository/GitDocumentRepository.java | 2 +- .../ac/ceh/gateway/catalogue/repository/GitRepoWrapper.java | 2 +- .../ServiceAgreementPublicationController.java | 2 +- .../ServiceAgreementPublicationService.java | 2 +- .../catalogue/services/DataRepositoryOptimizingService.java | 2 +- .../gateway/catalogue/services/MetadataListingService.java | 2 +- .../gateway/catalogue/sparql/SparqlVocabularyRetriever.java | 6 +++--- .../gateway/catalogue/sparql/SparqlVocabularyService.java | 2 +- .../templateHelpers/DownloadOrderDetailsService.java | 2 +- .../catalogue/templateHelpers/FileDetailsService.java | 2 +- .../gateway/catalogue/templateHelpers/GeminiExtractor.java | 2 +- .../ac/ceh/gateway/catalogue/upload/hubbub/JiraService.java | 2 +- .../gateway/catalogue/upload/hubbub/UploadController.java | 2 +- .../ceh/gateway/catalogue/upload/hubbub/UploadService.java | 2 +- .../catalogue/upload/simple/FileSystemStorageService.java | 2 +- .../gateway/catalogue/upload/simple/UploadController.java | 2 +- .../catalogue/vocabularies/LocalKeywordVocabulary.java | 2 +- .../catalogue/vocabularies/SparqlKeywordVocabulary.java | 2 +- .../catalogue/wms/GetCapabilitiesObtainerService.java | 2 +- .../ceh/gateway/catalogue/wms/MapServerDetailsService.java | 2 +- .../ac/ceh/gateway/catalogue/wms/TMSToWMSGetMapService.java | 2 +- 88 files changed, 90 insertions(+), 90 deletions(-) diff --git a/.gitignore b/.gitignore index 6e9a30b9f..1e9af4c0f 100644 --- a/.gitignore +++ b/.gitignore @@ -36,7 +36,7 @@ javac-services* .project org.eclipse.* DevStartupController.java -docker-compose.override.yml *.private.env.json /sparql.http /oidc-roles.json +/fixtures/solr/ror/config.properties diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/DataLabsAuthenticationProvider.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/DataLabsAuthenticationProvider.java index 662dfa51b..50f49e106 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/DataLabsAuthenticationProvider.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/DataLabsAuthenticationProvider.java @@ -49,7 +49,7 @@ public DataLabsAuthenticationProvider( ) { this.restTemplate = restTemplate; this.address = UriComponentsBuilder.fromHttpUrl(address).build().toUri(); - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/DatalabsCatalogueUserProvider.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/DatalabsCatalogueUserProvider.java index fef3d292e..a3ffe0b5e 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/DatalabsCatalogueUserProvider.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/DatalabsCatalogueUserProvider.java @@ -34,7 +34,7 @@ public DatalabsCatalogueUserProvider( ) { this.restTemplate = restTemplate; this.usersEndpoint = UriComponentsBuilder.fromHttpUrl(usersEndpoint).build().toUri(); - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/RememberMeServicesDataLabs.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/RememberMeServicesDataLabs.java index 8e6158202..0bf76ac3c 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/RememberMeServicesDataLabs.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/RememberMeServicesDataLabs.java @@ -47,7 +47,7 @@ public class RememberMeServicesDataLabs implements RememberMeServices { this.cookieName = cookieName; this.jwtProcessor = createJwtProcessor(keySource, issuer); this.catalogueUserProvider = catalogueUserProvider; - log.info("Creating {}", this); + log.info("Creating"); } @SneakyThrows diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/catalogue/InMemoryCatalogueService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/catalogue/InMemoryCatalogueService.java index c6b049b28..a1f29c416 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/catalogue/InMemoryCatalogueService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/catalogue/InMemoryCatalogueService.java @@ -21,7 +21,7 @@ public InMemoryCatalogueService( this.catalogues.put(catalogue.getId(), catalogue); } this.defaultCatalogueKey = defaultCatalogueKey; - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/citation/CitationService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/citation/CitationService.java index 81672b074..86b5b8830 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/citation/CitationService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/citation/CitationService.java @@ -30,7 +30,7 @@ public CitationService( @Value("${doi.prefix}") String nercDoiPrefix ) { this.nercDoiPrefix = nercDoiPrefix; - log.info("Creating {}", this); + log.info("Creating"); } /** diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/config/IndexingServicesConfig.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/config/IndexingServicesConfig.java index 24533b7ab..3923ed857 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/config/IndexingServicesConfig.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/config/IndexingServicesConfig.java @@ -166,7 +166,7 @@ public SolrIndexingService solrIndexingService( IndexGeneratorRegistry indexGeneratorRegistry = new IndexGeneratorRegistry<>(mappings); linkDocumentGenerator.setIndexGeneratorRegistry(indexGeneratorRegistry); - log.info("Set repository & registry on {}", linkDocumentGenerator); + log.debug("Set repository & registry on {}", linkDocumentGenerator); return new SolrIndexingService( bundledReaderService, diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/DataciteController.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/DataciteController.java index d920d8763..383fdbc88 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/DataciteController.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/DataciteController.java @@ -42,7 +42,7 @@ public DataciteController( this.repo = repo; this.identifierService = identifierService; this.dataciteService = dataciteService; - log.info("Creating {}", this); + log.info("Creating"); } @GetMapping(value="{file}/datacite.xml") diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/DocumentController.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/DocumentController.java index 5a33f1ccc..d80706b77 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/DocumentController.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/DocumentController.java @@ -51,7 +51,7 @@ public DocumentController( super(documentRepository); this.metricsService = metricsService; this.metricsExcludedUsers = metricExcludedUsers; - log.info("Creating {}", this); + log.info("Creating"); } @RequestMapping (value = "documents/upload", diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/DocumentPublicationController.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/DocumentPublicationController.java index 5864abc4f..9097f6a9a 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/DocumentPublicationController.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/DocumentPublicationController.java @@ -20,7 +20,7 @@ public class DocumentPublicationController { public DocumentPublicationController(@Qualifier("document") PublicationService publicationService) { this.publicationService = publicationService; - log.info("Creating {}", this); + log.info("Creating"); } @PreAuthorize("@permission.toAccess(#user, #file, 'VIEW')") diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/DownloadController.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/DownloadController.java index 887e6b78b..93d8a6074 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/DownloadController.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/DownloadController.java @@ -44,7 +44,7 @@ public DownloadController( Pattern.compile(packageUrlRegex), Pattern.compile(datastoreUrlRegex) ); - log.info("Creating {}", this); + log.info("Creating"); } @GetMapping("download/{uuid}") diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/ErammpModelController.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/ErammpModelController.java index 29ed3c633..045c1af32 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/ErammpModelController.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/ErammpModelController.java @@ -22,7 +22,7 @@ public class ErammpModelController extends AbstractDocumentController { public ErammpModelController(DocumentRepository documentRepository) { super(documentRepository); - log.info("Creating {}", this); + log.info("Creating"); } @PreAuthorize("@permission.userCanCreate(#catalogue)") diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/GeminiWafController.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/GeminiWafController.java index c8e4a3928..19412136e 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/GeminiWafController.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/GeminiWafController.java @@ -38,7 +38,7 @@ public GeminiWafController( DataRepository repo, MetadataListingService listing) { this.repo = repo; this.listing = listing; - log.info("Creating {}", this); + log.info("Creating"); } @GetMapping("/") diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/MapViewerController.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/MapViewerController.java index bdeec9682..e53418a76 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/MapViewerController.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/MapViewerController.java @@ -40,7 +40,7 @@ public class MapViewerController { public MapViewerController(@Qualifier("wms") RestTemplate rest) { this.rest = rest; - log.info("Creating {}", this); + log.info("Creating"); } @SuppressWarnings("SpringMVCViewInspection") diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/NercWafController.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/NercWafController.java index c16439894..cb2be3538 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/NercWafController.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/NercWafController.java @@ -49,7 +49,7 @@ public NercWafController( ) { this.repo = repo; this.listing = listing; - log.info("Creating {}", this); + log.info("Creating"); } @GetMapping("/") diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/OnlineResourceController.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/OnlineResourceController.java index e76de85b1..8cb41812e 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/OnlineResourceController.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/OnlineResourceController.java @@ -39,7 +39,7 @@ public OnlineResourceController(BundledReaderService documentB this.getCapabilitiesObtainerService = getCapabilitiesObtainerService; this.tmsToWmsGetMapService = tmsToWmsGetMapService; this.mapServerDetailsService = mapServerDetailsService; - log.info("Creating {}", this); + log.info("Creating"); } @SneakyThrows diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/OsdpDocumentController.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/OsdpDocumentController.java index 70e767ef3..e66765c22 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/OsdpDocumentController.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/OsdpDocumentController.java @@ -26,7 +26,7 @@ public class OsdpDocumentController extends AbstractDocumentController { public OsdpDocumentController(DocumentRepository documentRepository) { super(documentRepository); - log.info("Creating {}", this); + log.info("Creating"); } @PreAuthorize("@permission.userCanCreate(#catalogue)") diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/PermissionController.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/PermissionController.java index b248ef592..37ce2294c 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/PermissionController.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/PermissionController.java @@ -32,7 +32,7 @@ public PermissionController(PermissionService permissionService, { this.permissionService = permissionService; this.documentRepository = documentRepository; - log.info("Creating {}", this); + log.info("Creating"); } @PreAuthorize("@permission.toAccess(#user, #file, 'VIEW')") diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/SampleArchiveController.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/SampleArchiveController.java index 7499984a9..9c1e69364 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/SampleArchiveController.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/SampleArchiveController.java @@ -21,7 +21,7 @@ public class SampleArchiveController extends AbstractDocumentController { public SampleArchiveController(DocumentRepository documentRepository) { super(documentRepository); - log.info("Creating {}", this); + log.info("Creating"); } @PreAuthorize("@permission.userCanCreate(#catalogue)") diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/SparqlController.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/SparqlController.java index ef08b2d46..1868bb6f8 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/SparqlController.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/SparqlController.java @@ -18,7 +18,7 @@ public class SparqlController { public SparqlController(Dataset jenaTdb) { this.jenaTdb = jenaTdb; - log.info("Creating {}", this); + log.info("Creating"); } @GetMapping diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/SparqlUiController.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/SparqlUiController.java index 2b3d1effc..7f82c061e 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/SparqlUiController.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/SparqlUiController.java @@ -17,7 +17,7 @@ public class SparqlUiController { public SparqlUiController(@Value("${fuseki.url}") String hostname) { this.sparqlEndpoint = hostname + "/ds/sparql"; - log.info("creating {}", this); + log.info("Creating"); } @GetMapping("sparql") diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/Gml2WmsFeatureInfoMessageConverter.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/Gml2WmsFeatureInfoMessageConverter.java index dc9e596b6..eaa958d04 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/Gml2WmsFeatureInfoMessageConverter.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/Gml2WmsFeatureInfoMessageConverter.java @@ -43,7 +43,7 @@ public Gml2WmsFeatureInfoMessageConverter() throws XPathExpressionException { this.layers = xpath.compile(LAYERS); this.features = xpath.compile(FEATURES); this.attributes = xpath.compile(ATTRIBUTES); - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/Jaxb2HttpMessageConverter.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/Jaxb2HttpMessageConverter.java index 57daa4688..61ba23663 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/Jaxb2HttpMessageConverter.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/Jaxb2HttpMessageConverter.java @@ -33,7 +33,7 @@ public class Jaxb2HttpMessageConverter extends Jaxb2RootElementHttpMessageConver public Jaxb2HttpMessageConverter(String namespace, String schemaLocation) { this.namespace = checkNotNull(emptyToNull(namespace)); this.schemaLocation = checkNotNull(emptyToNull(schemaLocation)); - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/Object2TemplatedMessageConverter.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/Object2TemplatedMessageConverter.java index ccadf084c..9ddc89fb2 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/Object2TemplatedMessageConverter.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/Object2TemplatedMessageConverter.java @@ -34,7 +34,7 @@ public class Object2TemplatedMessageConverter extends AbstractHttpMessageConv public Object2TemplatedMessageConverter(Class clazz, Configuration configuration) { this.clazz = clazz; this.configuration = configuration; - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/TransparentProxyMessageConverter.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/TransparentProxyMessageConverter.java index f567036bf..976bc21cc 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/TransparentProxyMessageConverter.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/TransparentProxyMessageConverter.java @@ -29,7 +29,7 @@ public class TransparentProxyMessageConverter implements HttpMessageConverter { public WmsFeatureInfo2XmlMessageConverter() { super(MediaType.TEXT_XML); - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/Xml2WmsCapabilitiesMessageConverter.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/Xml2WmsCapabilitiesMessageConverter.java index ca53ce6eb..337ef1a2d 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/Xml2WmsCapabilitiesMessageConverter.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/Xml2WmsCapabilitiesMessageConverter.java @@ -40,7 +40,7 @@ public Xml2WmsCapabilitiesMessageConverter() { this.layerConverter = new LayerConverter(xpath); this.map = xpath.compile(MAP_URL); this.featureInfo = xpath.compile(FEATURE_INFO_URL); - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/wmsCapabilities/LayerConverter.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/wmsCapabilities/LayerConverter.java index 8b9af84de..a76bec88d 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/wmsCapabilities/LayerConverter.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/wmsCapabilities/LayerConverter.java @@ -25,7 +25,7 @@ public LayerConverter(XPath xpath) throws XPathExpressionException { this.name = xpath.compile("wms:Name"); this.title = xpath.compile("wms:Title"); this.legendUrl = xpath.compile("wms:Style[wms:Name = 'default']/wms:LegendURL/wms:OnlineResource/@xlink:href"); - log.info("Creating {}", this); + log.info("Creating"); } public List convert(Document document) throws XPathExpressionException { diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/datacite/DataciteService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/datacite/DataciteService.java index 3ce6bdfab..6e6f4174f 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/datacite/DataciteService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/datacite/DataciteService.java @@ -76,7 +76,7 @@ public DataciteService( this.identifierService = identifierService; this.configuration = configuration; this.restTemplate = restTemplate; - log.info("Creating {}", this); + log.info("Creating"); } /** diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/deims/DeimsSolrScheduledSiteService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/deims/DeimsSolrScheduledSiteService.java index e27ac3806..3a2df0549 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/deims/DeimsSolrScheduledSiteService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/deims/DeimsSolrScheduledSiteService.java @@ -36,7 +36,7 @@ public DeimsSolrScheduledSiteService( this.restTemplate = restTemplate; this.solrClient = solrClient; this.address = address; - log.info("Creating {}", this); + log.info("Creating"); } @Scheduled(initialDelay = TimeConstants.ONE_MINUTE, fixedDelay = TimeConstants.SEVEN_DAYS) diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/DocumentIdentifierService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/DocumentIdentifierService.java index aa29acd9b..20a07fa9b 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/DocumentIdentifierService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/DocumentIdentifierService.java @@ -35,7 +35,7 @@ public DocumentIdentifierService( ) { this.baseUri = baseUri; this.replacement = replacement; - log.info("Creating {}", this); + log.info("Creating"); } /** diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/ExtensionDocumentListingService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/ExtensionDocumentListingService.java index a93a24997..c57e226e7 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/ExtensionDocumentListingService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/ExtensionDocumentListingService.java @@ -24,7 +24,7 @@ public class ExtensionDocumentListingService implements DocumentListingService { private final List extensions = Arrays.asList("meta", "raw"); public ExtensionDocumentListingService() { - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/JacksonDocumentInfoMapper.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/JacksonDocumentInfoMapper.java index c7c4bb13e..77d516668 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/JacksonDocumentInfoMapper.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/JacksonDocumentInfoMapper.java @@ -17,7 +17,7 @@ public class JacksonDocumentInfoMapper implements DocumentInfoMapper { public JacksonDocumentInfoMapper(ObjectMapper mapper, Class clazz) { this.mapper = mapper; this.clazz = clazz; - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/reading/DocumentReader.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/reading/DocumentReader.java index df6ba6675..444102d95 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/reading/DocumentReader.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/reading/DocumentReader.java @@ -19,7 +19,7 @@ public DocumentReader( @Value("${data.repository.location}") String datastore ) { this.datastore = datastore; - log.info("Creating {}", this); + log.info("Creating"); } public File read(String guid, String extension) { diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/reading/HashMapDocumentTypeLookupService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/reading/HashMapDocumentTypeLookupService.java index aaaefeee9..40f08f90f 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/reading/HashMapDocumentTypeLookupService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/reading/HashMapDocumentTypeLookupService.java @@ -15,7 +15,7 @@ public class HashMapDocumentTypeLookupService implements DocumentTypeLookupServi public HashMapDocumentTypeLookupService() { lookup = new HashMap<>(); - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/writing/MessageConverterWritingService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/writing/MessageConverterWritingService.java index 4a8561e83..14e18991c 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/writing/MessageConverterWritingService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/document/writing/MessageConverterWritingService.java @@ -25,7 +25,7 @@ public MessageConverterWritingService( List> messageConverters ) { this.messageConverters = messageConverters; - log.info("Creating {}", this); + log.info("Creating"); } public MessageConverterWritingService addMessageConverter(HttpMessageConverter converter) { diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/IndexingFileEventListener.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/IndexingFileEventListener.java index 525c1bdaa..d7a09d970 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/IndexingFileEventListener.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/IndexingFileEventListener.java @@ -19,7 +19,7 @@ public class IndexingFileEventListener { public IndexingFileEventListener(DocumentIndexingService service, DocumentListingService listingService) { this.service = service; this.listingService = listingService; - log.info("Creating {}", this); + log.info("Creating"); } @Subscribe diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/datacite/DataciteIndexingService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/datacite/DataciteIndexingService.java index fd1d23375..6ad474307 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/datacite/DataciteIndexingService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/datacite/DataciteIndexingService.java @@ -29,7 +29,7 @@ public DataciteIndexingService( ) { this.bundleReader = bundleReader; this.datacite = datacite; - log.info("Creating {}", this); + log.info("Creating"); } /** diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/jena/JenaIndexBaseMonitoringTypeGenerator.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/jena/JenaIndexBaseMonitoringTypeGenerator.java index 86abd3b01..faacb8575 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/jena/JenaIndexBaseMonitoringTypeGenerator.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/jena/JenaIndexBaseMonitoringTypeGenerator.java @@ -29,7 +29,7 @@ public class JenaIndexBaseMonitoringTypeGenerator implements IndexGenerator implements IndexGenerator { public IndexGeneratorRegistry(ClassMap> lookup) { this.lookup = lookup; - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/solr/SolrIndexElterDocumentGenerator.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/solr/SolrIndexElterDocumentGenerator.java index fb9991257..e3cf8a96f 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/solr/SolrIndexElterDocumentGenerator.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/solr/SolrIndexElterDocumentGenerator.java @@ -25,7 +25,7 @@ public class SolrIndexElterDocumentGenerator implements IndexGenerator validators) { this.validators = validators; - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/validation/ValidationIndexingService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/validation/ValidationIndexingService.java index fd1e6ee8c..bdb15cb58 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/validation/ValidationIndexingService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/indexing/validation/ValidationIndexingService.java @@ -43,7 +43,7 @@ public ValidationIndexingService( this.failed = new HashSet<>(); this.postProcessingService = postProcessingService; this.documentIdentifierService = documentIdentifierService; - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/metrics/JDBCMetricsService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/metrics/JDBCMetricsService.java index dbfe73a8a..013414ae4 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/metrics/JDBCMetricsService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/metrics/JDBCMetricsService.java @@ -50,7 +50,7 @@ public class JDBCMetricsService implements MetricsService { public JDBCMetricsService(@NonNull DataSource dataSource, DocumentRepository documentRepository) { - log.info("Creating {}", this); + log.info("Creating"); this.documentRepository = documentRepository; this.jdbcTemplate = new JdbcTemplate(dataSource); this.viewInserter = new SimpleJdbcInsert(dataSource).withTableName(VIEW_TABLE); diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/postprocess/BaseMonitoringTypePostProcessingService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/postprocess/BaseMonitoringTypePostProcessingService.java index 350891c0d..853e9ce2f 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/postprocess/BaseMonitoringTypePostProcessingService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/postprocess/BaseMonitoringTypePostProcessingService.java @@ -30,7 +30,7 @@ public class BaseMonitoringTypePostProcessingService implements PostProcessingSe public BaseMonitoringTypePostProcessingService(Dataset jenaTdb) { this.jenaTdb = jenaTdb; - log.info("Creating {}", this); + log.info("Creating"); } @SuppressWarnings("DuplicatedCode") diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/postprocess/ClassMapPostProcessingService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/postprocess/ClassMapPostProcessingService.java index 32c15526a..82f8f010a 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/postprocess/ClassMapPostProcessingService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/postprocess/ClassMapPostProcessingService.java @@ -17,7 +17,7 @@ public class ClassMapPostProcessingService implements PostProcessingService lookup) { this.lookup = lookup; - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/postprocess/GeminiDocumentPostProcessingService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/postprocess/GeminiDocumentPostProcessingService.java index ce6a701db..628e56157 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/postprocess/GeminiDocumentPostProcessingService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/postprocess/GeminiDocumentPostProcessingService.java @@ -22,7 +22,7 @@ public GeminiDocumentPostProcessingService( ) { this.citationService = citationService; this.dataciteService = dataciteService; - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/prometheus/DocumentCountService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/prometheus/DocumentCountService.java index 28b944974..f4351f1cb 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/prometheus/DocumentCountService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/prometheus/DocumentCountService.java @@ -26,7 +26,7 @@ public DocumentCountService(DataRepository repo, DocumentListingS this.listingService = listingService; this.documentBundleReader = documentBundleReader; Metrics.gauge("catalogue_documents", List.of(Tag.of("viewable", "public")), repo, this::countDocuments); - log.info("Constructed {}", this); + log.info("Creating"); } @SneakyThrows diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/publication/DocumentPublicationService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/publication/DocumentPublicationService.java index d74753316..387c2063e 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/publication/DocumentPublicationService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/publication/DocumentPublicationService.java @@ -34,7 +34,7 @@ public DocumentPublicationService( this.groupStore = groupStore; this.workflow = workflow; this.documentRepository = documentRepository; - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/quality/QualityController.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/quality/QualityController.java index e159db4dc..8424e3f74 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/quality/QualityController.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/quality/QualityController.java @@ -28,7 +28,7 @@ public QualityController( ) { this.metadataQualityService = metadataQualityService; this.metadataListingService = metadataListingService; - log.info("Creating {}", this); + log.info("Creating"); } @PreAuthorize("@permission.userCanEditRestrictedFields(#catalogue)") diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/repository/GitDocumentRepository.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/repository/GitDocumentRepository.java index b1d1a4327..42ef6427e 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/repository/GitDocumentRepository.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/repository/GitDocumentRepository.java @@ -49,7 +49,7 @@ public GitDocumentRepository( this.documentWriter = documentWriter; this.documentBundleReader = documentBundleReader; this.repo = repo; - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/repository/GitRepoWrapper.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/repository/GitRepoWrapper.java index 003a10184..0d5ec0877 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/repository/GitRepoWrapper.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/repository/GitRepoWrapper.java @@ -32,7 +32,7 @@ public GitRepoWrapper( this.repo = repo; this.documentInfoMapper = documentInfoMapper; this.facilityEventService = facilityEventService; - log.info("Creating {}", this); + log.info("Creating"); } @SneakyThrows diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/serviceagreement/ServiceAgreementPublicationController.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/serviceagreement/ServiceAgreementPublicationController.java index 300293a4f..207ff0b0c 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/serviceagreement/ServiceAgreementPublicationController.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/serviceagreement/ServiceAgreementPublicationController.java @@ -24,7 +24,7 @@ public ServiceAgreementPublicationController( @Qualifier("service-agreement") PublicationService publicationService ) { this.publicationService = publicationService; - log.info("Creating {}", this); + log.info("Creating"); } @PreAuthorize("@permission.userCanEditServiceAgreement(#file)") diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/serviceagreement/ServiceAgreementPublicationService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/serviceagreement/ServiceAgreementPublicationService.java index 0c14c0a6b..876a6947a 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/serviceagreement/ServiceAgreementPublicationService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/serviceagreement/ServiceAgreementPublicationService.java @@ -40,7 +40,7 @@ public ServiceAgreementPublicationService( this.groupStore = groupStore; this.workflow = workflow; this.serviceAgreementService = serviceAgreementService; - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/services/DataRepositoryOptimizingService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/services/DataRepositoryOptimizingService.java index e035a5f22..b8257f01f 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/services/DataRepositoryOptimizingService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/services/DataRepositoryOptimizingService.java @@ -22,7 +22,7 @@ public class DataRepositoryOptimizingService { public DataRepositoryOptimizingService(DataRepository repo) { this.repo = repo; - log.info("Creating {}", this); + log.info("Creating"); } @Scheduled(cron="0 0 0 * * ?") diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/services/MetadataListingService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/services/MetadataListingService.java index 067aa0842..28358a77d 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/services/MetadataListingService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/services/MetadataListingService.java @@ -41,7 +41,7 @@ public MetadataListingService( this.repo = repo; this.listingService = listingService; this.documentBundleReader = documentBundleReader; - log.info("Creating {}", this); + log.info("Creating"); } /** diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/sparql/SparqlVocabularyRetriever.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/sparql/SparqlVocabularyRetriever.java index 6ebd17dcf..cfff71f6e 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/sparql/SparqlVocabularyRetriever.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/sparql/SparqlVocabularyRetriever.java @@ -31,7 +31,7 @@ public class SparqlVocabularyRetriever implements VocabularyRetriever { public SparqlVocabularyRetriever(RestTemplate template, String sparqlEndpoint) { this.template = template; this.sparqlEndpoint = sparqlEndpoint; - log.info("Creating {}", this); + log.info("Creating"); } @Override @@ -46,12 +46,12 @@ public Multimap retrieve() { URI query = vocab.isEmpty() ? querySelector(vocabularyFacet, sparqlEndpoint) : querySelector(vocabularyFacet, sparqlEndpoint, vocab); - log.info("Facet {} being retrieved using Query: {}", facet, query); + log.debug("Facet {} being retrieved using Query: {}", facet, query); val response = template.getForEntity(query, SparqlQueryResponse.class); Objects.requireNonNull(response.getBody()).getResults().getBindings().forEach(binding -> toReturn.put(facet, binding.getUri().getValue())); } catch (Exception ex) { - log.info("Failed to retrieve vocabulary - status: {}", ex.getMessage()); + log.error("Failed to retrieve vocabulary", ex); } } return toReturn; diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/sparql/SparqlVocabularyService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/sparql/SparqlVocabularyService.java index 4be9c9056..25375d341 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/sparql/SparqlVocabularyService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/sparql/SparqlVocabularyService.java @@ -11,7 +11,7 @@ public class SparqlVocabularyService implements VocabularyService { public SparqlVocabularyService(Multimap vocabulary) { this.vocabulary = vocabulary; - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/templateHelpers/DownloadOrderDetailsService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/templateHelpers/DownloadOrderDetailsService.java index e16ec25ba..cd7a6dd7f 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/templateHelpers/DownloadOrderDetailsService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/templateHelpers/DownloadOrderDetailsService.java @@ -42,7 +42,7 @@ public DownloadOrderDetailsService( Pattern.compile(downloadUrlProperties.getRegexOrderManDownload()), Pattern.compile(downloadUrlProperties.getRegexOrder()) ); - log.info("Creating {}", this); + log.info("Creating"); } public DownloadOrder from(List onlineResources) { diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/templateHelpers/FileDetailsService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/templateHelpers/FileDetailsService.java index 4552f5412..d64f0a068 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/templateHelpers/FileDetailsService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/templateHelpers/FileDetailsService.java @@ -32,7 +32,7 @@ public FileDetailsService( this.datastore = datastore; this.baseUri = baseUri; this.pageSize = pageSize; - log.info("Creating {}", this); + log.info("Creating"); } public List getDetailsFor(String fileId, boolean isAttached){ diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/templateHelpers/GeminiExtractor.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/templateHelpers/GeminiExtractor.java index 86b666382..f2e8708f1 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/templateHelpers/GeminiExtractor.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/templateHelpers/GeminiExtractor.java @@ -29,7 +29,7 @@ public class GeminiExtractor { private final static Envelope GLOBAL_EXTENT = new Envelope(-180, 180, -90, 90); public GeminiExtractor() { - log.info("Creating {}", this); + log.info("Creating"); } public List getKeywords(GeminiDocument document) { diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/hubbub/JiraService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/hubbub/JiraService.java index a5f69c967..fd59e9371 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/hubbub/JiraService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/hubbub/JiraService.java @@ -44,7 +44,7 @@ public JiraService( this.restTemplate = restTemplate; this.username = jiraUsername; this.password = jiraPassword; - log.info("Creating {}", this); + log.info("Creating"); } public void comment(String key, String comment) throws RestClientResponseException { diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/hubbub/UploadController.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/hubbub/UploadController.java index 32ae0847e..71388be39 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/hubbub/UploadController.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/hubbub/UploadController.java @@ -69,7 +69,7 @@ public UploadController( this.permissionService = permissionService; this.mapper = mapper; this.maxFileSize = maxFileSize; - log.info("Creating {}", this); + log.info("Creating"); } @SneakyThrows diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/hubbub/UploadService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/hubbub/UploadService.java index b43bc378a..989110360 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/hubbub/UploadService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/hubbub/UploadService.java @@ -48,7 +48,7 @@ public UploadService( this.username = username; this.password = password; this.uploadLocation = uploadLocation; - log.info("Creating {}", this); + log.info("Creating"); } public void accept(String datasetId, String datastore, String path, String user) { diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/simple/FileSystemStorageService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/simple/FileSystemStorageService.java index ec0b3dfe4..d2e4c1c1d 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/simple/FileSystemStorageService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/simple/FileSystemStorageService.java @@ -30,7 +30,7 @@ public FileSystemStorageService( @Value("${upload.simple.datastore}") String datastore ) { this.datastore = datastore; - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/simple/UploadController.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/simple/UploadController.java index c75a40b01..065a80f90 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/simple/UploadController.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/simple/UploadController.java @@ -43,7 +43,7 @@ public UploadController( ) { this.documentRepository = documentRepository; this.storageService = storageService; - log.info("Creating {}", this); + log.info("Creating"); } @GetMapping(value = "{id}", produces = MediaType.TEXT_HTML_VALUE) diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/vocabularies/LocalKeywordVocabulary.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/vocabularies/LocalKeywordVocabulary.java index 524f43440..dd64f88c9 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/vocabularies/LocalKeywordVocabulary.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/vocabularies/LocalKeywordVocabulary.java @@ -55,7 +55,7 @@ public LocalKeywordVocabulary( resultsArrayPointer = JsonPointer.compile(resultsPath); uriPointer = JsonPointer.compile(uriPath); labelPointer = JsonPointer.compile(labelPath); - log.info("Creating {}", this); + log.info("Creating"); } @Override diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/vocabularies/SparqlKeywordVocabulary.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/vocabularies/SparqlKeywordVocabulary.java index ab9dbfd1c..11ab9d2a1 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/vocabularies/SparqlKeywordVocabulary.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/vocabularies/SparqlKeywordVocabulary.java @@ -54,7 +54,7 @@ public SparqlKeywordVocabulary( this.vocabularyName = vocabularyName; this.graph = graph; this.queryUrl = createQueryUrl(sparqlEndpoint, graph, where); - log.info("Creating {}", this); + log.info("Creating"); } private URI createQueryUrl(String sparqlEndpoint, String graph, String where) { diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/wms/GetCapabilitiesObtainerService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/wms/GetCapabilitiesObtainerService.java index 792ea6e19..1476f52a2 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/wms/GetCapabilitiesObtainerService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/wms/GetCapabilitiesObtainerService.java @@ -24,7 +24,7 @@ public class GetCapabilitiesObtainerService { public GetCapabilitiesObtainerService(RestTemplate rest, MapServerDetailsService mapServerDetailsService) { this.rest = rest; this.mapServerDetailsService = mapServerDetailsService; - log.info("Creating {}", this); + log.info("Creating"); } @Cacheable(cacheNames = "capabilities", key = "#resource.url") diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/wms/MapServerDetailsService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/wms/MapServerDetailsService.java index cfae29a95..327fff059 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/wms/MapServerDetailsService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/wms/MapServerDetailsService.java @@ -39,7 +39,7 @@ public MapServerDetailsService( @Value("${documents.baseUri}") String hostUrl ) { this.hostUrl = hostUrl; - log.info("Creating {}", this); + log.info("Creating"); } /** diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/wms/TMSToWMSGetMapService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/wms/TMSToWMSGetMapService.java index e8915a0b1..d23fe0eab 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/wms/TMSToWMSGetMapService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/wms/TMSToWMSGetMapService.java @@ -23,7 +23,7 @@ public TMSToWMSGetMapService() { this. bboxPartFormat = new DecimalFormat("#.##"); this.height = 256; this.width = 256; - log.info("Creating {}", this); + log.info("Creating"); } public String getWMSMapRequest(String url, String layer, int z, int x, int y) { From 8909371b4676ee59ae6b7199a1213e87c0016737 Mon Sep 17 00:00:00 2001 From: Rod Scott Date: Fri, 14 Feb 2025 14:44:10 +0000 Subject: [PATCH 2/2] Deal with deprecations EMC-461 --- .../catalogue/auth/oidc/DataLabsAuthenticationProvider.java | 2 +- .../catalogue/auth/oidc/DatalabsCatalogueUserProvider.java | 2 +- .../uk/ac/ceh/gateway/catalogue/config/ServicesConfig.java | 4 ++-- .../gateway/catalogue/controllers/MapViewerController.java | 2 +- .../ac/ceh/gateway/catalogue/datacite/DataciteService.java | 6 +++--- .../uk/ac/ceh/gateway/catalogue/search/SearchQuery.java | 2 +- .../ac/ceh/gateway/catalogue/upload/hubbub/JiraService.java | 6 +++--- .../ceh/gateway/catalogue/wms/MapServerDetailsService.java | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/DataLabsAuthenticationProvider.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/DataLabsAuthenticationProvider.java index 50f49e106..a9550f331 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/DataLabsAuthenticationProvider.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/DataLabsAuthenticationProvider.java @@ -48,7 +48,7 @@ public DataLabsAuthenticationProvider( @Value("${datalabs.userPermissions}") String address ) { this.restTemplate = restTemplate; - this.address = UriComponentsBuilder.fromHttpUrl(address).build().toUri(); + this.address = UriComponentsBuilder.fromUriString(address).build().toUri(); log.info("Creating"); } diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/DatalabsCatalogueUserProvider.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/DatalabsCatalogueUserProvider.java index a3ffe0b5e..a15c27de1 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/DatalabsCatalogueUserProvider.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/DatalabsCatalogueUserProvider.java @@ -33,7 +33,7 @@ public DatalabsCatalogueUserProvider( @Value("${datalabs.users}") String usersEndpoint ) { this.restTemplate = restTemplate; - this.usersEndpoint = UriComponentsBuilder.fromHttpUrl(usersEndpoint).build().toUri(); + this.usersEndpoint = UriComponentsBuilder.fromUriString(usersEndpoint).build().toUri(); log.info("Creating"); } diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/config/ServicesConfig.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/config/ServicesConfig.java index d609d8caa..9dc6461fe 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/config/ServicesConfig.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/config/ServicesConfig.java @@ -5,7 +5,7 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import lombok.val; -import org.apache.jena.tdb.TDBFactory; +import org.apache.jena.tdb1.TDB1Factory; import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.impl.HttpJdkSolrClient; import org.springframework.beans.factory.annotation.Qualifier; @@ -251,7 +251,7 @@ public org.apache.jena.query.Dataset tdbModel( @Value("${jena.location}") String location ) { log.info("Creating Dataset at: {}", location); - return TDBFactory.createDataset(location); + return TDB1Factory.createDataset(location); } @Bean diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/MapViewerController.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/MapViewerController.java index e53418a76..faa581423 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/MapViewerController.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/MapViewerController.java @@ -85,7 +85,7 @@ private boolean isLocalGetFeatureInfoRequest(MultiValueMap param private URI getLocalWMSRequest(String id, MultiValueMap params) { return UriComponentsBuilder - .fromHttpUrl(MAPSERVER) + .fromUriString(MAPSERVER) .queryParams(params) .buildAndExpand(id) .toUri(); diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/datacite/DataciteService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/datacite/DataciteService.java index 6e6f4174f..5f41b9988 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/datacite/DataciteService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/datacite/DataciteService.java @@ -89,7 +89,7 @@ public ResourceIdentifier generateDoi(GeminiDocument document) throws DataciteEx val request = getDatacitationRequest(document); log.info("Requesting mint of doi: {}", request); val url = UriComponentsBuilder - .fromHttpUrl(api) + .fromUriString(api) .toUriString(); DataciteRequest dataciteRequest = new DataciteRequest(doi, request, identifierService.generateUri(document.getId())); try { @@ -129,7 +129,7 @@ public ResourceIdentifier generateDoi(GeminiDocument document) throws DataciteEx public String getDoiMetadata(GeminiDocument document) { if (getDoi(document).isPresent()) { val url = UriComponentsBuilder - .fromHttpUrl(api) + .fromUriString(api) .pathSegment(prefix, document.getId()) .toUriString(); log.debug("Url to retrieve DOI from Datacite: {}", url); @@ -165,7 +165,7 @@ public void updateDoiMetadata(GeminiDocument document) { headers.setContentType(MediaType.valueOf("application/vnd.api+json")); val request = getDatacitationRequest(document); val url = UriComponentsBuilder - .fromHttpUrl(api) + .fromUriString(api) .pathSegment(prefix, document.getId()) .toUriString(); diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/search/SearchQuery.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/search/SearchQuery.java index 7bdede71d..80ecc310c 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/search/SearchQuery.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/search/SearchQuery.java @@ -269,7 +269,7 @@ public boolean containsFacetFilter(FacetFilter filter) { * @return the url to call to perform this solr query. */ public String toUrl() { - UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(endpoint); + UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(endpoint); if(PAGE_DEFAULT != page) { builder.queryParam(PAGE_QUERY_PARAM, page); } diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/hubbub/JiraService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/hubbub/JiraService.java index fd59e9371..c1b8fc42a 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/hubbub/JiraService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/upload/hubbub/JiraService.java @@ -50,7 +50,7 @@ public JiraService( public void comment(String key, String comment) throws RestClientResponseException { log.info("Commenting on {}: {}", key, comment); val url = UriComponentsBuilder - .fromHttpUrl(jiraEndpoint) + .fromUriString(jiraEndpoint) .path("issue/{key}") .buildAndExpand(key) .toUri(); @@ -79,7 +79,7 @@ public void comment(String key, String comment) throws RestClientResponseExcepti public void transition (String key, String id) { log.info("Transitioning {} for data transfer {}", key, id); val url = UriComponentsBuilder - .fromHttpUrl(jiraEndpoint) + .fromUriString(jiraEndpoint) .path("issue/{key}/transitions") .buildAndExpand(key) .toUri(); @@ -99,7 +99,7 @@ public void transition (String key, String id) { public Optional retrieveDataTransferIssue(String id) { log.info("Retrieving data transfer issues for {}", id); val url = UriComponentsBuilder - .fromHttpUrl(jiraEndpoint) + .fromUriString(jiraEndpoint) .path("search") .queryParam("jql", jqlTemplate) .buildAndExpand(id) diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/wms/MapServerDetailsService.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/wms/MapServerDetailsService.java index 327fff059..fd8098e1b 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/wms/MapServerDetailsService.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/wms/MapServerDetailsService.java @@ -127,7 +127,7 @@ public Projection getFavouredProjection(DataSource primary, String desiredEpsgCo * @return */ public String rewriteToLocalWmsRequest(String wmsUrl) { - UriComponents uri = UriComponentsBuilder.fromHttpUrl(wmsUrl).build(); + UriComponents uri = UriComponentsBuilder.fromUriString(wmsUrl).build(); List pathSegments = uri.getPathSegments(); if(wmsUrl.startsWith(hostUrl + "/maps") && pathSegments.size() == 2) { return getLocalWMSRequest(pathSegments.get(1), uri.getQuery()); @@ -165,7 +165,7 @@ public MapBucketDetails getScaledBuckets(List buckets) { */ public String getLocalWMSRequest(String id, String query) { return UriComponentsBuilder - .fromHttpUrl(MAPSERVER) + .fromUriString(MAPSERVER) .query(query) .buildAndExpand(id) .toUriString();