Merge branch 'main' into 978_remove_spring-web
# Conflicts: # api/src/main/java/dev/fitko/fitconnect/api/config/ApplicationConfig.java # api/src/main/java/dev/fitko/fitconnect/api/config/ResourcePaths.java # client/src/main/java/dev/fitko/fitconnect/client/bootstrap/ClientFactory.java # core/src/main/java/dev/fitko/fitconnect/core/events/EventLogApiService.java # core/src/main/java/dev/fitko/fitconnect/core/http/RestService.java # core/src/main/java/dev/fitko/fitconnect/core/http/UserAgentInterceptor.java # core/src/main/java/dev/fitko/fitconnect/core/schema/SchemaResourceProvider.java # core/src/main/java/dev/fitko/fitconnect/core/submission/SubmissionApiService.java # core/src/test/java/dev/fitko/fitconnect/core/http/ProxyRestTemplateTest.java # core/src/test/java/dev/fitko/fitconnect/core/http/RestServiceTest.java # core/src/test/java/dev/fitko/fitconnect/core/http/RestTemplateTest.java # integration-tests/src/test/java/dev/fitko/fitconnect/integrationtests/AuthenticationIT.java # integration-tests/src/test/java/dev/fitko/fitconnect/integrationtests/SubscriberClientIT.java # pom.xml
No related branches found
No related tags found
Showing
- client/src/main/java/dev/fitko/fitconnect/client/sender/steps/unencrypted/BuildStep.java 4 additions, 0 deletions...fitconnect/client/sender/steps/unencrypted/BuildStep.java
- client/src/main/java/dev/fitko/fitconnect/client/sender/steps/unencrypted/OptionalPropertiesStep.java 4 additions, 0 deletions...ient/sender/steps/unencrypted/OptionalPropertiesStep.java
- client/src/main/java/dev/fitko/fitconnect/client/sender/strategies/SendEncryptedSubmissionStrategy.java 14 additions, 25 deletions...nt/sender/strategies/SendEncryptedSubmissionStrategy.java
- client/src/main/java/dev/fitko/fitconnect/client/sender/strategies/SendNewSubmissionStrategy.java 52 additions, 95 deletions...t/client/sender/strategies/SendNewSubmissionStrategy.java
- client/src/main/java/dev/fitko/fitconnect/client/subscriber/ReceivedSubmission.java 17 additions, 2 deletions...itko/fitconnect/client/subscriber/ReceivedSubmission.java
- client/src/main/java/dev/fitko/fitconnect/client/subscriber/SubmissionReceiver.java 7 additions, 7 deletions...itko/fitconnect/client/subscriber/SubmissionReceiver.java
- client/src/main/java/dev/fitko/fitconnect/client/util/ValidDataGuard.java 4 additions, 6 deletions...java/dev/fitko/fitconnect/client/util/ValidDataGuard.java
- client/src/test/java/dev/fitko/fitconnect/client/RouterClientTest.java 6 additions, 6 deletions...st/java/dev/fitko/fitconnect/client/RouterClientTest.java
- client/src/test/java/dev/fitko/fitconnect/client/SenderClientTest.java 27 additions, 25 deletions...st/java/dev/fitko/fitconnect/client/SenderClientTest.java
- client/src/test/java/dev/fitko/fitconnect/client/SubscriberClientTest.java 43 additions, 35 deletions...ava/dev/fitko/fitconnect/client/SubscriberClientTest.java
- client/src/test/java/dev/fitko/fitconnect/client/bootstrap/ApplicationConfigLoaderTest.java 190 additions, 0 deletions...connect/client/bootstrap/ApplicationConfigLoaderTest.java
- client/src/test/java/dev/fitko/fitconnect/client/bootstrap/ClientFactoryTest.java 23 additions, 20 deletions.../fitko/fitconnect/client/bootstrap/ClientFactoryTest.java
- client/src/test/java/dev/fitko/fitconnect/client/factory/ApplicationConfigLoaderTest.java 0 additions, 108 deletions...itconnect/client/factory/ApplicationConfigLoaderTest.java
- client/src/test/resources/test-config-default.yml 12 additions, 0 deletionsclient/src/test/resources/test-config-default.yml
- client/src/test/resources/test-config-with-custom-env.yml 21 additions, 0 deletionsclient/src/test/resources/test-config-with-custom-env.yml
- client/src/test/resources/test-config-with-missing-env.yml 1 addition, 20 deletionsclient/src/test/resources/test-config-with-missing-env.yml
- client/src/test/resources/test-config.yml 10 additions, 18 deletionsclient/src/test/resources/test-config.yml
- config.yml 20 additions, 17 deletionsconfig.yml
- core/src/main/java/dev/fitko/fitconnect/core/SubmissionSender.java 13 additions, 9 deletions...main/java/dev/fitko/fitconnect/core/SubmissionSender.java
- core/src/main/java/dev/fitko/fitconnect/core/SubmissionSubscriber.java 12 additions, 11 deletions.../java/dev/fitko/fitconnect/core/SubmissionSubscriber.java
Loading
Please register or sign in to comment