broken commit

Author: open-schnick

.run/RestApplication.run.xml

@@ -0,0 +1,10 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="RestApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <module name="RestApi" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="de.filefighter.rest.RestApplication" />
+    <option name="ALTERNATIVE_JRE_PATH" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.run/TESTS.run.xml

@@ -0,0 +1,28 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="TESTS" type="MavenRunConfiguration" factoryName="Maven">
+    <MavenSettings>
+      <option name="myGeneralSettings" />
+      <option name="myRunnerSettings" />
+      <option name="myRunnerParameters">
+        <MavenRunnerParameters>
+          <option name="profiles">
+            <set />
+          </option>
+          <option name="goals">
+            <list>
+              <option value="clean" />
+              <option value="test" />
+            </list>
+          </option>
+          <option name="pomFileName" value="pom.xml" />
+          <option name="profilesMap">
+            <map />
+          </option>
+          <option name="resolveToWorkspace" value="false" />
+          <option name="workingDirPath" value="$PROJECT_DIR$" />
+        </MavenRunnerParameters>
+      </option>
+    </MavenSettings>
+    <method v="2" />
+  </configuration>
+</component>

src/main/java/de/filefighter/rest/config/SwaggerConfiguration.java

@@ -30,7 +30,7 @@ private ApiInfo apiInfo() {
                 "REST-API of the FileFighter application.",
                 "0.1",
                 "terms of service url",
-                new Contact("FileFighter Dev-Team", "https://github.com/filefighter/", "comming soon"),
+                new Contact("FileFighter Dev-Team", "https://github.com/filefighter/", "[email protected]"),
                 "MIT License",
                 "https://github.com/filefighter/restapi/blob/master/LICENSE",
                 Collections.emptyList()

src/main/java/de/filefighter/rest/health/business/SystemHealthBusinessService.java

@@ -8,12 +8,20 @@
 @Service
 public class SystemHealthBusinessService {
 
-    private final long serverStartedAt = Instant.now().getEpochSecond();
+    private final long serverStartedAt;
+
+    public SystemHealthBusinessService() {
+        this.serverStartedAt = this.getCurrentEpochSeconds();
+    }
 
     public SystemHealth getCurrentSystemHealthInfo(){
-        long currentEpoch = Instant.now().getEpochSecond();
+        long currentEpoch = getCurrentEpochSeconds();
         return SystemHealth.builder()
                 .uptimeInSeconds(currentEpoch - serverStartedAt)
                 .create();
     }
+
+    public long getCurrentEpochSeconds(){
+        return Instant.now().getEpochSecond();
+    }
 }

src/main/java/de/filefighter/rest/rest/RestErrorController.java

@@ -10,15 +10,15 @@
 @RestController
 public class RestErrorController implements ErrorController {
 
-    private static final String DEFAULT_PATH = "/error";
+    public static final String DEFAULT_ERROR_PATH = "/error";
 
-    @RequestMapping(value = DEFAULT_PATH)
+    @RequestMapping(value = DEFAULT_ERROR_PATH)
     public EntityModel<ServerResponse> error() {
         return new ServerResponse("denied", "This endpoint does not exist.").toModel();
     }
 
     @Override
     public String getErrorPath() {
-        return DEFAULT_PATH;
+        return DEFAULT_ERROR_PATH;
     }
 }

src/test/java/de/filefighter/rest/RestApplicationTests.java

@@ -1,5 +1,6 @@
-package de.filefighter.rest;
+/*package de.filefighter.rest;
 
+import org.junit.Ignore;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
@@ -11,3 +12,4 @@ void contextLoads() {
 	}
 
 }
+ */

src/test/java/de/filefighter/rest/health/business/SystemHealthBusinessServiceUnitTest.java

@@ -0,0 +1,33 @@
+package de.filefighter.rest.health.business;
+
+import de.filefighter.rest.health.data.SystemHealth;
+import org.junit.Before;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class SystemHealthBusinessServiceUnitTest {
+
+    private SystemHealthBusinessService systemHealthBusinessService;
+
+    @Before
+    public void setUp(){
+        systemHealthBusinessService = new SystemHealthBusinessService();
+    }
+
+    @Test
+    void getCurrentSystemHealthInfo() {
+        SystemHealth systemHealth = systemHealthBusinessService.getCurrentSystemHealthInfo();
+        assertEquals(0, systemHealth.getUptimeInSeconds());
+    }
+
+    @Test
+    void getCurrentEpochSecondsReturnsEpochSeconds() {
+        long expectedSeconds = Instant.now().getEpochSecond();
+        long epochSeconds = systemHealthBusinessService.getCurrentEpochSeconds();
+        assertEquals(expectedSeconds, epochSeconds);
+    }
+}

src/test/java/de/filefighter/rest/health/business/SystemHealthModelAssemblerUnitTest.java

@@ -0,0 +1,29 @@
+package de.filefighter.rest.health.business;
+
+import de.filefighter.rest.health.data.SystemHealth;
+import org.junit.Before;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.springframework.hateoas.EntityModel;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class SystemHealthModelAssemblerUnitTest {
+
+    private SystemHealthModelAssembler systemHealthModelAssembler;
+
+    @Before
+    public void setUp(){
+        systemHealthModelAssembler = new SystemHealthModelAssembler();
+    }
+
+    @Test
+    void toModel() {
+        SystemHealth systemHealth = SystemHealth.builder().uptimeInSeconds(420).create();
+        EntityModel<SystemHealth> systemHealthEntityModel = systemHealthModelAssembler.toModel(systemHealth);
+
+        assertEquals(systemHealth, systemHealthEntityModel.getContent());
+        assertTrue(systemHealthEntityModel.getLink("self").isPresent());
+        assertTrue(systemHealthEntityModel.getLink("ugabuga").isEmpty());
+    }
+}

src/test/java/de/filefighter/rest/rest/RestErrorControllerUnitTest.java

@@ -0,0 +1,45 @@
+package de.filefighter.rest.rest;
+
+import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+
+import static org.hamcrest.Matchers.is;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.jsonPath;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+class RestErrorControllerUnitTest {
+
+    private MockMvc mockMvc;
+    private RestErrorController restErrorController;
+
+    @BeforeEach
+    void setUp() {
+
+    }
+
+    restErrorController = new RestErrorController();
+        mockMvc = MockMvcBuilders.standaloneSetup(restErrorController).build();
+    }
+
+    @Test
+    void errorHandleingDoesWork() throws Exception {
+        mockMvc.perform(get(RestErrorController.DEFAULT_ERROR_PATH))
+                .andExpect(status().isOk())
+                .andReturn();
+    }
+
+    @Test
+    void getErrorPath() {
+        String expectedPath = RestErrorController.DEFAULT_ERROR_PATH;
+        String actualPath = restErrorController.getErrorPath();
+
+        assertEquals(expectedPath, actualPath);
+    }
+}