Merge branch 'quiet-constructors' into 'develop'

Quieten constructor logging

See merge request eip/catalogue!828

.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

java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/DataLabsAuthenticationProvider.java

@@ -48,8 +48,8 @@ public DataLabsAuthenticationProvider(
         @Value("${datalabs.userPermissions}") String address
     ) {
         this.restTemplate = restTemplate;
-        this.address = UriComponentsBuilder.fromHttpUrl(address).build().toUri();
-        log.info("Creating {}", this);
+        this.address = UriComponentsBuilder.fromUriString(address).build().toUri();
+        log.info("Creating");
     }
 
     @Override

java/src/main/java/uk/ac/ceh/gateway/catalogue/auth/oidc/DatalabsCatalogueUserProvider.java

@@ -33,8 +33,8 @@ public DatalabsCatalogueUserProvider(
         @Value("${datalabs.users}") String usersEndpoint
     ) {
         this.restTemplate = restTemplate;
-        this.usersEndpoint = UriComponentsBuilder.fromHttpUrl(usersEndpoint).build().toUri();
-        log.info("Creating {}", this);
+        this.usersEndpoint = UriComponentsBuilder.fromUriString(usersEndpoint).build().toUri();
+        log.info("Creating");
     }
 
     @Override

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

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

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");
             }
 
     /**

java/src/main/java/uk/ac/ceh/gateway/catalogue/config/IndexingServicesConfig.java

@@ -166,7 +166,7 @@ public SolrIndexingService solrIndexingService(
 
         IndexGeneratorRegistry<MetadataDocument, SolrIndex> 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,

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

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")

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",

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')")

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}")

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)")

java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/GeminiWafController.java

@@ -38,7 +38,7 @@ public GeminiWafController( DataRepository<CatalogueUser> repo,
                                 MetadataListingService listing) {
         this.repo = repo;
         this.listing = listing;
-        log.info("Creating {}", this);
+        log.info("Creating");
     }
 
     @GetMapping("/")

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")
@@ -85,7 +85,7 @@ private boolean isLocalGetFeatureInfoRequest(MultiValueMap<String, String> param
 
     private URI getLocalWMSRequest(String id, MultiValueMap<String, String> params) {
         return UriComponentsBuilder
-            .fromHttpUrl(MAPSERVER)
+            .fromUriString(MAPSERVER)
             .queryParams(params)
             .buildAndExpand(id)
             .toUri();

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("/")

java/src/main/java/uk/ac/ceh/gateway/catalogue/controllers/OnlineResourceController.java

@@ -39,7 +39,7 @@ public OnlineResourceController(BundledReaderService<MetadataDocument> documentB
         this.getCapabilitiesObtainerService = getCapabilitiesObtainerService;
         this.tmsToWmsGetMapService = tmsToWmsGetMapService;
         this.mapServerDetailsService = mapServerDetailsService;
-        log.info("Creating {}", this);
+        log.info("Creating");
     }
 
     @SneakyThrows

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)")

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')")

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)")

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

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")

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

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

java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/Object2TemplatedMessageConverter.java

@@ -34,7 +34,7 @@ public class Object2TemplatedMessageConverter<T> extends AbstractHttpMessageConv
     public Object2TemplatedMessageConverter(Class<T> clazz, Configuration configuration) {
         this.clazz = clazz;
         this.configuration = configuration;
-        log.info("Creating {}", this);
+        log.info("Creating");
     }
 
     @Override

java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/TransparentProxyMessageConverter.java

@@ -29,7 +29,7 @@ public class TransparentProxyMessageConverter implements HttpMessageConverter<Tr
 
     public TransparentProxyMessageConverter(CloseableHttpClient httpClient) {
         this.httpClient = httpClient;
-        log.info("Creating {}", this);
+        log.info("Creating");
     }
 
     @Override

java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/UkeofXml2EFDocumentMessageConverter.java

@@ -9,7 +9,7 @@
 public class UkeofXml2EFDocumentMessageConverter extends Jaxb2HttpMessageConverter {
     public UkeofXml2EFDocumentMessageConverter()  {
         super("http://www.ukeof.org.uk/schema/1","http://www.ukeof.org.uk/schema/1/UKEOF_v1.0.xsd");
-        log.info("Creating {}", this);
+        log.info("Creating");
     }
 
     @Override

java/src/main/java/uk/ac/ceh/gateway/catalogue/converters/WmsFeatureInfo2XmlMessageConverter.java

@@ -32,7 +32,7 @@
 public class WmsFeatureInfo2XmlMessageConverter extends AbstractHttpMessageConverter<WmsFeatureInfo> {
     public WmsFeatureInfo2XmlMessageConverter() {
         super(MediaType.TEXT_XML);
-        log.info("Creating {}", this);
+        log.info("Creating");
     }
 
     @Override

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

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<Layer> convert(Document document) throws XPathExpressionException {

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");
     }
 
     /**
@@ -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();
 

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)

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");
     }
 
     /**

java/src/main/java/uk/ac/ceh/gateway/catalogue/document/ExtensionDocumentListingService.java

@@ -24,7 +24,7 @@ public class ExtensionDocumentListingService implements DocumentListingService {
     private final List<String> extensions = Arrays.asList("meta", "raw");
 
     public ExtensionDocumentListingService() {
-        log.info("Creating {}", this);
+        log.info("Creating");
     }
 
     @Override

java/src/main/java/uk/ac/ceh/gateway/catalogue/document/JacksonDocumentInfoMapper.java

@@ -17,7 +17,7 @@ public class JacksonDocumentInfoMapper<T> implements DocumentInfoMapper<T> {
     public JacksonDocumentInfoMapper(ObjectMapper mapper, Class<T> clazz) {
         this.mapper = mapper;
         this.clazz = clazz;
-        log.info("Creating {}", this);
+        log.info("Creating");
     }
 
     @Override

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) {

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

java/src/main/java/uk/ac/ceh/gateway/catalogue/document/writing/MessageConverterWritingService.java

@@ -25,7 +25,7 @@ public MessageConverterWritingService(
             List<HttpMessageConverter<?>> messageConverters
     ) {
         this.messageConverters = messageConverters;
-        log.info("Creating {}", this);
+        log.info("Creating");
     }
 
     public MessageConverterWritingService addMessageConverter(HttpMessageConverter<?> converter) {

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