refactoring

config-client/src/main/java/de/dominikschadow/configclient/ConfigClientApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Dominik Schadow, dominikschadow@gmail.com
+ * Copyright (C) 2023 Dominik Schadow, dominikschadow@gmail.com
  *
  * This file is part of the Cloud Security project.
  *

config-client/src/main/java/de/dominikschadow/configclient/ConfigClientProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Dominik Schadow, dominikschadow@gmail.com
+ * Copyright (C) 2023 Dominik Schadow, dominikschadow@gmail.com
  *
  * This file is part of the Cloud Security project.
  *
@@ -17,8 +17,6 @@
  */
 package de.dominikschadow.configclient;
 
-import lombok.Getter;
-import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
@@ -27,18 +25,7 @@
  * @author Dominik Schadow
  */
 @ConfigurationProperties(prefix = "config.client")
-@Getter
-@Setter
-public class ConfigClientProperties {
-    private Application application;
-
-    /**
-     * Basic application information.
-     */
-    @Getter
-    @Setter
-    public static class Application {
-        private String name;
-        private String profile;
+public record ConfigClientProperties (Application application) {
+    public record Application (String name, String profile) {
     }
 }

config-client/src/main/java/de/dominikschadow/configclient/credential/Credential.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Dominik Schadow, dominikschadow@gmail.com
+ * Copyright (C) 2023 Dominik Schadow, dominikschadow@gmail.com
  *
  * This file is part of the Cloud Security project.
  *

config-client/src/main/java/de/dominikschadow/configclient/credential/CredentialRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Dominik Schadow, dominikschadow@gmail.com
+ * Copyright (C) 2023 Dominik Schadow, dominikschadow@gmail.com
  *
  * This file is part of the Cloud Security project.
  *

config-client/src/main/java/de/dominikschadow/configclient/info/AboutController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Dominik Schadow, dominikschadow@gmail.com
+ * Copyright (C) 2023 Dominik Schadow, dominikschadow@gmail.com
  *
  * This file is part of the Cloud Security project.
  *
@@ -50,9 +50,9 @@ public class AboutController {
     public ResponseEntity<ApplicationInformation> about() {
         String about = "Application properties are not set";
 
-        if (properties.getApplication() != null) {
-            about = String.format("%s with profile %s", properties.getApplication().getName(),
-                    properties.getApplication().getProfile());
+        if (properties.application() != null) {
+            about = String.format("%s with profile %s", properties.application().name(),
+                    properties.application().profile());
         }
 
         ApplicationInformation info = new ApplicationInformation(about);

config-client/src/main/java/de/dominikschadow/configclient/info/ApplicationInformation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Dominik Schadow, dominikschadow@gmail.com
+ * Copyright (C) 2023 Dominik Schadow, dominikschadow@gmail.com
  *
  * This file is part of the Cloud Security project.
  *
@@ -17,16 +17,12 @@
  */
 package de.dominikschadow.configclient.info;
 
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import org.springframework.hateoas.RepresentationModel;
 
+@Getter
+@RequiredArgsConstructor
 public class ApplicationInformation extends RepresentationModel<ApplicationInformation> {
     private final String info;
-
-    public ApplicationInformation(String info) {
-        this.info = info;
-    }
-
-    public String getInfo() {
-        return info;
-    }
 }

config-client/src/main/java/de/dominikschadow/configclient/user/User.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Dominik Schadow, dominikschadow@gmail.com
+ * Copyright (C) 2023 Dominik Schadow, dominikschadow@gmail.com
  *
  * This file is part of the Cloud Security project.
  *

config-client/src/main/java/de/dominikschadow/configclient/user/UserRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Dominik Schadow, dominikschadow@gmail.com
+ * Copyright (C) 2023 Dominik Schadow, dominikschadow@gmail.com
  *
  * This file is part of the Cloud Security project.
  *

config-client/src/test/java/de/dominikschadow/configclient/ConfigClientApplicationTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Dominik Schadow, dominikschadow@gmail.com
+ * Copyright (C) 2023 Dominik Schadow, dominikschadow@gmail.com
  *
  * This file is part of the Cloud Security project.
  *

config-client/src/test/java/de/dominikschadow/configclient/credential/CredentialRepositoryTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Dominik Schadow, dominikschadow@gmail.com
+ * Copyright (C) 2023 Dominik Schadow, dominikschadow@gmail.com
  *
  * This file is part of the Cloud Security project.
  *

config-client/src/test/java/de/dominikschadow/configclient/info/AboutControllerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Dominik Schadow, dominikschadow@gmail.com
+ * Copyright (C) 2023 Dominik Schadow, dominikschadow@gmail.com
  *
  * This file is part of the Cloud Security project.
  *
@@ -17,16 +17,15 @@
  */
 package de.dominikschadow.configclient.info;
 
-import de.dominikschadow.configclient.ConfigClientProperties;
 import de.dominikschadow.configclient.credential.CredentialRepository;
 import de.dominikschadow.configclient.user.UserRepository;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 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.data.rest.webmvc.support.RepositoryEntityLinks;
 import org.springframework.hateoas.Link;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
@@ -39,27 +38,16 @@
  * @author Dominik Schadow
  */
 @WebMvcTest(AboutController.class)
+@TestPropertySource(properties = {"config.client.application.name=Config Client", "config.client.application.profile=test"})
 class AboutControllerTest {
     @Autowired
     private MockMvc mvc;
 
-    @MockBean
-    private ConfigClientProperties properties;
     @MockBean
     private RepositoryEntityLinks entityLinks;
 
-    private ConfigClientProperties.Application application;
-
-    @BeforeEach
-    void setup() {
-        application = new ConfigClientProperties.Application();
-        application.setName("Config Client");
-        application.setProfile("test");
-    }
-
     @Test
     void givenGetRequestWhenUsingRootUrlThenReturnStartPage() throws Exception {
-        given(properties.getApplication()).willReturn(application);
         given(entityLinks.linkToCollectionResource(UserRepository.class)).willReturn(Link.of("/users"));
         given(entityLinks.linkToCollectionResource(CredentialRepository.class)).willReturn(Link.of("/credentials"));
 

config-client/src/test/java/de/dominikschadow/configclient/user/UserRepositoryTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Dominik Schadow, dominikschadow@gmail.com
+ * Copyright (C) 2023 Dominik Schadow, dominikschadow@gmail.com
  *
  * This file is part of the Cloud Security project.
  *