diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2bda9ba..6b4e8b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,20 +18,26 @@ jobs: uses: actions/setup-java@v1 with: java-version: 11 + - name: Cache SonarCloud packages uses: actions/cache@v1 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar + - name: Cache Gradle packages uses: actions/cache@v1 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} restore-keys: ${{ runner.os }}-gradle - - name: Build and analyze + + - name: Build and Test + run: ./gradlew build test + + - name: Sonarqube env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: ./gradlew build sonarqube --info \ No newline at end of file + run: ./gradlew sonarqube --info \ No newline at end of file diff --git a/.gradle/6.8.3/executionHistory/executionHistory.bin b/.gradle/6.8.3/executionHistory/executionHistory.bin deleted file mode 100644 index 91f39a8..0000000 Binary files a/.gradle/6.8.3/executionHistory/executionHistory.bin and /dev/null differ diff --git a/.gradle/6.8.3/executionHistory/executionHistory.lock b/.gradle/6.8.3/executionHistory/executionHistory.lock deleted file mode 100644 index 67a0711..0000000 Binary files a/.gradle/6.8.3/executionHistory/executionHistory.lock and /dev/null differ diff --git a/.gradle/6.8.3/fileChanges/last-build.bin b/.gradle/6.8.3/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/.gradle/6.8.3/fileChanges/last-build.bin and /dev/null differ diff --git a/.gradle/6.8.3/fileHashes/fileHashes.bin b/.gradle/6.8.3/fileHashes/fileHashes.bin deleted file mode 100644 index b4c7aae..0000000 Binary files a/.gradle/6.8.3/fileHashes/fileHashes.bin and /dev/null differ diff --git a/.gradle/6.8.3/fileHashes/fileHashes.lock b/.gradle/6.8.3/fileHashes/fileHashes.lock deleted file mode 100644 index f856efb..0000000 Binary files a/.gradle/6.8.3/fileHashes/fileHashes.lock and /dev/null differ diff --git a/.gradle/6.8.3/gc.properties b/.gradle/6.8.3/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/.gradle/6.8.3/javaCompile/classAnalysis.bin b/.gradle/6.8.3/javaCompile/classAnalysis.bin deleted file mode 100644 index f0bfc67..0000000 Binary files a/.gradle/6.8.3/javaCompile/classAnalysis.bin and /dev/null differ diff --git a/.gradle/6.8.3/javaCompile/javaCompile.lock b/.gradle/6.8.3/javaCompile/javaCompile.lock deleted file mode 100644 index 274b62c..0000000 Binary files a/.gradle/6.8.3/javaCompile/javaCompile.lock and /dev/null differ diff --git a/.gradle/6.8.3/javaCompile/taskHistory.bin b/.gradle/6.8.3/javaCompile/taskHistory.bin deleted file mode 100644 index 5fb2641..0000000 Binary files a/.gradle/6.8.3/javaCompile/taskHistory.bin and /dev/null differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index c8be1d9..0000000 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index 7a80d30..0000000 --- a/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Sun Jun 06 14:40:26 KST 2021 -gradle.version=6.8.3 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index abd7509..0000000 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock deleted file mode 100644 index 92bc78f..0000000 Binary files a/.gradle/checksums/checksums.lock and /dev/null differ diff --git a/.gradle/checksums/md5-checksums.bin b/.gradle/checksums/md5-checksums.bin deleted file mode 100644 index 49e4667..0000000 Binary files a/.gradle/checksums/md5-checksums.bin and /dev/null differ diff --git a/.gradle/checksums/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin deleted file mode 100644 index 34de16d..0000000 Binary files a/.gradle/checksums/sha1-checksums.bin and /dev/null differ diff --git a/.gradle/configuration-cache/gc.properties b/.gradle/configuration-cache/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/bin/main/application.yaml b/bin/main/application.yaml new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/bin/main/application.yaml @@ -0,0 +1 @@ + diff --git a/bin/main/com/sample/SampleApplication.class b/bin/main/com/sample/SampleApplication.class new file mode 100644 index 0000000..02168f6 Binary files /dev/null and b/bin/main/com/sample/SampleApplication.class differ diff --git a/bin/main/com/sample/SampleController.class b/bin/main/com/sample/SampleController.class new file mode 100644 index 0000000..ed24013 Binary files /dev/null and b/bin/main/com/sample/SampleController.class differ diff --git a/build.gradle b/build.gradle index 95d7b1f..48cd51a 100644 --- a/build.gradle +++ b/build.gradle @@ -34,8 +34,6 @@ sonarqube { // property "sonar.host.url", "http://127.0.0.1:9000" property "sonar.host.url", "https://sonarcloud.io" property "sonar.sourceEncoding", "UTF-8" - property "sonar.sources", "." - property "sonar.java.binaries", "build" property "sonar.exclusions", "**/node_modules/**, **/cdk.out/**" property "sonar.issue.ignore.multicriteria", "e1" property "sonar.issue.ignore.multicriteria.e1.ruleKey", "typescript:S1848" diff --git a/src/main/java/com/sec/sample/DemoApplication.java b/src/main/java/com/sec/sample/DemoApplication.java deleted file mode 100644 index aaf09c1..0000000 --- a/src/main/java/com/sec/sample/DemoApplication.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.sec.sample; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class DemoApplication { - - public static void main(String[] args) { - SpringApplication.run(DemoApplication.class); - } -} diff --git a/src/main/java/com/sec/sample/SampleController.java b/src/main/java/com/sec/sample/SampleController.java deleted file mode 100644 index 47f94e9..0000000 --- a/src/main/java/com/sec/sample/SampleController.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.sec.sample; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.bind.annotation.RequestMethod; - -@RestController -public class SampleController { - - @RequestMapping(value="/", method=RequestMethod.GET) - public String home() { - return new String("complete"); - } - - @RequestMapping(value="/{serviceid}/monitoring/v1/ping", method=RequestMethod.GET) - public String ping() { - return new String("OK"); - } -} diff --git a/src/test/java/com/sample/SampleControllerTest.java b/src/test/java/com/sample/SampleControllerTest.java new file mode 100644 index 0000000..3c2d001 --- /dev/null +++ b/src/test/java/com/sample/SampleControllerTest.java @@ -0,0 +1,53 @@ +package com.sample; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Assertions; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.http.ResponseEntity; +import org.springframework.http.HttpStatus; +import org.springframework.test.context.ActiveProfiles; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@ActiveProfiles("test") +public class SampleControllerTest { + + @Autowired + private TestRestTemplate restTemplate; + + @Test + public void testHome() { + ResponseEntity response = restTemplate.getForEntity("/", String.class); + Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); + Assertions.assertEquals("OK", response.getBody()); + } + + @Test + public void testPingPath1() { + ResponseEntity response = restTemplate.getForEntity("/sample", String.class); + Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); + Assertions.assertEquals("OK", response.getBody()); + } + + @Test + public void testPingPath2() { + ResponseEntity response = restTemplate.getForEntity("/sample/test1", String.class); + Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); + Assertions.assertEquals("OK", response.getBody()); + } + + @Test + public void testPingPath3() { + ResponseEntity response = restTemplate.getForEntity("/sample/test1/test2", String.class); + Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); + Assertions.assertEquals("OK", response.getBody()); + } + + @Test + public void testPingPath4() { + ResponseEntity response = restTemplate.getForEntity("/sample/test1/test2/test3", String.class); + Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); + Assertions.assertEquals("OK", response.getBody()); + } +}