Merge branch '507-improve-doi-resolving' into 'dev'

Refactored DOI WIP

See merge request !398

dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/MetadataServiceImpl.java

 package at.ac.tuwien.ifs.dbrepo.service.impl;
 
-import at.ac.tuwien.ifs.dbrepo.core.api.crossref.CrossrefDto;
+import at.ac.tuwien.ifs.dbrepo.config.MetadataConfig;
+import at.ac.tuwien.ifs.dbrepo.core.api.crossref.CrossRefDto;
 import at.ac.tuwien.ifs.dbrepo.core.api.orcid.OrcidDto;
 import at.ac.tuwien.ifs.dbrepo.core.api.ror.RorDto;
 import at.ac.tuwien.ifs.dbrepo.core.api.user.external.ExternalMetadataDto;
-import at.ac.tuwien.ifs.dbrepo.config.MetadataConfig;
 import at.ac.tuwien.ifs.dbrepo.core.entity.identifier.Identifier;
 import at.ac.tuwien.ifs.dbrepo.core.exception.*;
 import at.ac.tuwien.ifs.dbrepo.core.mapper.MetadataMapper;
-import at.ac.tuwien.ifs.dbrepo.gateway.CrossrefGateway;
+import at.ac.tuwien.ifs.dbrepo.gateway.CrossRefGateway;
 import at.ac.tuwien.ifs.dbrepo.gateway.OrcidGateway;
 import at.ac.tuwien.ifs.dbrepo.gateway.RorGateway;
 import at.ac.tuwien.ifs.dbrepo.oaipmh.OaiErrorType;
@@ -39,21 +39,21 @@ public class MetadataServiceImpl implements MetadataService {
     private final MetadataConfig metadataConfig;
     private final MetadataMapper metadataMapper;
     private final TemplateEngine templateEngine;
-    private final CrossrefGateway crossrefGateway;
+    private final CrossRefGateway crossRefGateway;
     private final IdentifierService identifierService;
     private final IdentifierRepository identifierRepository;
 
     @Autowired
     public MetadataServiceImpl(RorGateway rorGateway, OrcidGateway orcidGateway, MetadataConfig metadataConfig,
                                MetadataMapper metadataMapper, TemplateEngine templateEngine,
-                               CrossrefGateway crossrefGateway, IdentifierService identifierService,
+                               CrossRefGateway crossRefGateway, IdentifierService identifierService,
                                IdentifierRepository identifierRepository) {
         this.rorGateway = rorGateway;
         this.orcidGateway = orcidGateway;
         this.metadataConfig = metadataConfig;
         this.metadataMapper = metadataMapper;
         this.templateEngine = templateEngine;
-        this.crossrefGateway = crossrefGateway;
+        this.crossRefGateway = crossRefGateway;
         this.identifierService = identifierService;
         this.identifierRepository = identifierRepository;
     }
@@ -177,7 +177,7 @@ public class MetadataServiceImpl implements MetadataService {
                 throw new RorNotFoundException("Failed to find metadata from CrossRef URL: too short");
             }
             final String id = url.substring(idx + 8);
-            final CrossrefDto crossrefDto = crossrefGateway.findById(id);
+            final CrossRefDto crossrefDto = crossRefGateway.findById(id);
             return metadataMapper.crossrefDtoToExternalMetadataDto(crossrefDto);
         }
         log.error("Failed to find metadata: unsupported identifier {}", url);

lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/api/crossref/CrossrefDto.java → lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/api/crossref/CrossRefDto.java

 package at.ac.tuwien.ifs.dbrepo.core.api.crossref;
 
-import at.ac.tuwien.ifs.dbrepo.core.api.crossref.label.CrossrefPrefLabelDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.crossref.label.CrossRefPrefLabelDto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import lombok.extern.jackson.Jacksonized;
@@ -13,11 +13,11 @@ import lombok.extern.jackson.Jacksonized;
 @AllArgsConstructor
 @Jacksonized
 @ToString
-public class CrossrefDto {
+public class CrossRefDto {
 
     @Schema(example = "https://doi.org/10.13039/100000001")
     private String id;
 
-    private CrossrefPrefLabelDto prefLabel;
+    private CrossRefPrefLabelDto prefLabel;
 
 }

lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/api/crossref/form/CrossrefLiteralFormDto.java → lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/api/crossref/form/CrossRefLiteralFormDto.java

@@ -12,7 +12,7 @@ import lombok.extern.jackson.Jacksonized;
 @AllArgsConstructor
 @Jacksonized
 @ToString
-public class CrossrefLiteralFormDto {
+public class CrossRefLiteralFormDto {
 
     @Schema(example = "en")
     private String lang;

lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/api/crossref/label/CrossrefLabelDto.java → lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/api/crossref/label/CrossRefLabelDto.java

 package at.ac.tuwien.ifs.dbrepo.core.api.crossref.label;
 
-import at.ac.tuwien.ifs.dbrepo.core.api.crossref.form.CrossrefLiteralFormDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.crossref.form.CrossRefLiteralFormDto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import lombok.extern.jackson.Jacksonized;
@@ -13,9 +13,9 @@ import lombok.extern.jackson.Jacksonized;
 @AllArgsConstructor
 @Jacksonized
 @ToString
-public class CrossrefLabelDto {
+public class CrossRefLabelDto {
 
-    private CrossrefLiteralFormDto literalForm;
+    private CrossRefLiteralFormDto literalForm;
 
     @Schema(example = "http://data.crossref.org/fundingdata/vocabulary/Label-36515")
     private String about;

lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/api/crossref/label/CrossrefPrefLabelDto.java → lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/api/crossref/label/CrossRefPrefLabelDto.java

@@ -12,9 +12,9 @@ import lombok.extern.jackson.Jacksonized;
 @AllArgsConstructor
 @Jacksonized
 @ToString
-public class CrossrefPrefLabelDto {
+public class CrossRefPrefLabelDto {
 
     @JsonProperty("Label")
-    private CrossrefLabelDto label;
+    private CrossRefLabelDto label;
 
 }

lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/mapper/MetadataMapper.java

@@ -7,7 +7,7 @@ import at.ac.tuwien.ifs.dbrepo.core.api.container.image.DataTypeDto;
 import at.ac.tuwien.ifs.dbrepo.core.api.container.image.ImageBriefDto;
 import at.ac.tuwien.ifs.dbrepo.core.api.container.image.ImageCreateDto;
 import at.ac.tuwien.ifs.dbrepo.core.api.container.image.ImageDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.crossref.CrossrefDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.crossref.CrossRefDto;
 import at.ac.tuwien.ifs.dbrepo.core.api.database.*;
 import at.ac.tuwien.ifs.dbrepo.core.api.database.table.TableBriefDto;
 import at.ac.tuwien.ifs.dbrepo.core.api.database.table.TableDto;
@@ -355,7 +355,7 @@ public interface MetadataMapper {
                 .build();
     }
 
-    default ExternalMetadataDto crossrefDtoToExternalMetadataDto(CrossrefDto data) {
+    default ExternalMetadataDto crossrefDtoToExternalMetadataDto(CrossRefDto data) {
         return ExternalMetadataDto.builder()
                 .affiliations(new ExternalAffiliationDto[]{
                         ExternalAffiliationDto.builder()