diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e70edfc..10350a5 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -23,9 +23,10 @@ - - + + + @@ -75,7 +77,7 @@ - + @@ -492,21 +494,28 @@ @@ -526,7 +535,6 @@ + + + + @@ -576,38 +589,38 @@ - + - - + + - + - - + + - + - - + + - + - - + + - + - + @@ -640,17 +653,18 @@ - + - - + + + - + diff --git a/Klaus.iml b/Klaus.iml index 94c81e3..d5a894d 100644 --- a/Klaus.iml +++ b/Klaus.iml @@ -49,6 +49,11 @@ + + + + + @@ -83,11 +88,6 @@ - - - - - diff --git a/README.md b/README.md index fa56879..67894ca 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,27 @@ Mockup service for middleware testing Available scripts: -### docker-compose up -d --build - +#### docker-compose up -d --build Builds and launches Redis service and the application. Performs unit testing on the code and run the application. +#### docker exec -it mockedservices_redis-server redis-cli +Attach to the running local redis server and open a redis client. + +Useful redis-cli commands: +###### KEYS * +Show all keys in the db. +###### TYPE key +Show key type. +###### LRANGE key start stop +Display elements from the list. +###### LLEN key +Display list length. +###### SMEMBERS key +Display elements from hashSet. +Logs can be found in lists with names logstash_yyyy-mm-dd. + Plugins: + settings -> plugins -> install lombok plugin + settings -> annotation processors -> enable annotation processing \ No newline at end of file diff --git a/pom.xml b/pom.xml index fa92d0d..7277fed 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,10 @@ 1.1.6 3.16.1 1.3.1.Final + Release11 + ${project.artifactId} + 2.7.0 + 2.7.0 @@ -46,6 +50,10 @@ spring-boot-configuration-processor true + + org.springframework.boot + spring-boot-starter-validation + org.projectlombok lombok @@ -67,10 +75,6 @@ ${assertj.version} test - - org.springframework.boot - spring-boot-starter-validation - org.springframework.boot spring-boot-starter-data-redis @@ -88,12 +92,12 @@ io.springfox springfox-swagger2 - 2.7.0 + ${springfox-swagger2.version} io.springfox springfox-swagger-ui - 2.7.0 + ${springfox-swagger-ui.version} @@ -102,6 +106,12 @@ org.springframework.boot spring-boot-maven-plugin + + + true + true + + org.apache.maven.plugins @@ -124,6 +134,30 @@ + + io.fabric8 + docker-maven-plugin + 0.34.0 + + true + + + ${docker.image.prefix}/${docker.image.name} + ${project.artifactId} + + + artifact + + Dockerfile + + latest + ${project.version} + + + + + + diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile new file mode 100644 index 0000000..ccf893e --- /dev/null +++ b/src/main/docker/Dockerfile @@ -0,0 +1,17 @@ +FROM openjdk:14-jre-slim as builder +WORKDIR application +ADD maven/${project.build.finalName}.jar ${project.build.finalName}.jar +RUN java -Djarmode=layertools -jar ${project.build.finalName}.jar extract + +FROM openjdk:14-jre-slim +LABEL PROJECT_NAME=${project.artifactId} \ + PROJECT=${project.id} + +EXPOSE 8080 + +WORKDIR application +COPY --from=builder application/dependencies/ ./ +COPY --from=builder application/spring-boot-loader/ ./ +COPY --from=builder application/snapshot-dependencies/ ./ +COPY --from=builder application/application/ ./ +ENTRYPOINT["java", "-Djava.security.cgd=file:/dev/./urandom", "org.springframework.boot.loader.JarLauncher"] diff --git a/src/main/docker/docker-compose.yml b/src/main/docker/docker-compose.yml new file mode 100644 index 0000000..40658b9 --- /dev/null +++ b/src/main/docker/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3' +services: + redis-server: + image: 'redis' + restart: "no" + klaus: + restart: "no" + build: + context: . + dockerfile: Dockerfile + ports: + - "8097:8097" + depends_on: + - redis-server diff --git a/src/main/resources/data-access.properties b/src/main/resources/data-access.properties index 03646f0..122952c 100644 --- a/src/main/resources/data-access.properties +++ b/src/main/resources/data-access.properties @@ -1,2 +1,2 @@ -redis.host = redis-server +redis.host = localhost redis.port = 6379 \ No newline at end of file diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 227aa16..ecfe542 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -3,7 +3,8 @@ - redis-server + localhost + 6379 logstash diff --git a/src/test/java/com/release11/klaus/config/RedisConfigTest.java b/src/test/java/com/release11/klaus/config/RedisConfigTest.java index 518253a..07e8b3c 100644 --- a/src/test/java/com/release11/klaus/config/RedisConfigTest.java +++ b/src/test/java/com/release11/klaus/config/RedisConfigTest.java @@ -1,22 +1,11 @@ package com.release11.klaus.config; -import com.release11.klaus.mappers.MockedMessageMapper; -import com.release11.klaus.model.MockedMessage; -import com.release11.klaus.model.MockedMessageDto; import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import redis.clients.jedis.JedisPool; - -import java.util.HashMap; -import java.util.UUID; @SpringBootTest class RedisConfigTest { - @Autowired - MockedMessageMapper mockedMessageMapper; - @Test void jedisPool() { diff --git a/src/test/java/com/release11/klaus/repository/MockedResponseRedisRepositoryTest.java b/src/test/java/com/release11/klaus/repository/MockedResponseRedisRepositoryTest.java index df9dfe2..ef69f89 100644 --- a/src/test/java/com/release11/klaus/repository/MockedResponseRedisRepositoryTest.java +++ b/src/test/java/com/release11/klaus/repository/MockedResponseRedisRepositoryTest.java @@ -11,7 +11,6 @@ class MockedResponseRedisRepositoryTest { @Autowired ObjectMapper objectMapper; - @Test void getMockedResponse() throws JsonProcessingException { diff --git a/target/Klaus-0.0.1-SNAPSHOT.jar b/target/Klaus-0.0.1-SNAPSHOT.jar new file mode 100644 index 0000000..7fbebf7 Binary files /dev/null and b/target/Klaus-0.0.1-SNAPSHOT.jar differ diff --git a/target/Klaus-0.0.1-SNAPSHOT.jar.original b/target/Klaus-0.0.1-SNAPSHOT.jar.original new file mode 100644 index 0000000..052027d Binary files /dev/null and b/target/Klaus-0.0.1-SNAPSHOT.jar.original differ diff --git a/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java b/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java index 8c3d2f2..437cf17 100644 --- a/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java +++ b/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2020-09-21T16:25:27+0200", + date = "2020-09-25T16:20:03+0200", comments = "version: 1.3.1.Final, compiler: javac, environment: Java 14.0.1 (Oracle Corporation)" ) @Component diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties new file mode 100644 index 0000000..2ddfa1f --- /dev/null +++ b/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=Klaus +groupId=com.release11.klaus +version=0.0.1-SNAPSHOT diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index c09cbb3..df258c4 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -15,7 +15,9 @@ com\release11\klaus\controller\EventController.class com\release11\klaus\repository\EventRepositoryImpl.class com\release11\klaus\mappers\MockedMessageMapper.class com\release11\klaus\utilis\TrackingClient.class +com\release11\klaus\config\SwaggerConfig.class com\release11\klaus\service\EtrackServiceImpl.class +com\release11\klaus\controller\MainController.class com\release11\klaus\controller\KlausMvcController.class com\release11\klaus\repository\EventRepository.class com\release11\klaus\service\KlausService.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 66325db..b67dd18 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,3 +1,15 @@ +D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\model\constraints\HttpCodeValidation.java +D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\config\SwaggerConfig.java +D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\model\MockedMessageDto.java +D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\service\EtrackServiceImpl.java +D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\service\KlausService.java +D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\controller\MainController.java +D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\repository\MockedResponseRepository.java +D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\mappers\MockedMessageMapper.java +D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\controller\MvcExceptionHandler.java +D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\repository\EventRepository.java +D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\model\MockedMessage.java +D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\model\constraints\HttpCode.java D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\model\Event.java D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\utilis\TrackingClient.java D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\config\RedisConfig.java @@ -5,19 +17,9 @@ D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\controller\KlausCon D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\repository\EventRepositoryImpl.java D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\controller\EventController.java D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\KlausApplication.java -D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\model\constraints\HttpCodeValidation.java D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\service\EtrackService.java D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\utilis\BusinessKey.java -D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\model\MockedMessageDto.java -D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\service\EtrackServiceImpl.java D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\controller\KlausMvcController.java -D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\service\KlausService.java -D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\repository\MockedResponseRepository.java D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\model\EventRequestDto.java D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\utilis\RedisAppender.java -D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\mappers\MockedMessageMapper.java D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\service\KlausServiceImpl.java -D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\controller\MvcExceptionHandler.java -D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\repository\EventRepository.java -D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\model\MockedMessage.java -D:\git\Szakalakamaka\Klaus\src\main\java\com\release11\klaus\model\constraints\HttpCode.java diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst index e69de29..e1b0e5a 100644 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1,6 @@ +com\release11\klaus\repository\MockedResponseRedisRepositoryTest.class +com\release11\klaus\KlausApplicationTests.class +com\release11\klaus\config\RedisConfigTest.class +com\release11\klaus\controller\KlausMvcControllerTest.class +com\release11\klaus\service\KlausServiceImplTest.class +com\release11\klaus\controller\KlausControllerTest.class diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst index 85894e0..ef97fa7 100644 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -1,6 +1,6 @@ -D:\git\Szakalakamaka\R11-Klaus\src\test\java\com\release11\klaus\repository\MockedResponseRepositoryTest.java -D:\git\Szakalakamaka\R11-Klaus\src\test\java\com\release11\klaus\KlausApplicationTests.java -D:\git\Szakalakamaka\R11-Klaus\src\test\java\com\release11\klaus\controller\KlausMvcControllerTest.java -D:\git\Szakalakamaka\R11-Klaus\src\test\java\com\release11\klaus\service\KlausServiceImplTest.java -D:\git\Szakalakamaka\R11-Klaus\src\test\java\com\release11\klaus\controller\KlausControllerTest.java -D:\git\Szakalakamaka\R11-Klaus\src\test\java\com\release11\klaus\config\RedisConfigTest.java +D:\git\Szakalakamaka\Klaus\src\test\java\com\release11\klaus\service\KlausServiceImplTest.java +D:\git\Szakalakamaka\Klaus\src\test\java\com\release11\klaus\KlausApplicationTests.java +D:\git\Szakalakamaka\Klaus\src\test\java\com\release11\klaus\controller\KlausMvcControllerTest.java +D:\git\Szakalakamaka\Klaus\src\test\java\com\release11\klaus\controller\KlausControllerTest.java +D:\git\Szakalakamaka\Klaus\src\test\java\com\release11\klaus\config\RedisConfigTest.java +D:\git\Szakalakamaka\Klaus\src\test\java\com\release11\klaus\repository\MockedResponseRedisRepositoryTest.java diff --git a/target/surefire-reports/TEST-com.release11.klaus.KlausApplicationTests.xml b/target/surefire-reports/TEST-com.release11.klaus.KlausApplicationTests.xml new file mode 100644 index 0000000..1ffd023 --- /dev/null +++ b/target/surefire-reports/TEST-com.release11.klaus.KlausApplicationTests.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/surefire-reports/TEST-com.release11.klaus.config.RedisConfigTest.xml b/target/surefire-reports/TEST-com.release11.klaus.config.RedisConfigTest.xml new file mode 100644 index 0000000..582be8f --- /dev/null +++ b/target/surefire-reports/TEST-com.release11.klaus.config.RedisConfigTest.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/surefire-reports/TEST-com.release11.klaus.controller.KlausControllerTest.xml b/target/surefire-reports/TEST-com.release11.klaus.controller.KlausControllerTest.xml new file mode 100644 index 0000000..f99951d --- /dev/null +++ b/target/surefire-reports/TEST-com.release11.klaus.controller.KlausControllerTest.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/surefire-reports/TEST-com.release11.klaus.controller.KlausMvcControllerTest.xml b/target/surefire-reports/TEST-com.release11.klaus.controller.KlausMvcControllerTest.xml new file mode 100644 index 0000000..974a127 --- /dev/null +++ b/target/surefire-reports/TEST-com.release11.klaus.controller.KlausMvcControllerTest.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/surefire-reports/TEST-com.release11.klaus.repository.MockedResponseRedisRepositoryTest.xml b/target/surefire-reports/TEST-com.release11.klaus.repository.MockedResponseRedisRepositoryTest.xml new file mode 100644 index 0000000..080183e --- /dev/null +++ b/target/surefire-reports/TEST-com.release11.klaus.repository.MockedResponseRedisRepositoryTest.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/surefire-reports/com.release11.klaus.KlausApplicationTests.txt b/target/surefire-reports/com.release11.klaus.KlausApplicationTests.txt new file mode 100644 index 0000000..90df84c --- /dev/null +++ b/target/surefire-reports/com.release11.klaus.KlausApplicationTests.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: com.release11.klaus.KlausApplicationTests +------------------------------------------------------------------------------- +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.336 s - in com.release11.klaus.KlausApplicationTests diff --git a/target/surefire-reports/com.release11.klaus.config.RedisConfigTest.txt b/target/surefire-reports/com.release11.klaus.config.RedisConfigTest.txt new file mode 100644 index 0000000..95c235d --- /dev/null +++ b/target/surefire-reports/com.release11.klaus.config.RedisConfigTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: com.release11.klaus.config.RedisConfigTest +------------------------------------------------------------------------------- +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.717 s - in com.release11.klaus.config.RedisConfigTest diff --git a/target/surefire-reports/com.release11.klaus.controller.KlausControllerTest.txt b/target/surefire-reports/com.release11.klaus.controller.KlausControllerTest.txt new file mode 100644 index 0000000..40b0109 --- /dev/null +++ b/target/surefire-reports/com.release11.klaus.controller.KlausControllerTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: com.release11.klaus.controller.KlausControllerTest +------------------------------------------------------------------------------- +Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009 s - in com.release11.klaus.controller.KlausControllerTest diff --git a/target/surefire-reports/com.release11.klaus.controller.KlausMvcControllerTest.txt b/target/surefire-reports/com.release11.klaus.controller.KlausMvcControllerTest.txt new file mode 100644 index 0000000..64b8812 --- /dev/null +++ b/target/surefire-reports/com.release11.klaus.controller.KlausMvcControllerTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: com.release11.klaus.controller.KlausMvcControllerTest +------------------------------------------------------------------------------- +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 s - in com.release11.klaus.controller.KlausMvcControllerTest diff --git a/target/surefire-reports/com.release11.klaus.repository.MockedResponseRedisRepositoryTest.txt b/target/surefire-reports/com.release11.klaus.repository.MockedResponseRedisRepositoryTest.txt new file mode 100644 index 0000000..da2c9e4 --- /dev/null +++ b/target/surefire-reports/com.release11.klaus.repository.MockedResponseRedisRepositoryTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: com.release11.klaus.repository.MockedResponseRedisRepositoryTest +------------------------------------------------------------------------------- +Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.384 s - in com.release11.klaus.repository.MockedResponseRedisRepositoryTest diff --git a/target/test-classes/com/release11/klaus/config/RedisConfigTest.class b/target/test-classes/com/release11/klaus/config/RedisConfigTest.class index 0a37a63..8358845 100644 Binary files a/target/test-classes/com/release11/klaus/config/RedisConfigTest.class and b/target/test-classes/com/release11/klaus/config/RedisConfigTest.class differ diff --git a/target/test-classes/com/release11/klaus/repository/MockedResponseRedisRepositoryTest.class b/target/test-classes/com/release11/klaus/repository/MockedResponseRedisRepositoryTest.class index e5039b5..54ce743 100644 Binary files a/target/test-classes/com/release11/klaus/repository/MockedResponseRedisRepositoryTest.class and b/target/test-classes/com/release11/klaus/repository/MockedResponseRedisRepositoryTest.class differ