diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_client_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_client_2_2_5_RELEASE.xml new file mode 100644 index 0000000..22c4a13 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_client_2_2_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_config_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_config_2_2_5_RELEASE.xml new file mode 100644 index 0000000..111e3fa --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_config_2_2_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index dd1c708..d4fd235 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -23,13 +23,24 @@ - + + + + + + - - - - - + + + + + + + + + + + + @@ -115,7 +127,7 @@ - + @@ -248,9 +260,9 @@ + - @@ -268,13 +280,6 @@ @@ -631,7 +643,6 @@ @@ -693,62 +705,71 @@ - + + - - + + - + + - - + + - + + - - + + - + + - - + + - + + - - + + - + + - - + + - + + - - + + - + + - - + + - + + @@ -768,21 +789,22 @@ - - + + - + - - + + + diff --git a/Klaus.iml b/Klaus.iml index d8ea2f4..9d7024e 100644 --- a/Klaus.iml +++ b/Klaus.iml @@ -29,7 +29,6 @@ - @@ -53,6 +52,21 @@ + + + + + + + + + + + + + + + @@ -110,7 +124,6 @@ - @@ -124,13 +137,6 @@ - - - - - - - @@ -151,15 +157,11 @@ - - - - diff --git a/pom.xml b/pom.xml index b96f887..cf08277 100644 --- a/pom.xml +++ b/pom.xml @@ -55,6 +55,11 @@ org.springframework.boot spring-boot-starter-validation + + org.springframework.cloud + spring-cloud-starter-config + 2.2.5.RELEASE + org.projectlombok lombok diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index adedeb4..899a830 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,7 +1,12 @@ #environment: -spring.application.name=klaus -eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/ +eureka.client.service-url.defaultZone=http://netflix:eureka@localhost:8761/eureka/ server.port = 8097 +spring.application.name = klaus +spring.cloud.discovery.enabled=true +spring.cloud.config.discovery.service-id = klaus-config-service +#spring.cloud.config.fail-fast=true +#spring.cloud.config.username = SpringConfigUsername +#spring.cloud.config.password = SpringConfigPassword #logging: spring.output.ansi.enabled = always logging.level.root=INFO diff --git a/target/classes/application.properties b/target/classes/application.properties index adedeb4..899a830 100644 --- a/target/classes/application.properties +++ b/target/classes/application.properties @@ -1,7 +1,12 @@ #environment: -spring.application.name=klaus -eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/ +eureka.client.service-url.defaultZone=http://netflix:eureka@localhost:8761/eureka/ server.port = 8097 +spring.application.name = klaus +spring.cloud.discovery.enabled=true +spring.cloud.config.discovery.service-id = klaus-config-service +#spring.cloud.config.fail-fast=true +#spring.cloud.config.username = SpringConfigUsername +#spring.cloud.config.password = SpringConfigPassword #logging: spring.output.ansi.enabled = always logging.level.root=INFO 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 f1b594f..e706c81 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-10-07T11:26:31+0200", + date = "2020-10-14T13:24:17+0200", comments = "version: 1.3.1.Final, compiler: javac, environment: Java 14.0.1 (Oracle Corporation)" ) @Component 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 4d163f9..990a1a3 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 @@ -16,7 +16,6 @@ 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\repository\LogsRepository.class com\release11\klaus\service\EtrackServiceImpl.class com\release11\klaus\controller\MainController.class com\release11\klaus\controller\KlausMvcController.class @@ -25,7 +24,6 @@ com\release11\klaus\service\KlausService.class com\release11\klaus\service\EtrackService.class com\release11\klaus\model\MockedMessageDto.class com\release11\klaus\model\constraints\HttpCode.class -com\release11\klaus\model\MockedResponseDto.class com\release11\klaus\config\LocalDiscovery.class com\release11\klaus\model\constraints\HttpCodeValidation.class com\release11\klaus\utilis\RedisAppender.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 771f916..1119936 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,6 +1,5 @@ D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\controller\MainController.java D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\Event.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\repository\LogsRepository.java D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\repository\MockedResponseRepository.java D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\repository\EventRepository.java D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\EventRequestDto.java @@ -9,7 +8,6 @@ D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\config\Lo D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\controller\EventController.java D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\utilis\RedisAppender.java D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\constraints\HttpCodeValidation.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\MockedResponseDto.java D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\constraints\HttpCode.java D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\repository\EventRepositoryImpl.java D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\controller\KlausController.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 deleted file mode 100644 index e1b0e5a..0000000 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst +++ /dev/null @@ -1,6 +0,0 @@ -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 deleted file mode 100644 index 5b456b8..0000000 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ /dev/null @@ -1,6 +0,0 @@ -D:\phabricator\mockedservices-master\src\test\java\com\release11\klaus\controller\KlausMvcControllerTest.java -D:\phabricator\mockedservices-master\src\test\java\com\release11\klaus\repository\MockedResponseRedisRepositoryTest.java -D:\phabricator\mockedservices-master\src\test\java\com\release11\klaus\controller\KlausControllerTest.java -D:\phabricator\mockedservices-master\src\test\java\com\release11\klaus\service\KlausServiceImplTest.java -D:\phabricator\mockedservices-master\src\test\java\com\release11\klaus\KlausApplicationTests.java -D:\phabricator\mockedservices-master\src\test\java\com\release11\klaus\config\RedisConfigTest.java diff --git a/target/test-classes/com/release11/klaus/repository/EventRepositoryImplTest.class b/target/test-classes/com/release11/klaus/repository/EventRepositoryImplTest.class new file mode 100644 index 0000000..40eaafc Binary files /dev/null and b/target/test-classes/com/release11/klaus/repository/EventRepositoryImplTest.class differ diff --git a/target/test-classes/com/release11/klaus/repository/MockedResponseRedisRepositoryTest.class b/target/test-classes/com/release11/klaus/repository/MockedResponseRedisRepositoryTest.class deleted file mode 100644 index 54ce743..0000000 Binary files a/target/test-classes/com/release11/klaus/repository/MockedResponseRedisRepositoryTest.class and /dev/null differ diff --git a/target/test-classes/com/release11/klaus/service/EtrackServiceImplTest.class b/target/test-classes/com/release11/klaus/service/EtrackServiceImplTest.class new file mode 100644 index 0000000..e795315 Binary files /dev/null and b/target/test-classes/com/release11/klaus/service/EtrackServiceImplTest.class differ diff --git a/target/test-classes/com/release11/klaus/service/KlausServiceImplTest.class b/target/test-classes/com/release11/klaus/service/KlausServiceImplTest.class index 92f7b7e..5389789 100644 Binary files a/target/test-classes/com/release11/klaus/service/KlausServiceImplTest.class and b/target/test-classes/com/release11/klaus/service/KlausServiceImplTest.class differ