Refactored DOI WIP

Signed-off-by: Martin Weise martin.weise@tuwien.ac.at

Closes #507

dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/gateway/CrossRefGatewayUnitTest.java

 package at.ac.tuwien.ifs.dbrepo.gateway;
 
-<<<<<<<< HEAD:dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/gateway/CrossRefGatewayUnitTest.java
-import at.tuwien.api.crossref.CrossrefDto;
-import at.tuwien.exception.DoiNotFoundException;
-import at.tuwien.test.AbstractUnitTest;
-========
-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.exception.DoiNotFoundException;
 import at.ac.tuwien.ifs.dbrepo.core.test.BaseTest;
->>>>>>>> dev:dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/gateway/CrossrefGatewayUnitTest.java
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.HttpEntity;
@@ -29,24 +24,20 @@ import static org.mockito.Mockito.*;
 @Log4j2
 @SpringBootTest
 @ExtendWith(SpringExtension.class)
-<<<<<<<< HEAD:dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/gateway/CrossRefGatewayUnitTest.java
-public class CrossRefGatewayUnitTest extends AbstractUnitTest {
-========
-public class CrossrefGatewayUnitTest extends BaseTest {
->>>>>>>> dev:dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/gateway/CrossrefGatewayUnitTest.java
+public class CrossRefGatewayUnitTest extends BaseTest {
 
     @MockBean
     @Qualifier("crossRefServiceRestTemplate")
     private RestTemplate restTemplate;
 
     @Autowired
-    private CrossRefServiceGateway crossRefGateway;
+    private CrossRefGateway crossRefGateway;
 
     @Test
     public void findById_succeeds() throws DoiNotFoundException {
 
         /* mock */
-        when(restTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(CrossrefDto.class)))
+        when(restTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(CrossRefDto.class)))
                 .thenReturn(ResponseEntity.status(HttpStatus.OK)
                         .build());
 
@@ -60,7 +51,7 @@ public class CrossrefGatewayUnitTest extends BaseTest {
         /* mock */
         doThrow(HttpServerErrorException.class)
                 .when(restTemplate)
-                .exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(CrossrefDto.class));
+                .exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(CrossRefDto.class));
 
         /* test */
         assertThrows(DoiNotFoundException.class, () -> {