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
Showing
- api/src/main/java/dev/fitko/fitconnect/api/services/Subscriber.java 4 additions, 2 deletions...in/java/dev/fitko/fitconnect/api/services/Subscriber.java
- api/src/main/java/dev/fitko/fitconnect/api/services/auth/OAuthService.java 1 addition, 1 deletion.../dev/fitko/fitconnect/api/services/auth/OAuthService.java
- api/src/main/java/dev/fitko/fitconnect/api/services/crypto/CryptoService.java 2 additions, 2 deletions...v/fitko/fitconnect/api/services/crypto/CryptoService.java
- api/src/main/java/dev/fitko/fitconnect/api/services/events/EventLogService.java 1 addition, 1 deletion...fitko/fitconnect/api/services/events/EventLogService.java
- api/src/main/java/dev/fitko/fitconnect/api/services/events/SecurityEventService.java 1 addition, 1 deletion.../fitconnect/api/services/events/SecurityEventService.java
- api/src/main/java/dev/fitko/fitconnect/api/services/routing/RoutingService.java 1 addition, 1 deletion...fitko/fitconnect/api/services/routing/RoutingService.java
- api/src/main/java/dev/fitko/fitconnect/api/services/schema/SchemaProvider.java 1 addition, 1 deletion.../fitko/fitconnect/api/services/schema/SchemaProvider.java
- api/src/main/java/dev/fitko/fitconnect/api/services/submission/SubmissionService.java 1 addition, 1 deletion...fitconnect/api/services/submission/SubmissionService.java
- client/src/main/java/dev/fitko/fitconnect/client/RouterClient.java 84 additions, 0 deletions...c/main/java/dev/fitko/fitconnect/client/RouterClient.java
- client/src/main/java/dev/fitko/fitconnect/client/SenderClient.java 31 additions, 16 deletions...c/main/java/dev/fitko/fitconnect/client/SenderClient.java
- client/src/main/java/dev/fitko/fitconnect/client/SubscriberClient.java 34 additions, 17 deletions...in/java/dev/fitko/fitconnect/client/SubscriberClient.java
- client/src/main/java/dev/fitko/fitconnect/client/bootstrap/ApplicationConfigLoader.java 101 additions, 0 deletions.../fitconnect/client/bootstrap/ApplicationConfigLoader.java
- client/src/main/java/dev/fitko/fitconnect/client/bootstrap/ClientFactory.java 25 additions, 19 deletions.../dev/fitko/fitconnect/client/bootstrap/ClientFactory.java
- client/src/main/java/dev/fitko/fitconnect/client/cli/CommandExecutor.java 3 additions, 3 deletions...java/dev/fitko/fitconnect/client/cli/CommandExecutor.java
- client/src/main/java/dev/fitko/fitconnect/client/cli/CommandLineRunner.java 3 additions, 3 deletions...va/dev/fitko/fitconnect/client/cli/CommandLineRunner.java
- client/src/main/java/dev/fitko/fitconnect/client/cli/batch/CsvImporter.java 1 addition, 1 deletion...va/dev/fitko/fitconnect/client/cli/batch/CsvImporter.java
- client/src/main/java/dev/fitko/fitconnect/client/router/DestinationSearch.java 38 additions, 43 deletions...dev/fitko/fitconnect/client/router/DestinationSearch.java
- client/src/main/java/dev/fitko/fitconnect/client/sender/model/Attachment.java 11 additions, 11 deletions.../dev/fitko/fitconnect/client/sender/model/Attachment.java
- client/src/main/java/dev/fitko/fitconnect/client/sender/steps/encrypted/EncryptedAttachmentsStep.java 4 additions, 0 deletions...ient/sender/steps/encrypted/EncryptedAttachmentsStep.java
- client/src/main/java/dev/fitko/fitconnect/client/sender/steps/encrypted/EncryptedBuildStep.java 4 additions, 0 deletions...ect/client/sender/steps/encrypted/EncryptedBuildStep.java
Loading
Please register or sign in to comment