consolidate meta and imports

Author: querwurzel

…ne/primenet/meta/api/MetaController.java …primenet/imports/api/MetaController.javasrc/main/java/org/mersenne/primenet/meta/api/MetaController.java renamed to src/main/java/org/mersenne/primenet/imports/api/MetaController.java src/main/java/org/mersenne/primenet/meta/api/MetaController.java renamed to src/main/java/org/mersenne/primenet/imports/api/MetaController.java

@@ -1,7 +1,7 @@
-package org.mersenne.primenet.meta.api;
+package org.mersenne.primenet.imports.api;
 
-import org.mersenne.primenet.meta.application.MetaService;
-import org.mersenne.primenet.meta.application.model.MetaInformation;
+import org.mersenne.primenet.imports.application.MetaService;
+import org.mersenne.primenet.imports.application.model.MetaInformation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;

src/main/java/org/mersenne/primenet/imports/api/ResultController.java

@@ -3,7 +3,6 @@
 import org.mersenne.primenet.imports.application.ResultService;
 import org.mersenne.primenet.imports.domain.Result;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -28,7 +27,7 @@ public ResultController(ResultService resultService) {
     @GetMapping(produces = MediaType.APPLICATION_JSON_VALUE)
     ResponseEntity<Results> getMyRecentResults() {
         final List<Result> results = resultService.fetchRecentResults();
-        return new ResponseEntity<>(new Results(results), HttpStatus.OK);
+        return ResponseEntity.ok(new Results(results));
     }
 
     record Results(

…imenet/meta/application/MetaService.java …net/imports/application/MetaService.javasrc/main/java/org/mersenne/primenet/meta/application/MetaService.java renamed to src/main/java/org/mersenne/primenet/imports/application/MetaService.java src/main/java/org/mersenne/primenet/meta/application/MetaService.java renamed to src/main/java/org/mersenne/primenet/imports/application/MetaService.java

@@ -1,12 +1,12 @@
-package org.mersenne.primenet.meta.application;
+package org.mersenne.primenet.imports.application;
 
 import org.mersenne.primenet.PrimeNetProperties;
 import org.mersenne.primenet.imports.domain.Import.State;
 import org.mersenne.primenet.imports.domain.ImportRepository;
-import org.mersenne.primenet.meta.application.model.MetaInformation;
-import org.mersenne.primenet.meta.application.model.MetaInformation.ImportInformation;
-import org.mersenne.primenet.meta.application.model.MetaInformation.ResultInformation;
-import org.mersenne.primenet.meta.application.model.MetaInformation.UserInformation;
+import org.mersenne.primenet.imports.application.model.MetaInformation;
+import org.mersenne.primenet.imports.application.model.MetaInformation.ImportInformation;
+import org.mersenne.primenet.imports.application.model.MetaInformation.ResultInformation;
+import org.mersenne.primenet.imports.application.model.MetaInformation.UserInformation;
 import org.mersenne.primenet.imports.domain.ResultRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

…a/application/model/MetaInformation.java …s/application/model/MetaInformation.javasrc/main/java/org/mersenne/primenet/meta/application/model/MetaInformation.java renamed to src/main/java/org/mersenne/primenet/imports/application/model/MetaInformation.java src/main/java/org/mersenne/primenet/meta/application/model/MetaInformation.java renamed to src/main/java/org/mersenne/primenet/imports/application/model/MetaInformation.java

@@ -1,4 +1,4 @@
-package org.mersenne.primenet.meta.application.model;
+package org.mersenne.primenet.imports.application.model;
 
 import org.mersenne.primenet.imports.domain.Import;
 

src/main/java/org/mersenne/primenet/imports/integration/ResultArchiveClient.java

@@ -3,9 +3,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
+import org.springframework.web.client.RestClient;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -15,14 +14,16 @@ public class ResultArchiveClient {
 
     private static final Logger log = LoggerFactory.getLogger(ResultArchiveClient.class);
 
-    private static final String annualUrl = "https://www.mersenne.org/result_archive/%d.7z";
-    private static final String dailyUrl  = "https://www.mersenne.org/result_archive/%d/%s.xml.bz2";
+    private static final String annualUrl = "/result_archive/%d.7z";
+    private static final String dailyUrl  = "/result_archive/%d/%s.xml.bz2";
 
-    private final RestTemplate restTemplate;
+    private final RestClient client;
 
     @Autowired
-    public ResultArchiveClient(RestTemplateBuilder restTemplateBuilder) {
-        this.restTemplate = restTemplateBuilder.build();
+    public ResultArchiveClient() {
+        this.client = RestClient.builder()
+                .baseUrl("https://www.mersenne.org")
+                .build();
     }
 
     public byte[] fetchDailyReport(LocalDate date) {
@@ -35,7 +36,7 @@ public byte[] fetchDailyReport(LocalDate date) {
 
     public byte[] fetchDailyReport(String url) {
         log.debug("Fetching daily report from {}", url);
-        return restTemplate.getForObject(url, byte[].class);
+        return client.get().retrieve().body(byte[].class);
     }
 
     public byte[] fetchAnnualReport(LocalDate date) {
@@ -48,6 +49,6 @@ public byte[] fetchAnnualReport(LocalDate date) {
 
     public byte[] fetchAnnualReport(String url) {
         log.debug("Fetching annual report from {}", url);
-        return restTemplate.getForObject(url, byte[].class);
+        return client.get().retrieve().body(byte[].class);
     }
 }