diff --git a/ApiService/pom.xml b/ApiService/pom.xml index 8f1348038c4eb20e9f9e4965c5f6b4b1709bc17c..0100f8c0eadcad903ccb33d55c3a7c7acab339cd 100644 --- a/ApiService/pom.xml +++ b/ApiService/pom.xml @@ -35,7 +35,6 @@ </dependencies> - <build> <plugins> <plugin> diff --git a/ApiService/src/main/java/apiservice/ApiServiceApp.java b/ApiService/src/main/java/apiservice/ApiServiceApp.java index 0d7275574e44d41494820932252b5394626c20d3..248f00b1280cbcf4d8dfed6e0b2dfb8e679b1df1 100644 --- a/ApiService/src/main/java/apiservice/ApiServiceApp.java +++ b/ApiService/src/main/java/apiservice/ApiServiceApp.java @@ -7,7 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class ApiServiceApp implements CommandLineRunner { - public static void main(String [] args) { + public static void main(String[] args) { SpringApplication.run(ApiServiceApp.class, args); } diff --git a/ApiService/src/main/java/apiservice/repo/AssetRepo.java b/ApiService/src/main/java/apiservice/repo/AssetRepo.java index 0a42aa1dda2e815bf31e2ef88f6ff73fa1192cb5..9f9326c42869b8ccc705eb0e1e64ba9db49e1e2f 100644 --- a/ApiService/src/main/java/apiservice/repo/AssetRepo.java +++ b/ApiService/src/main/java/apiservice/repo/AssetRepo.java @@ -11,14 +11,15 @@ import java.util.Map; public class AssetRepo implements IAssetRepo<Asset> { private final Map<String, List<Asset>> repository = new HashMap<>(); + @Override public List<Asset> findAllByUid(String uid) { - return repository.get(uid); + return repository.get(uid); } @Override public Asset save(Asset asset, String uid) { - repository.get(uid).add(asset); - return asset; + repository.get(uid).add(asset); + return asset; } } diff --git a/ApiService/src/main/java/apiservice/repo/IAssetRepo.java b/ApiService/src/main/java/apiservice/repo/IAssetRepo.java index d4e58e0fb01089f53a960c9c5acd35d1ec78e680..d58cdc3d4ac3d32572655d345f4c2970adb4d2f7 100644 --- a/ApiService/src/main/java/apiservice/repo/IAssetRepo.java +++ b/ApiService/src/main/java/apiservice/repo/IAssetRepo.java @@ -2,7 +2,7 @@ package apiservice.repo; import java.util.List; -public interface IAssetRepo<Asset> { +public interface IAssetRepo<Asset> { List<Asset> findAllByUid(String uid); Asset save(Asset asset, String uid); diff --git a/ApiService/src/main/java/apiservice/service/ApiController.java b/ApiService/src/main/java/apiservice/service/ApiController.java index d6267d1a25176959b678e52db7d587e59c8aef45..87e6ce576e24dd48406f827a34545358fa23f0f4 100644 --- a/ApiService/src/main/java/apiservice/service/ApiController.java +++ b/ApiService/src/main/java/apiservice/service/ApiController.java @@ -1,7 +1,6 @@ package apiservice.service; import apiservice.model.Asset; -import apiservice.service.ApiService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -14,23 +13,23 @@ import java.util.List; @RequestMapping("/assets/") public class ApiController { - private final ApiService service; + private final ApiService service; - @Autowired + @Autowired public ApiController(ApiService service) { this.service = service; } @GetMapping(produces = {MediaType.APPLICATION_JSON_VALUE}) - public ResponseEntity<List<Asset>> getAssets(@RequestParam(name ="uid") String uid) { + public ResponseEntity<List<Asset>> getAssets(@RequestParam(name = "uid") String uid) { - List<Asset> assets = service.getAssets(uid); + List<Asset> assets = service.getAssets(uid); - return new ResponseEntity<>(assets, HttpStatus.OK); + return new ResponseEntity<>(assets, HttpStatus.OK); } @PostMapping(produces = {MediaType.APPLICATION_JSON_VALUE}) public void postAsset(@RequestBody() Asset asset, @RequestParam(name = "uid") String uid) { - service.saveAsset(asset,uid); + service.saveAsset(asset, uid); } } diff --git a/ApiService/src/main/java/apiservice/service/ApiService.java b/ApiService/src/main/java/apiservice/service/ApiService.java index 08b013bac708f8a829156f5660c4b9fb9ed25df6..feab06225f718d97131ebd87aae8bb700788d8a7 100644 --- a/ApiService/src/main/java/apiservice/service/ApiService.java +++ b/ApiService/src/main/java/apiservice/service/ApiService.java @@ -1,7 +1,7 @@ package apiservice.service; -import apiservice.repo.IAssetRepo; import apiservice.model.Asset; +import apiservice.repo.IAssetRepo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,6 +22,6 @@ public class ApiService { } public void saveAsset(Asset asset, String uid) { - repo.save(asset,uid); + repo.save(asset, uid); } } diff --git a/ApiService/src/test/java/apiservice/ApiControllerTest.java b/ApiService/src/test/java/apiservice/ApiControllerTest.java index 4b31804a1b58e834ee863d8477c57afdc75d9dd9..075f67f0e129be233a335efd1adad3c869c764e7 100644 --- a/ApiService/src/test/java/apiservice/ApiControllerTest.java +++ b/ApiService/src/test/java/apiservice/ApiControllerTest.java @@ -9,7 +9,7 @@ import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.http.*; +import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;