Gradle Modules

build.gradle

@@ -1,11 +1,11 @@
 plugins {
-  id 'org.springframework.boot' version '3.0.1'
-  id 'io.spring.dependency-management' version '1.1.0'
+  id 'spring-conventions'
   id 'java'
   id "java-conventions"
   id "mapstruct-conventions"
   id "jib-conventions"
   id "release-conventions"
+  id 'testcontainers-conventions'
 }
 
 group = 'de.innovationhub.prox'
@@ -17,18 +17,17 @@ repositories {
 }
 
 ext {
-  set('testcontainersVersion', "1.17.4")
   set('restassuredVersion', "5.3.0")
   set('springCloudVersion', "2022.0.0")
   set('springdocVersion', "2.0.2")
 }
 
-springBoot {
-  buildInfo()
-}
-
 dependencies {
-  annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
+  implementation project(":modules:commons")
+  implementation project(":infrastructure:keycloak")
+  implementation project(":infrastructure:cache")
+  implementation project(":infrastructure:rabbitmq")
+  implementation project(":infrastructure:aws")
 
   implementation "com.google.code.findbugs:annotations:3.0.1u2"
 
@@ -62,13 +61,11 @@ dependencies {
   runtimeOnly 'org.postgresql:postgresql'
 
   testImplementation 'org.awaitility:awaitility:4.2.0'
-  testImplementation 'org.springframework.boot:spring-boot-starter-test'
   testImplementation 'org.springframework.amqp:spring-rabbit-test'
   testImplementation 'org.springframework.security:spring-security-test'
   testImplementation("io.rest-assured:rest-assured:${restassuredVersion}")
   testImplementation("io.rest-assured:json-path:${restassuredVersion}")
   testImplementation("io.rest-assured:spring-mock-mvc:${restassuredVersion}")
-  testImplementation 'org.testcontainers:junit-jupiter'
   testImplementation 'org.testcontainers:postgresql'
   testImplementation 'org.testcontainers:rabbitmq'
   testImplementation 'org.testcontainers:localstack'
@@ -84,11 +81,8 @@ dependencies {
   }
 }
 
-dependencyManagement {
-  imports {
-    mavenBom "org.testcontainers:testcontainers-bom:${testcontainersVersion}"
-    mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
-  }
+bootJar {
+  enabled = true
 }
 
 tasks.named('test') {

buildSrc/build.gradle

@@ -14,4 +14,6 @@ dependencies {
     implementation "io.ebean:ebean-gradle-plugin:13.11.1"
     implementation "com.google.cloud.tools:jib-gradle-plugin:3.3.1"
     implementation "net.researchgate:gradle-release:3.0.2"
+    implementation "org.springframework.boot:spring-boot-gradle-plugin:3.0.1"
+    implementation "io.spring.gradle:dependency-management-plugin:1.1.0"
 }

buildSrc/src/main/groovy/spring-conventions.gradle

@@ -0,0 +1,38 @@
+plugins {
+    id 'java'
+    id 'org.springframework.boot'
+    id 'io.spring.dependency-management'
+}
+
+ext {
+    set('springCloudVersion', "2022.0.0")
+}
+
+springBoot {
+    buildInfo()
+}
+
+bootJar {
+    enabled = false
+}
+
+jar {
+    enabled = true
+}
+
+dependencies {
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
+
+    implementation 'org.springframework.boot:spring-boot-starter'
+    // TODO: We might place them elswhere
+    implementation 'io.swagger.core.v3:swagger-annotations:2.2.8'
+
+
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+}
+
+dependencyManagement {
+    imports {
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+    }
+}

buildSrc/src/main/groovy/testcontainers-conventions.gradle

@@ -0,0 +1,13 @@
+plugins {
+    id 'java'
+}
+
+dependencies {
+    testImplementation 'org.testcontainers:junit-jupiter'
+}
+
+dependencyManagement {
+    imports {
+        mavenBom "org.testcontainers:testcontainers-bom:1.17.4"
+    }
+}

infrastructure/aws/build.gradle

@@ -0,0 +1,16 @@
+plugins {
+    id 'java'
+    id 'java-conventions'
+    id 'spring-conventions'
+    id 'testcontainers-conventions'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation "com.amazonaws:aws-java-sdk-s3:1.12.380"
+    implementation "org.springframework.boot:spring-boot-starter"
+    testImplementation 'org.testcontainers:localstack'
+}

src/main/java/de/innovationhub/prox/infra/storage/AwsConfig.java → infrastructure/aws/src/main/java/de/innovationhub/prox/infra/aws/AwsConfig.java

@@ -1,4 +1,4 @@
-package de.innovationhub.prox.infra.storage;
+package de.innovationhub.prox.infra.aws;
 
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
@@ -7,6 +7,7 @@
 import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import lombok.RequiredArgsConstructor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -16,12 +17,14 @@ public class AwsConfig {
   private final AwsConfigurationProperties config;
 
   @Bean
+  @ConditionalOnMissingBean
   public AWSCredentials awsCredentials() {
     return new BasicAWSCredentials(config.credentials().accessKey(), config.credentials()
         .secretKey());
   }
 
   @Bean
+  @ConditionalOnMissingBean
   public AmazonS3Client s3(AWSCredentials credentials) {
     return (AmazonS3Client) AmazonS3ClientBuilder
         .standard()

src/main/java/de/innovationhub/prox/infra/storage/AwsConfigurationProperties.java → infrastructure/aws/src/main/java/de/innovationhub/prox/infra/aws/AwsConfigurationProperties.java

@@ -1,4 +1,4 @@
-package de.innovationhub.prox.infra.storage;
+package de.innovationhub.prox.infra.aws;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

src/main/java/de/innovationhub/prox/infra/storage/S3StorageProvider.java → infrastructure/aws/src/main/java/de/innovationhub/prox/infra/aws/s3/S3StorageProvider.java

@@ -1,8 +1,9 @@
-package de.innovationhub.prox.infra.storage;
+package de.innovationhub.prox.infra.aws.s3;
 
 import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.PutObjectRequest;
+import de.innovationhub.prox.infra.aws.AwsConfigurationProperties;
 import java.io.ByteArrayInputStream;
 import org.springframework.stereotype.Component;
 

src/main/java/de/innovationhub/prox/infra/storage/StorageProvider.java → infrastructure/aws/src/main/java/de/innovationhub/prox/infra/aws/s3/StorageProvider.java

@@ -1,4 +1,4 @@
-package de.innovationhub.prox.infra.storage;
+package de.innovationhub.prox.infra.aws.s3;
 
 import java.io.IOException;
 

infrastructure/aws/src/test/java/de/innovationhub/prox/infra/aws/s3/storage/AbstractLocalStackTest.java

@@ -0,0 +1,26 @@
+package de.innovationhub.prox.infra.aws.s3.storage;
+
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+import org.testcontainers.containers.localstack.LocalStackContainer;
+import org.testcontainers.containers.localstack.LocalStackContainer.Service;
+import org.testcontainers.utility.DockerImageName;
+
+public class AbstractLocalStackTest {
+
+  static LocalStackContainer localStack = new LocalStackContainer(
+      DockerImageName.parse("localstack/localstack:1.3"))
+      .withServices(LocalStackContainer.Service.S3);
+
+  static {
+    localStack.start();
+  }
+
+  @DynamicPropertySource
+  static void setLocalStack(DynamicPropertyRegistry registry) {
+    registry.add("cloud.aws.credentials.accessKey", () -> localStack.getAccessKey());
+    registry.add("cloud.aws.credentials.secretKey", () -> localStack.getSecretKey());
+    registry.add("cloud.aws.region", () -> localStack.getRegion());
+    registry.add("cloud.aws.s3.endpoint", () -> localStack.getEndpointOverride(Service.S3));
+  }
+}

src/test/java/de/innovationhub/prox/infra/storage/S3StorageProviderIntegrationTest.java → infrastructure/aws/src/test/java/de/innovationhub/prox/infra/aws/s3/storage/S3StorageProviderIntegrationTest.java

@@ -1,23 +1,30 @@
-package de.innovationhub.prox.infra.storage;
+package de.innovationhub.prox.infra.aws.s3.storage;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 import com.amazonaws.services.s3.AmazonS3;
-import de.innovationhub.prox.AbstractIntegrationTest;
+import de.innovationhub.prox.infra.aws.AwsConfig;
+import de.innovationhub.prox.infra.aws.AwsConfigurationProperties;
+import de.innovationhub.prox.infra.aws.s3.S3StorageProvider;
 import java.io.IOException;
 import java.util.UUID;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
 
 // TODO: We probably do not need to spin up spring boot at all. Re-evaluate test slices
-class S3StorageProviderIntegrationTest extends AbstractIntegrationTest {
+@SpringBootTest
+@ContextConfiguration(classes = {S3StorageProvider.class, AwsConfig.class})
+@EnableConfigurationProperties(AwsConfigurationProperties.class)
+class S3StorageProviderIntegrationTest extends AbstractLocalStackTest {
+
   @Autowired
   S3StorageProvider s3StorageProvider;
-
   @Autowired
   AmazonS3 s3Client;
-
   @Autowired
   AwsConfigurationProperties config;
 

infrastructure/aws/src/test/resources/application.yml

@@ -0,0 +1,8 @@
+cloud:
+  aws:
+    region: eu-central-1
+    credentials:
+      access-key: ${AWS_ACCESS_KEY:}
+      secret-key: ${AWS_SECRET_KEY:}
+    s3:
+      bucket: ${AWS_S3_BUCKET:prox}

infrastructure/cache/build.gradle

@@ -0,0 +1,16 @@
+plugins {
+    id 'java'
+    id 'java-conventions'
+    id 'spring-conventions'
+    id 'testcontainers-conventions'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'org.springframework.boot:spring-boot-starter-cache'
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+    implementation 'com.github.ben-manes.caffeine:caffeine'
+}

src/main/java/de/innovationhub/prox/config/CacheConfig.java → infrastructure/cache/src/main/java/de/innovationhub/prox/infra/cache/CacheConfig.java

@@ -1,4 +1,4 @@
-package de.innovationhub.prox.config;
+package de.innovationhub.prox.infra.cache;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
 import java.util.List;

infrastructure/keycloak/build.gradle

@@ -0,0 +1,17 @@
+plugins {
+    id 'java'
+    id 'java-library'
+    id 'java-conventions'
+    id 'spring-conventions'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    api "org.keycloak:keycloak-server-spi-private:20.0.2"
+    api "org.keycloak:keycloak-admin-client:20.0.2"
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
+}

src/main/java/de/innovationhub/prox/config/KeycloakConfig.java → infrastructure/keycloak/src/main/java/de/innovationhub/prox/infra/keycloak/KeycloakConfig.java

@@ -1,4 +1,4 @@
-package de.innovationhub.prox.config;
+package de.innovationhub.prox.infra.keycloak;
 
 import static org.keycloak.OAuth2Constants.CLIENT_CREDENTIALS;
 
@@ -7,6 +7,7 @@
 import org.keycloak.admin.client.KeycloakBuilder;
 import org.keycloak.admin.client.resource.RealmResource;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -27,6 +28,7 @@ public class KeycloakConfig {
   private String realm;
 
   @Bean
+  @ConditionalOnMissingBean
   public Keycloak keycloak() {
     return KeycloakBuilder.builder()
         .grantType(CLIENT_CREDENTIALS)
@@ -38,6 +40,7 @@ public Keycloak keycloak() {
   }
 
   @Bean
+  @ConditionalOnMissingBean
   public RealmResource realmResource(Keycloak keycloak) {
     return keycloak.realm(realm);
   }

src/main/java/de/innovationhub/prox/config/KeycloakGrantedAuthoritiesConverter.java → infrastructure/keycloak/src/main/java/de/innovationhub/prox/infra/keycloak/KeycloakGrantedAuthoritiesConverter.java

@@ -1,4 +1,4 @@
-package de.innovationhub.prox.config;
+package de.innovationhub.prox.infra.keycloak;
 
 
 import java.util.Collection;

infrastructure/rabbitmq/build.gradle

@@ -0,0 +1,13 @@
+plugins {
+    id 'java'
+    id 'java-conventions'
+    id 'spring-conventions'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'org.springframework.boot:spring-boot-starter-amqp'
+}

src/main/java/de/innovationhub/prox/config/MessagingConfig.java → infrastructure/rabbitmq/src/main/java/de/innovationhub/prox/infra/rabbitmq/MessagingConfig.java

@@ -1,4 +1,4 @@
-package de.innovationhub.prox.config;
+package de.innovationhub.prox.infra.rabbitmq;
 
 import org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.BindingBuilder;

modules/commons/build.gradle

@@ -0,0 +1,12 @@
+plugins {
+    id 'java'
+    id "java-conventions"
+    id 'spring-conventions'
+}
+
+dependencies {
+    implementation 'org.springframework.data:spring-data-commons'
+    implementation 'org.springframework.data:spring-data-jpa'
+    implementation 'jakarta.persistence:jakarta.persistence-api'
+
+}

modules/profile/build.gradle

@@ -0,0 +1,12 @@
+plugins {
+    id 'java'
+    id "java-conventions"
+    id 'spring-conventions'
+}
+
+dependencies {
+    implementation 'org.springframework.data:spring-data-commons'
+    implementation 'org.springframework.data:spring-data-jpa'
+    implementation 'jakarta.persistence:jakarta.persistence-api'
+
+}