From d077990a7dce499730e5a9f0dc1dca662a64d9be Mon Sep 17 00:00:00 2001 From: Shaun Mathias Date: Wed, 4 Dec 2024 14:49:45 +0000 Subject: [PATCH 01/12] initial config commit --- java/pom.xml | 186 ++++-- .../templates/project-builder-config.json | 8 + .../resources/templates/template.mustache | 556 ++++++++++++++++++ 3 files changed, 707 insertions(+), 43 deletions(-) create mode 100644 java/src/main/resources/templates/project-builder-config.json create mode 100644 java/src/main/resources/templates/template.mustache diff --git a/java/pom.xml b/java/pom.xml index 5c7fab31..808b778c 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -22,7 +22,10 @@ 2.0.7 + no-aws + + no-azure 2.6.4 @@ -39,6 +42,9 @@ 11.1.0 5.11.3 + 2024.1.38 + 2.25 + @@ -46,6 +52,8 @@ http localhost 9000 + + ../stacks-preprocessor-output @@ -142,38 +150,6 @@ ${jackson.version} - - com.azure.spring - azure-spring-boot - ${azure.springboot.version} - - - net.minidev - json-smart - - - - - - com.microsoft.azure - applicationinsights-spring-boot-starter - ${applicationinsights.version} - runtime - - - - com.microsoft.azure - applicationinsights-logging-logback - ${applicationinsights.version} - runtime - - - ch.qos.logback - logback-core - - - - net.minidev json-smart @@ -252,6 +228,18 @@ ${spring.data.commons} + + systems.manifold + manifold + ${manifold.version} + + + + com.spotify.fmt + fmt-maven-plugin + ${fmt-maven-plugin.version} + + @@ -423,6 +411,90 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 17 + 17 + UTF-8 + + + -Xplugin:Manifold + -Amanifold.source.target=${prop.output.dir} + ${prop.aws} + ${prop.azure} + + + + + systems.manifold + manifold-preprocessor + ${manifold.version} + + + org.projectlombok + lombok + ${lombok.version} + + + + + + + + com.ensono.stacks + stacks-maven-plugin + 1.0-SNAPSHOT + + + + + stacks-clean-project + + + stacks-prepare-project + + + stacks-prepare-project-tests + + + + + + ${prop.output.dir} + java/src/main/resources/templates/project-builder-config.json + + + + + com.spotify.fmt + fmt-maven-plugin + ${fmt-maven-plugin.version} + + + compile + + format + + + + + ${prop.output.dir}/src/main/java + true + true + .*\.java + + false + false + + + + + @@ -432,29 +504,57 @@ aws - - - . - - + -AUSE_AWS= aws + + com.amazonaws + aws-java-sdk-s3 + ${aws-java-sdk-s3.version} + azure - - - . - - + -AUSE_AZURE= azure + + com.azure.spring + azure-spring-boot + ${azure.springboot.version} + + + net.minidev + json-smart + + + + + + com.microsoft.azure + applicationinsights-spring-boot-starter + ${applicationinsights.version} + runtime + + + + com.microsoft.azure + applicationinsights-logging-logback + ${applicationinsights.version} + runtime + + + ch.qos.logback + logback-core + + + @@ -518,7 +618,7 @@ ${exec-maven-plugin.version} - Add execution rigths on bash scripts + Add execution rights on bash scripts process-resources exec diff --git a/java/src/main/resources/templates/project-builder-config.json b/java/src/main/resources/templates/project-builder-config.json new file mode 100644 index 00000000..e8fbcb9b --- /dev/null +++ b/java/src/main/resources/templates/project-builder-config.json @@ -0,0 +1,8 @@ +{ + "coreIncludes": [ + "com/amido/stacks/workloads" + ], + "profileFilters": [], + "corePropertiesFile": "application.yml", + "outputPropertiesFile": "application.yml" +} \ No newline at end of file diff --git a/java/src/main/resources/templates/template.mustache b/java/src/main/resources/templates/template.mustache new file mode 100644 index 00000000..5437571a --- /dev/null +++ b/java/src/main/resources/templates/template.mustache @@ -0,0 +1,556 @@ + + + 4.0.0 + + + com.amido.stacks.modules + stacks-modules-parent + 3.0.26-RELEASE + + + com.amido.stacks.workloads + stacks-api + 1.0.0 + + stacks-api + Demo project for Java + + + 1.0.5.11-RELEASE + 2.0.7 + + + no-aws + no-azure + + 2.6.4 + 4.0.0 + 4.0.10 + 4.6.15 + 4.6.15 + 1.12.779 + 1.9.9.1 + 3.5.0 + 2022.0.4 + 3.5.24 + 3.4.0 + 11.1.0 + 5.11.3 + + {{#versionProperties}} + {{{.}}} + {{/versionProperties}} + + + + + JavaMenuAPI + http + localhost + 9000 + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.dependencies.version} + pom + import + + + org.junit + junit-bom + ${junit-jupiter.version} + pom + import + + + + + + + + + com.amido.stacks.modules + stacks-core-api + ${stacks.core.api.version} + + + org.aspectj + aspectjweaver + + + + + + com.amido.stacks.modules + stacks-core-commons + ${stacks.core.commons.version} + + + + org.springframework.boot + spring-boot-properties-migrator + runtime + + + + org.springframework.cloud + spring-cloud-starter-bootstrap + + + + org.springframework.cloud + spring-cloud-starter-config + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.yaml + snakeyaml + + + + + + org.springframework.boot + spring-boot-starter-web + + + + com.fasterxml.jackson.core + jackson-core + + + + com.fasterxml.jackson.core + jackson-databind + + + + com.fasterxml.jackson.core + jackson-annotations + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson.version} + + + + com.azure.spring + azure-spring-boot + ${azure.springboot.version} + + + net.minidev + json-smart + + + + + + com.microsoft.azure + applicationinsights-spring-boot-starter + ${applicationinsights.version} + runtime + + + + com.microsoft.azure + applicationinsights-logging-logback + ${applicationinsights.version} + runtime + + + ch.qos.logback + logback-core + + + + + + net.minidev + json-smart + + + + com.beust + jcommander + + + + + com.auth0 + auth0-spring-security-api + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + junit + junit + + + com.vaadin.external.google + android-json + + + + + + au.com.dius + pact-jvm-provider-spring + ${au.com.dius.pact-jvm-provider-spring.version} + test + + + + au.com.dius.pact + consumer + ${au.com.dius.pact.consumer-version} + test + + + + org.pitest + pitest-parent + pom + + + + com.nimbusds + oauth2-oidc-sdk + runtime + + + + com.amazonaws + aws-java-sdk-s3 + ${aws-java-sdk-s3.version} + + + + jakarta.persistence + jakarta.persistence-api + + + org.springframework.data + spring-data-commons + ${spring.data.commons} + + + + {{#dependencies}} + + {{groupId}} + {{artifactId}} + {{#version}} + {{version}} + {{/version}} + + {{/dependencies}} + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + com.amido.stacks.workloads.Application + + + + + repackage + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + **/AuthControllerImpl* + **/ApplicationConfig* + + + + + + prepare-agent + + + + report + prepare-package + + report + + + + default-check + + check + + + + + BUNDLE + + + COMPLEXITY + COVEREDRATIO + 0.00 + + + + + + + + + + au.com.dius.pact.provider + maven + ${au.com.dius.pact.provider.maven-version} + + ${pact.broker.url} + ${pact.broker.token} + + true + + + + ${pact.api.name} + ${pact.api.protocol} + ${pact.api.host} + ${pact.api.port} + + + + + + com.coveo + fmt-maven-plugin + ${fmt-maven-plugin.version} + + true + true + .*\.java + + false + false + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven-checkstyle-plugin.version} + + + + com.puppycrawl.tools + checkstyle + ${puppycrawl-tools-checkstyle.version} + + + + google_checks.xml + UTF-8 + true + true + false + + + + validate + validate + + + + + com.github.spotbugs + spotbugs-maven-plugin + ${spotbugs-maven-plugin.version} + + + + com.github.spotbugs + spotbugs + ${spotbugs.version} + + + + + org.pitest + pitest-maven + ${pitest.version} + + + org.pitest + pitest-junit5-plugin + 0.15 + + + + + pitest + verify + + mutationCoverage + + + + + 15 + target/pitHistory.txt + target/pitHistory.txt + false + + STRONGER + + + XML + HTML + + + + + + + + + + + + aws + + + . + + + + aws + + + + + + + azure + + + . + + + + azure + + + + + + + owasp-dependency-check + + + + org.owasp + dependency-check-maven + ${owasp-dependency-check-plugin.version} + + + + check + + + + + + + + + + test + + true + + spring.profiles.active + test + + + + + + local + + + + src/main/resources/local + + + src/main/resources + + + + + + + update-permissions + + + !windows + + + + + + org.codehaus.mojo + exec-maven-plugin + ${exec-maven-plugin.version} + + + Add execution rights on bash scripts + process-resources + + exec + + + chmod + + 755 + ${project.basedir}/mvnw + + + + + + + + + + + \ No newline at end of file From 64687942688502851c5ea17652b4095e8505e1f0 Mon Sep 17 00:00:00 2001 From: Alastair Brown Date: Thu, 5 Dec 2024 14:10:58 +0000 Subject: [PATCH 02/12] updated config to refect plug-in updates --- .../resources/templates/project-builder-config.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/java/src/main/resources/templates/project-builder-config.json b/java/src/main/resources/templates/project-builder-config.json index e8fbcb9b..24b435a2 100644 --- a/java/src/main/resources/templates/project-builder-config.json +++ b/java/src/main/resources/templates/project-builder-config.json @@ -3,6 +3,16 @@ "com/amido/stacks/workloads" ], "profileFilters": [], + "excludedGroupIds": [ + "systems.manifold", + "com.github.spullara.mustache.java", + "com.spotify.fmt" + ], "corePropertiesFile": "application.yml", + "additionalProperties": [ + "AI-Agent.xml", + "logback-spring.xml", + "auth.properties" + ], "outputPropertiesFile": "application.yml" } \ No newline at end of file From a9551121dc91f8f3dff23b0b1d3ac5f887387622 Mon Sep 17 00:00:00 2001 From: Shaun Mathias Date: Thu, 5 Dec 2024 15:48:14 +0000 Subject: [PATCH 03/12] updated mustache template --- java/pom.xml | 31 +-- .../resources/templates/template.mustache | 209 +----------------- 2 files changed, 28 insertions(+), 212 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index 808b778c..fed13afa 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -324,20 +324,20 @@ - - com.coveo - fmt-maven-plugin - ${fmt-maven-plugin.version} - - true - true - .*\.java - - false - false - - - + + + + + + + + + + + + + + org.apache.maven.plugins maven-checkstyle-plugin @@ -466,7 +466,8 @@ ${prop.output.dir} - java/src/main/resources/templates/project-builder-config.json + src/main/resources/templates/project-builder-config.json + src/main/resources/templates/template.mustache diff --git a/java/src/main/resources/templates/template.mustache b/java/src/main/resources/templates/template.mustache index 5437571a..9c2e1915 100644 --- a/java/src/main/resources/templates/template.mustache +++ b/java/src/main/resources/templates/template.mustache @@ -18,24 +18,12 @@ Demo project for Java - 1.0.5.11-RELEASE - 2.0.7 - no-aws no-azure - 2.6.4 - 4.0.0 - 4.0.10 - 4.6.15 - 4.6.15 - 1.12.779 - 1.9.9.1 3.5.0 2022.0.4 - 3.5.24 - 3.4.0 11.1.0 5.11.3 @@ -74,199 +62,26 @@ - - - com.amido.stacks.modules - stacks-core-api - ${stacks.core.api.version} - - - org.aspectj - aspectjweaver - - - - - - com.amido.stacks.modules - stacks-core-commons - ${stacks.core.commons.version} - - - - org.springframework.boot - spring-boot-properties-migrator - runtime - - - - org.springframework.cloud - spring-cloud-starter-bootstrap - - - - org.springframework.cloud - spring-cloud-starter-config - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.yaml - snakeyaml - - - - - - org.springframework.boot - spring-boot-starter-web - - - - com.fasterxml.jackson.core - jackson-core - - - - com.fasterxml.jackson.core - jackson-databind - - - - com.fasterxml.jackson.core - jackson-annotations - - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} - - - - com.azure.spring - azure-spring-boot - ${azure.springboot.version} - - - net.minidev - json-smart - - - - - - com.microsoft.azure - applicationinsights-spring-boot-starter - ${applicationinsights.version} - runtime - - - - com.microsoft.azure - applicationinsights-logging-logback - ${applicationinsights.version} - runtime - - - ch.qos.logback - logback-core - - - - - - net.minidev - json-smart - - - - com.beust - jcommander - - - - - com.auth0 - auth0-spring-security-api - - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - - - junit - junit - - - com.vaadin.external.google - android-json - - - - - - au.com.dius - pact-jvm-provider-spring - ${au.com.dius.pact-jvm-provider-spring.version} - test - - - - au.com.dius.pact - consumer - ${au.com.dius.pact.consumer-version} - test - - - - org.pitest - pitest-parent - pom - - - - com.nimbusds - oauth2-oidc-sdk - runtime - - - - com.amazonaws - aws-java-sdk-s3 - ${aws-java-sdk-s3.version} - - - - jakarta.persistence - jakarta.persistence-api - - - org.springframework.data - spring-data-commons - ${spring.data.commons} - - - - {{#dependencies}} + {{#dependencies}} {{groupId}} {{artifactId}} {{#version}} {{version}} {{/version}} + {{#hasExclusions}} + + {{#exclusions}} + + {{groupId}} + {{artifactId}} + + {{/exclusions}} + + {{/hasExclusions}} - {{/dependencies}} + {{/dependencies}} From 5468006f126145f7a4e678beddd4f10d087a3377 Mon Sep 17 00:00:00 2001 From: ShaunMathias Date: Tue, 10 Dec 2024 10:53:35 +0000 Subject: [PATCH 04/12] Added the cosmos and dynamo main db code and folders (#2) * added the cosmos and dynamo main db code and folders * added comments for placeholder classes and interfaces * corrected comment --- java/pom.xml | 43 +++++++++++++- .../cosmosdb/config/CosmosDBConfig.java | 58 +++++++++++++++++++ .../repository/StacksCosmosDBRepository.java | 20 +++++++ .../dynamodb/config/DynamoDBConfig.java | 50 ++++++++++++++++ .../repository/StacksDynamoDBRepository.java | 23 ++++++++ .../templates/project-builder-config.json | 22 ++++++- 6 files changed, 212 insertions(+), 4 deletions(-) create mode 100644 java/src/main/java/com/amido/stacks/cosmosdb/config/CosmosDBConfig.java create mode 100644 java/src/main/java/com/amido/stacks/cosmosdb/repository/StacksCosmosDBRepository.java create mode 100644 java/src/main/java/com/amido/stacks/dynamodb/config/DynamoDBConfig.java create mode 100644 java/src/main/java/com/amido/stacks/dynamodb/repository/StacksDynamoDBRepository.java diff --git a/java/pom.xml b/java/pom.xml index fed13afa..cee9f596 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -23,10 +23,16 @@ - no-aws + - no-azure + + + + + + + 2.6.4 4.0.0 @@ -41,6 +47,8 @@ 3.4.0 11.1.0 5.11.3 + 5.6.0 + 5.2.5 2024.1.38 2.25 @@ -427,6 +435,7 @@ -Amanifold.source.target=${prop.output.dir} ${prop.aws} ${prop.azure} + ${prop.cosmosdb} @@ -559,6 +568,36 @@ + + cosmosdb + + -AUSE_COSMOSDB= + cosmosdb + + + + com.azure + azure-spring-data-cosmos + ${azure-spring-cosmos.version} + + + + + + dynamodb + + -AUSE_DYNAMODB= + dynamodb + + + + io.github.boostchicken + spring-data-dynamodb + ${spring.data.dynamodb.version} + + + + owasp-dependency-check diff --git a/java/src/main/java/com/amido/stacks/cosmosdb/config/CosmosDBConfig.java b/java/src/main/java/com/amido/stacks/cosmosdb/config/CosmosDBConfig.java new file mode 100644 index 00000000..1db3d75b --- /dev/null +++ b/java/src/main/java/com/amido/stacks/cosmosdb/config/CosmosDBConfig.java @@ -0,0 +1,58 @@ +package com.amido.stacks.cosmosdb.config; + +#if USE_COSMOSDB +import com.azure.core.credential.AzureKeyCredential; +import com.azure.cosmos.CosmosClientBuilder; +import com.azure.cosmos.DirectConnectionConfig; +import com.azure.cosmos.GatewayConnectionConfig; +import com.azure.spring.data.cosmos.config.AbstractCosmosConfiguration; +import com.azure.spring.data.cosmos.config.CosmosConfig; +import com.azure.spring.data.cosmos.repository.config.EnableCosmosRepositories; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; +import org.springframework.context.annotation.Bean; +import com.amido.stacks.core.repository.StacksPersistence; +#endif + +import org.springframework.context.annotation.Configuration; + +#if USE_COSMOSDB +@Configuration +@ConditionalOnExpression(value = "${cosmos.enabled:true}") +@EnableCosmosRepositories(basePackages = "com.amido.stacks.workloads.menu.repository") +public class CosmosDBConfig extends AbstractCosmosConfiguration { + + @Value(value = "${spring.data.cosmos.uri}") + private String uri; + + @Value(value = "${spring.data.cosmos.key}") + private String key; + + @Value(value = "${spring.data.cosmos.databaseName}") + private String databaseName; + + @Bean + public CosmosClientBuilder cosmosClientBuilder() { + return new CosmosClientBuilder() + .endpoint(uri) + .credential(new AzureKeyCredential(key)) + .directMode(new DirectConnectionConfig(), new GatewayConnectionConfig()); + } + + @Override + public CosmosConfig cosmosConfig() { + return CosmosConfig.builder().enableQueryMetrics(false).build(); + } + + @Override + protected String getDatabaseName() { + return databaseName; + } +} +#else +// Placeholder configuration class to ensure Maven compilation when Cosmos is not selected. +// The entire Cosmos folder, including this file, is filtered out with project-builder-config. +@Configuration +public class CosmosDBConfig {} + +#endif \ No newline at end of file diff --git a/java/src/main/java/com/amido/stacks/cosmosdb/repository/StacksCosmosDBRepository.java b/java/src/main/java/com/amido/stacks/cosmosdb/repository/StacksCosmosDBRepository.java new file mode 100644 index 00000000..710ff606 --- /dev/null +++ b/java/src/main/java/com/amido/stacks/cosmosdb/repository/StacksCosmosDBRepository.java @@ -0,0 +1,20 @@ +package com.amido.stacks.cosmosdb.repository; + +#if USE_COSMOSDB +import com.azure.spring.data.cosmos.repository.CosmosRepository; +import org.springframework.data.repository.CrudRepository; +#endif +import com.amido.stacks.core.repository.StacksPersistence; +import org.springframework.data.repository.NoRepositoryBean; + +#if USE_COSMOSDB +@NoRepositoryBean +public interface StacksCosmosDBRepository + extends StacksPersistence, CrudRepository, CosmosRepository {} +#else +// Placeholder repository interface to ensure Maven compilation when Cosmos is not selected. +// The entire Cosmos folder, including this file, is filtered out with project-builder-config. +@NoRepositoryBean +public interface StacksCosmosDBRepository extends StacksPersistence { +} +#endif \ No newline at end of file diff --git a/java/src/main/java/com/amido/stacks/dynamodb/config/DynamoDBConfig.java b/java/src/main/java/com/amido/stacks/dynamodb/config/DynamoDBConfig.java new file mode 100644 index 00000000..86b7a708 --- /dev/null +++ b/java/src/main/java/com/amido/stacks/dynamodb/config/DynamoDBConfig.java @@ -0,0 +1,50 @@ +package com.amido.stacks.dynamodb.config; + +#if USE_DYNAMODB +import static com.amazonaws.util.StringUtils.isNullOrEmpty; + +import com.amazonaws.auth.DefaultAWSCredentialsProviderChain; +import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration; +import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; +import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder; +import org.socialsignin.spring.data.dynamodb.repository.config.EnableDynamoDBRepositories; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +#endif + +import org.springframework.context.annotation.Configuration; + +#if USE_DYNAMODB +@Configuration +@ConfigurationProperties(prefix = "amazon.dynamodb") +@EnableDynamoDBRepositories(basePackages = "com.amido.stacks.workloads.menu.repository") +public class DynamoDBConfig { + + @Value("${amazon.dynamodb.endpoint}") + private String dynamoDbEndpoint; + + @Value("${amazon.dynamodb.signingRegion}") + private String signingRegion; + + @Bean + public AmazonDynamoDB amazonDynamoDB() { + + AmazonDynamoDBClientBuilder clientBuilder = + AmazonDynamoDBClientBuilder.standard() + .withCredentials(new DefaultAWSCredentialsProviderChain()); + + if (!isNullOrEmpty(dynamoDbEndpoint)) { + clientBuilder.withEndpointConfiguration( + new EndpointConfiguration(dynamoDbEndpoint, signingRegion)); + } + + return clientBuilder.build(); + } +} +#else +// Placeholder configuration class to ensure Maven compilation when Dynamo is not selected. +// The entire Dynamo folder, including this file, is filtered out with project-builder-config. +@Configuration +public class DynamoDBConfig {} +#endif diff --git a/java/src/main/java/com/amido/stacks/dynamodb/repository/StacksDynamoDBRepository.java b/java/src/main/java/com/amido/stacks/dynamodb/repository/StacksDynamoDBRepository.java new file mode 100644 index 00000000..ac7b99cf --- /dev/null +++ b/java/src/main/java/com/amido/stacks/dynamodb/repository/StacksDynamoDBRepository.java @@ -0,0 +1,23 @@ +package com.amido.stacks.dynamodb.repository; + +#if USE_DYNAMODB +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.PagingAndSortingRepository; +#endif +import com.amido.stacks.core.repository.StacksPersistence; +import org.springframework.data.repository.NoRepositoryBean; + + +#if USE_DYNAMODB +@NoRepositoryBean +public interface StacksDynamoDBRepository + extends StacksPersistence, + CrudRepository, + PagingAndSortingRepository {} +#else +// Placeholder repository interface to ensure Maven compilation when Dynamo is not selected. +// The entire Dynamo folder, including this file, is filtered out with project-builder-config. +@NoRepositoryBean +public interface StacksDynamoDBRepository extends StacksPersistence { +} +#endif \ No newline at end of file diff --git a/java/src/main/resources/templates/project-builder-config.json b/java/src/main/resources/templates/project-builder-config.json index 24b435a2..3fa9a6fa 100644 --- a/java/src/main/resources/templates/project-builder-config.json +++ b/java/src/main/resources/templates/project-builder-config.json @@ -1,8 +1,26 @@ { "coreIncludes": [ - "com/amido/stacks/workloads" + "com/amido/stacks/workloads", + "com/amido/stacks/workloads/menu", + "com/amido/stacks/workloads/menu/api", + "com/amido/stacks/workloads/menu/domain", + "com/amido/stacks/workloads/menu/mappers", + "com/amido/stacks/workloads/menu/service" + ], + "profileFilters": [ + { + "id": "cosmosdb", + "packages" : [ + "com/amido/stacks/cosmosdb" + ] + }, + { + "id": "dynamodb", + "packages" : [ + "com/amido/stacks/dynamodb" + ] + } ], - "profileFilters": [], "excludedGroupIds": [ "systems.manifold", "com.github.spullara.mustache.java", From 92b286cc1993d4945b407fd202bf36ba0330b39a Mon Sep 17 00:00:00 2001 From: Alastair Brown Date: Tue, 10 Dec 2024 11:13:12 +0000 Subject: [PATCH 05/12] added AWS and Azure config (#3) * added AWS and Azure config * added missing property --- java/pom.xml | 94 ++++++++++++++++++- .../stacks/aws/tracing/XRayInspector.java | 24 +++++ .../stacks/aws/tracing/XRayTracingFilter.java | 46 +++++++++ .../templates/project-builder-config.json | 11 +++ .../workloads/menu/domain/CategoryHelper.java | 4 +- .../workloads/menu/domain/ItemHelper.java | 4 +- .../workloads/menu/domain/MenuHelper.java | 4 +- .../stacks/workloads/util/TestHelper.java | 4 +- 8 files changed, 185 insertions(+), 6 deletions(-) create mode 100644 java/src/main/java/com/amido/stacks/aws/tracing/XRayInspector.java create mode 100644 java/src/main/java/com/amido/stacks/aws/tracing/XRayTracingFilter.java diff --git a/java/pom.xml b/java/pom.xml index cee9f596..672ef22b 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -61,7 +61,7 @@ localhost 9000 - ../stacks-preprocessor-output + ../../stacks-preprocessor-output @@ -436,6 +436,7 @@ ${prop.aws} ${prop.azure} ${prop.cosmosdb} + ${prop.dynamodb} @@ -517,14 +518,103 @@ -AUSE_AWS= aws + 2.4.4 + + 1.12.579 + 2.14.0 + 10.1.15 + + + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat-embed.version} + + + + + + io.awspring.cloud + spring-cloud-starter-aws-secrets-manager-config + ${spring.cloud.starter.aws.secrets.manager.config.version} + + + + + + com.amazonaws + aws-java-sdk-core + ${aws-java-sdk.version} + + + + com.amazonaws + aws-java-sdk-dynamodb + ${aws-java-sdk.version} + + com.amazonaws aws-java-sdk-s3 - ${aws-java-sdk-s3.version} + ${aws-java-sdk.version} + + + + + com.amazonaws + aws-xray-recorder-sdk-spring + ${aws-xray-recorder-sdk.version} + + + com.amazonaws + aws-xray-recorder-sdk-metrics + ${aws-xray-recorder-sdk.version} + + + com.amazonaws + aws-xray-recorder-sdk-aws-sdk-instrumentor + ${aws-xray-recorder-sdk.version} + + + com.amazonaws + aws-xray-recorder-sdk-log4j + ${aws-xray-recorder-sdk.version} + + + com.amazonaws + aws-xray-recorder-sdk-apache-http + ${aws-xray-recorder-sdk.version} + + + + + io.awspring.cloud + spring-cloud-aws-dependencies + ${spring.cloud.starter.aws.secrets.manager.config.version} + pom + import + + + com.amazonaws + aws-java-sdk-bom + ${aws-java-sdk.version} + pom + import + + + + com.amazonaws + aws-xray-recorder-sdk-bom + ${aws-xray-recorder-sdk.version} + pom + import + + + diff --git a/java/src/main/java/com/amido/stacks/aws/tracing/XRayInspector.java b/java/src/main/java/com/amido/stacks/aws/tracing/XRayInspector.java new file mode 100644 index 00000000..d5b54260 --- /dev/null +++ b/java/src/main/java/com/amido/stacks/aws/tracing/XRayInspector.java @@ -0,0 +1,24 @@ +package com.amido.stacks.aws.tracing; + + +#if USE_AWS +import com.amazonaws.xray.spring.aop.BaseAbstractXRayInterceptor; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Component; + + +@Aspect +@Component +@ConditionalOnProperty(value = "aws.xray.enabled", havingValue = "true") +public class XRayInspector extends BaseAbstractXRayInterceptor { + @Override + @Pointcut("within(com.amido.stacks..*) && bean(*Controller)") + public void xrayEnabledClasses() { + // Pointcut + } +} +#else +public class XRayInspector { } +#endif diff --git a/java/src/main/java/com/amido/stacks/aws/tracing/XRayTracingFilter.java b/java/src/main/java/com/amido/stacks/aws/tracing/XRayTracingFilter.java new file mode 100644 index 00000000..982d6914 --- /dev/null +++ b/java/src/main/java/com/amido/stacks/aws/tracing/XRayTracingFilter.java @@ -0,0 +1,46 @@ +package com.amido.stacks.aws.tracing; + +#if USE_AWS + +import com.amazonaws.xray.AWSXRay; +import com.amazonaws.xray.AWSXRayRecorderBuilder; +import com.amazonaws.xray.jakarta.servlet.AWSXRayServletFilter; +import com.amazonaws.xray.log4j.Log4JSegmentListener; +import com.amazonaws.xray.metrics.MetricsSegmentListener; +import com.amazonaws.xray.plugins.EC2Plugin; +import com.amazonaws.xray.plugins.EKSPlugin; +import jakarta.servlet.Filter; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ConditionalOnProperty(value = "aws.xray.enabled", havingValue = "true") +@Slf4j +public class XRayTracingFilter { + + @Value("${spring.application.name:undefined}") + public String appName; + + @Bean + public Filter xrayFilter() { + + log.info("Initialising AWS XRay Support..."); + + AWSXRayRecorderBuilder builder = + AWSXRayRecorderBuilder.standard() + .withPlugin(new EC2Plugin()) + .withPlugin(new EKSPlugin()) + .withSegmentListener(new MetricsSegmentListener()) + .withSegmentListener(new Log4JSegmentListener(appName)); + + AWSXRay.setGlobalRecorder(builder.build()); + + return new AWSXRayServletFilter(appName); + } +} +#else +public class XRayTracingFilter {} +#endif diff --git a/java/src/main/resources/templates/project-builder-config.json b/java/src/main/resources/templates/project-builder-config.json index 3fa9a6fa..306bbae5 100644 --- a/java/src/main/resources/templates/project-builder-config.json +++ b/java/src/main/resources/templates/project-builder-config.json @@ -19,6 +19,17 @@ "packages" : [ "com/amido/stacks/dynamodb" ] + }, + { + "id": "aws", + "packages" : [ + "com/amido/stacks/aws" + ], + "propertiesFile": "application-aws.yml" + }, + { + "id": "azure", + "propertiesFile": "application-azure.yml" } ], "excludedGroupIds": [ diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/domain/CategoryHelper.java b/java/src/test/java/com/amido/stacks/workloads/menu/domain/CategoryHelper.java index a2f0ef06..64c02315 100644 --- a/java/src/test/java/com/amido/stacks/workloads/menu/domain/CategoryHelper.java +++ b/java/src/test/java/com/amido/stacks/workloads/menu/domain/CategoryHelper.java @@ -4,7 +4,9 @@ import java.util.List; import java.util.UUID; -/** @author ArathyKrishna */ +/** + * @author ArathyKrishna + */ public class CategoryHelper { public static List createCategories(int count) { List categoryList = new ArrayList<>(); diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/domain/ItemHelper.java b/java/src/test/java/com/amido/stacks/workloads/menu/domain/ItemHelper.java index 8d965368..3543dd57 100644 --- a/java/src/test/java/com/amido/stacks/workloads/menu/domain/ItemHelper.java +++ b/java/src/test/java/com/amido/stacks/workloads/menu/domain/ItemHelper.java @@ -4,7 +4,9 @@ import java.util.List; import java.util.UUID; -/** @author ArathyKrishna */ +/** + * @author ArathyKrishna + */ public class ItemHelper { public static Item createItem(int counter) { diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/domain/MenuHelper.java b/java/src/test/java/com/amido/stacks/workloads/menu/domain/MenuHelper.java index beaf6179..c1a179bd 100644 --- a/java/src/test/java/com/amido/stacks/workloads/menu/domain/MenuHelper.java +++ b/java/src/test/java/com/amido/stacks/workloads/menu/domain/MenuHelper.java @@ -4,7 +4,9 @@ import java.util.List; import java.util.UUID; -/** @author ArathyKrishna */ +/** + * @author ArathyKrishna + */ public class MenuHelper { public static List createMenus(int count) { diff --git a/java/src/test/java/com/amido/stacks/workloads/util/TestHelper.java b/java/src/test/java/com/amido/stacks/workloads/util/TestHelper.java index 6ea067e3..5cf39bd4 100644 --- a/java/src/test/java/com/amido/stacks/workloads/util/TestHelper.java +++ b/java/src/test/java/com/amido/stacks/workloads/util/TestHelper.java @@ -3,7 +3,9 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -/** @author ArathyKrishna */ +/** + * @author ArathyKrishna + */ public class TestHelper { public static String getBaseURL(int port) { From 7fa99b569a980aaeb88a74b8eb1d5f2fc74138fc Mon Sep 17 00:00:00 2001 From: ShaunMathias Date: Tue, 17 Dec 2024 10:46:33 +0000 Subject: [PATCH 06/12] Using partial templates (#4) * initial update to use partial templates * POM templates for different profiles * pom updates to fix runtime issues in output project --------- Co-authored-by: Alastair Brown --- java/pom.xml | 133 +++++++++---- .../templates/aws/awsDependencies.mustache | 64 ++++++ .../aws/awsManagedDependencies.mustache | 25 +++ .../azure/azureDependencies.mustache | 35 ++++ .../templates/core/coreDependencies.mustache | 182 ++++++++++++++++++ .../core/coreManagedDependencies.mustache | 15 ++ .../templates/core/corePlugins.mustache | 167 ++++++++++++++++ .../cosmosdb/cosmosdbDependencies.mustache | 9 + .../dynamodb/dynamodbDependencies.mustache | 9 + .../src/main/resources/templates/pom.mustache | 74 +++++++ .../resources/templates/template.mustache | 60 ++++-- 11 files changed, 719 insertions(+), 54 deletions(-) create mode 100644 java/src/main/resources/templates/aws/awsDependencies.mustache create mode 100644 java/src/main/resources/templates/aws/awsManagedDependencies.mustache create mode 100644 java/src/main/resources/templates/azure/azureDependencies.mustache create mode 100644 java/src/main/resources/templates/core/coreDependencies.mustache create mode 100644 java/src/main/resources/templates/core/coreManagedDependencies.mustache create mode 100644 java/src/main/resources/templates/core/corePlugins.mustache create mode 100644 java/src/main/resources/templates/cosmosdb/cosmosdbDependencies.mustache create mode 100644 java/src/main/resources/templates/dynamodb/dynamodbDependencies.mustache create mode 100644 java/src/main/resources/templates/pom.mustache diff --git a/java/pom.xml b/java/pom.xml index 672ef22b..0f745657 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -37,22 +37,27 @@ 2.6.4 4.0.0 4.0.10 - 4.6.15 - 4.6.15 + 4.6.15 + 4.6.15 1.12.779 1.9.9.1 3.5.0 2022.0.4 3.5.24 - 3.4.0 + 3.4.0 11.1.0 5.11.3 - 5.6.0 + 5.2.5 2024.1.38 2.25 + 2.4.4 + + 1.12.579 + 2.14.0 + @@ -81,6 +86,28 @@ pom import + + io.awspring.cloud + spring-cloud-aws-dependencies + ${spring.cloud.starter.aws.secrets.manager.config.version} + pom + import + + + com.amazonaws + aws-java-sdk-bom + ${aws-java-sdk.version} + pom + import + + + + com.amazonaws + aws-xray-recorder-sdk-bom + ${aws-xray-recorder-sdk.version} + pom + import + @@ -158,6 +185,38 @@ ${jackson.version} + + com.azure.spring + azure-spring-boot + ${azure.springboot.version} + + + net.minidev + json-smart + + + + + + com.microsoft.azure + applicationinsights-spring-boot-starter + ${applicationinsights.version} + runtime + + + + com.microsoft.azure + applicationinsights-logging-logback + ${applicationinsights.version} + runtime + + + ch.qos.logback + logback-core + + + + net.minidev json-smart @@ -204,7 +263,7 @@ au.com.dius.pact consumer - ${au.com.dius.pact.consumer-version} + ${au.com.dius.pact.consumer.version} test @@ -233,7 +292,7 @@ org.springframework.data spring-data-commons - ${spring.data.commons} + ${spring.data.commons.version} @@ -315,7 +374,7 @@ au.com.dius.pact.provider maven - ${au.com.dius.pact.provider.maven-version} + ${au.com.dius.pact.provider.version} ${pact.broker.url} ${pact.broker.token} @@ -477,7 +536,7 @@ ${prop.output.dir} src/main/resources/templates/project-builder-config.json - src/main/resources/templates/template.mustache + src/main/resources/templates/ @@ -518,11 +577,13 @@ -AUSE_AWS= aws + 2.4.4 1.12.579 2.14.0 10.1.15 + @@ -589,32 +650,32 @@ - - - - io.awspring.cloud - spring-cloud-aws-dependencies - ${spring.cloud.starter.aws.secrets.manager.config.version} - pom - import - - - com.amazonaws - aws-java-sdk-bom - ${aws-java-sdk.version} - pom - import - - - - com.amazonaws - aws-xray-recorder-sdk-bom - ${aws-xray-recorder-sdk.version} - pom - import - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -663,12 +724,14 @@ -AUSE_COSMOSDB= cosmosdb + + 5.6.0 com.azure azure-spring-data-cosmos - ${azure-spring-cosmos.version} + ${azure-spring-data-cosmos.version} diff --git a/java/src/main/resources/templates/aws/awsDependencies.mustache b/java/src/main/resources/templates/aws/awsDependencies.mustache new file mode 100644 index 00000000..b8ab3a4d --- /dev/null +++ b/java/src/main/resources/templates/aws/awsDependencies.mustache @@ -0,0 +1,64 @@ + + + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat-embed.version} + + + + + + io.awspring.cloud + spring-cloud-starter-aws-secrets-manager-config + ${spring.cloud.starter.aws.secrets.manager.config.version} + + + + + + com.amazonaws + aws-java-sdk-core + ${aws-java-sdk.version} + + + + com.amazonaws + aws-java-sdk-dynamodb + ${aws-java-sdk.version} + + + + com.amazonaws + aws-java-sdk-s3 + ${aws-java-sdk.version} + + + + + com.amazonaws + aws-xray-recorder-sdk-spring + ${aws-xray-recorder-sdk.version} + + + com.amazonaws + aws-xray-recorder-sdk-metrics + ${aws-xray-recorder-sdk.version} + + + com.amazonaws + aws-xray-recorder-sdk-aws-sdk-instrumentor + ${aws-xray-recorder-sdk.version} + + + com.amazonaws + aws-xray-recorder-sdk-log4j + ${aws-xray-recorder-sdk.version} + + + com.amazonaws + aws-xray-recorder-sdk-apache-http + ${aws-xray-recorder-sdk.version} + + + \ No newline at end of file diff --git a/java/src/main/resources/templates/aws/awsManagedDependencies.mustache b/java/src/main/resources/templates/aws/awsManagedDependencies.mustache new file mode 100644 index 00000000..67265aae --- /dev/null +++ b/java/src/main/resources/templates/aws/awsManagedDependencies.mustache @@ -0,0 +1,25 @@ + + + + io.awspring.cloud + spring-cloud-aws-dependencies + ${spring.cloud.starter.aws.secrets.manager.config.version} + pom + import + + + com.amazonaws + aws-java-sdk-bom + ${aws-java-sdk.version} + pom + import + + + + com.amazonaws + aws-xray-recorder-sdk-bom + ${aws-xray-recorder-sdk.version} + pom + import + + diff --git a/java/src/main/resources/templates/azure/azureDependencies.mustache b/java/src/main/resources/templates/azure/azureDependencies.mustache new file mode 100644 index 00000000..94b99ae6 --- /dev/null +++ b/java/src/main/resources/templates/azure/azureDependencies.mustache @@ -0,0 +1,35 @@ + + + + com.azure.spring + azure-spring-boot + ${azure.springboot.version} + + + net.minidev + json-smart + + + + + + com.microsoft.azure + applicationinsights-spring-boot-starter + ${applicationinsights.version} + runtime + + + + com.microsoft.azure + applicationinsights-logging-logback + ${applicationinsights.version} + runtime + + + ch.qos.logback + logback-core + + + + + diff --git a/java/src/main/resources/templates/core/coreDependencies.mustache b/java/src/main/resources/templates/core/coreDependencies.mustache new file mode 100644 index 00000000..e4d485dd --- /dev/null +++ b/java/src/main/resources/templates/core/coreDependencies.mustache @@ -0,0 +1,182 @@ + + + com.amido.stacks.modules + stacks-core-api + ${stacks.core.api.version} + + + org.aspectj + aspectjweaver + + + + + + com.amido.stacks.modules + stacks-core-commons + ${stacks.core.commons.version} + + + + org.springframework.boot + spring-boot-properties-migrator + runtime + + + + org.springframework.cloud + spring-cloud-starter-bootstrap + + + + org.springframework.cloud + spring-cloud-starter-config + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.yaml + snakeyaml + + + + + + org.springframework.boot + spring-boot-starter-web + + + + com.fasterxml.jackson.core + jackson-core + + + + com.fasterxml.jackson.core + jackson-databind + + + + com.fasterxml.jackson.core + jackson-annotations + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson.version} + + + + com.azure.spring + azure-spring-boot + ${azure.springboot.version} + + + net.minidev + json-smart + + + + + + com.microsoft.azure + applicationinsights-spring-boot-starter + ${applicationinsights.version} + runtime + + + + com.microsoft.azure + applicationinsights-logging-logback + ${applicationinsights.version} + runtime + + + ch.qos.logback + logback-core + + + + + + net.minidev + json-smart + + + + com.beust + jcommander + + + + + com.auth0 + auth0-spring-security-api + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + junit + junit + + + com.vaadin.external.google + android-json + + + + + + au.com.dius + pact-jvm-provider-spring + ${au.com.dius.pact-jvm-provider-spring.version} + test + + + + au.com.dius.pact + consumer + ${au.com.dius.pact.consumer.version} + test + + + + org.pitest + pitest-parent + pom + + + + com.nimbusds + oauth2-oidc-sdk + runtime + + + + com.amazonaws + aws-java-sdk-s3 + ${aws-java-sdk-s3.version} + + + + jakarta.persistence + jakarta.persistence-api + + + + org.springframework.data + spring-data-commons + ${spring.data.commons.version} + diff --git a/java/src/main/resources/templates/core/coreManagedDependencies.mustache b/java/src/main/resources/templates/core/coreManagedDependencies.mustache new file mode 100644 index 00000000..02196c92 --- /dev/null +++ b/java/src/main/resources/templates/core/coreManagedDependencies.mustache @@ -0,0 +1,15 @@ + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.dependencies.version} + pom + import + + + org.junit + junit-bom + ${junit-jupiter.version} + pom + import + \ No newline at end of file diff --git a/java/src/main/resources/templates/core/corePlugins.mustache b/java/src/main/resources/templates/core/corePlugins.mustache new file mode 100644 index 00000000..dc6b3840 --- /dev/null +++ b/java/src/main/resources/templates/core/corePlugins.mustache @@ -0,0 +1,167 @@ + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + com.amido.stacks.workloads.Application + + + + + repackage + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + **/AuthControllerImpl* + **/ApplicationConfig* + + + + + + prepare-agent + + + + report + prepare-package + + report + + + + default-check + + check + + + + + BUNDLE + + + COMPLEXITY + COVEREDRATIO + 0.00 + + + + + + + + + + au.com.dius.pact.provider + maven + ${au.com.dius.pact.provider.version} + + ${pact.broker.url} + ${pact.broker.token} + + true + + + + ${pact.api.name} + ${pact.api.protocol} + ${pact.api.host} + ${pact.api.port} + + + + + + com.coveo + fmt-maven-plugin + ${fmt-maven-plugin.version} + + true + true + .*\.java + + false + false + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven-checkstyle-plugin.version} + + + + com.puppycrawl.tools + checkstyle + ${puppycrawl-tools-checkstyle.version} + + + + google_checks.xml + UTF-8 + true + true + false + + + + validate + validate + + + + + com.github.spotbugs + spotbugs-maven-plugin + ${spotbugs-maven-plugin.version} + + + + com.github.spotbugs + spotbugs + ${spotbugs.version} + + + + + org.pitest + pitest-maven + ${pitest.version} + + + org.pitest + pitest-junit5-plugin + 0.15 + + + + + pitest + verify + + mutationCoverage + + + + + 15 + target/pitHistory.txt + target/pitHistory.txt + false + + STRONGER + + + XML + HTML + + + \ No newline at end of file diff --git a/java/src/main/resources/templates/cosmosdb/cosmosdbDependencies.mustache b/java/src/main/resources/templates/cosmosdb/cosmosdbDependencies.mustache new file mode 100644 index 00000000..53f749cc --- /dev/null +++ b/java/src/main/resources/templates/cosmosdb/cosmosdbDependencies.mustache @@ -0,0 +1,9 @@ + + + + com.azure + azure-spring-data-cosmos + ${azure-spring-data-cosmos.version} + + + diff --git a/java/src/main/resources/templates/dynamodb/dynamodbDependencies.mustache b/java/src/main/resources/templates/dynamodb/dynamodbDependencies.mustache new file mode 100644 index 00000000..260b2c73 --- /dev/null +++ b/java/src/main/resources/templates/dynamodb/dynamodbDependencies.mustache @@ -0,0 +1,9 @@ + + + + io.github.boostchicken + spring-data-dynamodb + ${spring.data.dynamodb.version} + + + diff --git a/java/src/main/resources/templates/pom.mustache b/java/src/main/resources/templates/pom.mustache new file mode 100644 index 00000000..4b5bcc8d --- /dev/null +++ b/java/src/main/resources/templates/pom.mustache @@ -0,0 +1,74 @@ + + + 4.0.0 + + + com.amido.stacks.modules + stacks-modules-parent + 3.0.26-RELEASE + + + com.amido.stacks.workloads + stacks-api + 1.0.0 + + stacks-api + Demo project for Java + + + 1.7 + {{#versionProperties}} + {{{.}}} + {{/versionProperties}} + + + + + JavaMenuAPI + http + localhost + 9000 + + + + + {{> core/coreManagedDependencies}} + + {{#aws}} + {{> aws/awsManagedDependencies}} + {{/aws}} + + + + + + {{> core/coreDependencies}} + + {{#aws}} + {{> aws/awsDependencies}} + {{/aws}} + + {{#azure}} + {{> azure/azureDependencies}} + {{/azure}} + + {{#dynamodb}} + {{> dynamodb/dynamodbDependencies}} + {{/dynamodb}} + + {{#cosmosdb}} + {{> cosmosdb/cosmosdbDependencies}} + {{/cosmosdb}} + + + + + {{> core/corePlugins}} + + + + + + \ No newline at end of file diff --git a/java/src/main/resources/templates/template.mustache b/java/src/main/resources/templates/template.mustache index 9c2e1915..e5c61ad4 100644 --- a/java/src/main/resources/templates/template.mustache +++ b/java/src/main/resources/templates/template.mustache @@ -40,25 +40,47 @@ 9000 - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring.cloud.dependencies.version} - pom - import - - - org.junit - junit-bom - ${junit-jupiter.version} - pom - import - - - + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.dependencies.version} + pom + import + + + org.junit + junit-bom + ${junit-jupiter.version} + pom + import + + + io.awspring.cloud + spring-cloud-aws-dependencies + ${spring.cloud.starter.aws.secrets.manager.config.version} + pom + import + + + com.amazonaws + aws-java-sdk-bom + ${aws-java-sdk.version} + pom + import + + + + com.amazonaws + aws-xray-recorder-sdk-bom + ${aws-xray-recorder-sdk.version} + pom + import + + + From 180d0fd9861af27315d38292326a5170f7ee1c5c Mon Sep 17 00:00:00 2001 From: Alastair Brown Date: Wed, 18 Dec 2024 11:05:25 +0000 Subject: [PATCH 07/12] added common and api code (#5) --- java/pom.xml | 46 ++++++++++++- .../api/annotations/CreateAPIResponses.java | 52 +++++++++++++++ .../api/annotations/DeleteAPIResponses.java | 59 +++++++++++++++++ .../api/annotations/ReadAPIResponses.java | 30 +++++++++ .../api/annotations/SearchAPIResponses.java | 23 +++++++ .../api/annotations/UpdateAPIResponses.java | 66 +++++++++++++++++++ .../stacks/core/api/dto/ErrorResponse.java | 16 +++++ .../api/dto/request/GenerateTokenRequest.java | 30 +++++++++ .../dto/response/GenerateTokenResponse.java | 21 ++++++ .../dto/response/ResourceCreatedResponse.java | 16 +++++ .../dto/response/ResourceUpdatedResponse.java | 15 +++++ .../core/api/exception/ApiException.java | 23 +++++++ .../api/exception/ApiExceptionAdvice.java | 47 +++++++++++++ .../core/api/filter/CorrelationIdFilter.java | 47 +++++++++++++ .../CorrelationIdFilterConfiguration.java | 25 +++++++ .../amido/stacks/core/mapping/BaseMapper.java | 18 +++++ .../stacks/core/mapping/MapperUtils.java | 20 ++++++ .../core/operations/OperationContext.java | 31 +++++++++ .../core/repository/StacksPersistence.java | 9 +++ .../workloads/menu/mappers/MenuMapper.java | 1 + .../templates/project-builder-config.json | 3 + .../resources/templates/template.mustache | 4 ++ .../stacks/core/mapping/MapperUtilsTest.java | 48 ++++++++++++++ .../core/operations/OperationContextTest.java | 32 +++++++++ 24 files changed, 679 insertions(+), 3 deletions(-) create mode 100644 java/src/main/java/com/amido/stacks/core/api/annotations/CreateAPIResponses.java create mode 100644 java/src/main/java/com/amido/stacks/core/api/annotations/DeleteAPIResponses.java create mode 100644 java/src/main/java/com/amido/stacks/core/api/annotations/ReadAPIResponses.java create mode 100644 java/src/main/java/com/amido/stacks/core/api/annotations/SearchAPIResponses.java create mode 100644 java/src/main/java/com/amido/stacks/core/api/annotations/UpdateAPIResponses.java create mode 100644 java/src/main/java/com/amido/stacks/core/api/dto/ErrorResponse.java create mode 100644 java/src/main/java/com/amido/stacks/core/api/dto/request/GenerateTokenRequest.java create mode 100644 java/src/main/java/com/amido/stacks/core/api/dto/response/GenerateTokenResponse.java create mode 100644 java/src/main/java/com/amido/stacks/core/api/dto/response/ResourceCreatedResponse.java create mode 100644 java/src/main/java/com/amido/stacks/core/api/dto/response/ResourceUpdatedResponse.java create mode 100644 java/src/main/java/com/amido/stacks/core/api/exception/ApiException.java create mode 100644 java/src/main/java/com/amido/stacks/core/api/exception/ApiExceptionAdvice.java create mode 100644 java/src/main/java/com/amido/stacks/core/api/filter/CorrelationIdFilter.java create mode 100644 java/src/main/java/com/amido/stacks/core/api/filter/CorrelationIdFilterConfiguration.java create mode 100644 java/src/main/java/com/amido/stacks/core/mapping/BaseMapper.java create mode 100644 java/src/main/java/com/amido/stacks/core/mapping/MapperUtils.java create mode 100644 java/src/main/java/com/amido/stacks/core/operations/OperationContext.java create mode 100644 java/src/main/java/com/amido/stacks/core/repository/StacksPersistence.java create mode 100644 java/src/test/java/com/amido/stacks/core/mapping/MapperUtilsTest.java create mode 100644 java/src/test/java/com/amido/stacks/core/operations/OperationContextTest.java diff --git a/java/pom.xml b/java/pom.xml index 0f745657..2a80b559 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -5,9 +5,9 @@ 4.0.0 - com.amido.stacks.modules + com.ensono.stacks.modules stacks-modules-parent - 3.0.26-RELEASE + 3.0.52 com.amido.stacks.workloads @@ -44,6 +44,8 @@ 3.5.0 2022.0.4 3.5.24 + + 2.2.0 3.4.0 11.1.0 5.11.3 @@ -113,7 +115,26 @@ + + + org.springframework.boot + spring-boot-starter-web + + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + ${springdoc.openapi.version} + + + + com.auth0 + auth0-spring-security-api + + + + + + + + + + org.springframework + spring-context + ${spring-context.version} + org.springframework.boot @@ -504,6 +535,16 @@ manifold-preprocessor ${manifold.version} + + org.projectlombok + lombok-mapstruct-binding + ${org.mapstruct.binding.version} + + + org.mapstruct + mapstruct-processor + ${org.mapstruct.version} + org.projectlombok lombok @@ -513,7 +554,6 @@ - com.ensono.stacks stacks-maven-plugin diff --git a/java/src/main/java/com/amido/stacks/core/api/annotations/CreateAPIResponses.java b/java/src/main/java/com/amido/stacks/core/api/annotations/CreateAPIResponses.java new file mode 100644 index 00000000..cd33af1e --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/api/annotations/CreateAPIResponses.java @@ -0,0 +1,52 @@ +package com.amido.stacks.core.api.annotations; + +import com.amido.stacks.core.api.dto.ErrorResponse; +import com.amido.stacks.core.api.dto.response.ResourceCreatedResponse; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ElementType.METHOD, ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +@ApiResponse( + responseCode = "201", + description = "Resource created", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = ResourceCreatedResponse.class))) +@ApiResponse( + responseCode = "400", + description = "Bad Request", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))) +@ApiResponse( + responseCode = "401", + description = "Unauthorized, Access token is missing or invalid", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))) +@ApiResponse( + responseCode = "403", + description = "Forbidden, the user does not have permission to execute this operation", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))) +@ApiResponse( + responseCode = "409", + description = "Conflict, an item already exists", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))) +@SecurityRequirement(name = "bearerAuth") +public @interface CreateAPIResponses {} \ No newline at end of file diff --git a/java/src/main/java/com/amido/stacks/core/api/annotations/DeleteAPIResponses.java b/java/src/main/java/com/amido/stacks/core/api/annotations/DeleteAPIResponses.java new file mode 100644 index 00000000..34e0450d --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/api/annotations/DeleteAPIResponses.java @@ -0,0 +1,59 @@ +package com.amido.stacks.core.api.annotations; + +import com.amido.stacks.core.api.dto.ErrorResponse; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ElementType.METHOD, ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +@ApiResponse( + responseCode = "200", + description = "Success", + content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) +@ApiResponse( + responseCode = "204", + description = "No Content", + content = @Content(schema = @Schema(hidden = true))) +@ApiResponse( + responseCode = "400", + description = "Bad Request", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))) +@ApiResponse( + responseCode = "401", + description = "Unauthorized, Access token is missing or invalid", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))) +@ApiResponse( + responseCode = "403", + description = "Forbidden, the user does not have permission to execute this operation", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))) +@ApiResponse( + responseCode = "404", + description = "Resource not found", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))) +@ApiResponse( + responseCode = "409", + description = "Conflict, an item already exists", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))) +@SecurityRequirement(name = "bearerAuth") +public @interface DeleteAPIResponses {} \ No newline at end of file diff --git a/java/src/main/java/com/amido/stacks/core/api/annotations/ReadAPIResponses.java b/java/src/main/java/com/amido/stacks/core/api/annotations/ReadAPIResponses.java new file mode 100644 index 00000000..c365f63c --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/api/annotations/ReadAPIResponses.java @@ -0,0 +1,30 @@ +package com.amido.stacks.core.api.annotations; + +import com.amido.stacks.core.api.dto.ErrorResponse; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ElementType.METHOD, ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +@ApiResponse( + responseCode = "404", + description = "Resource not found", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))) +@ApiResponse( + responseCode = "400", + description = "Bad Request", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))) +@SecurityRequirement(name = "bearerAuth") +public @interface ReadAPIResponses {} \ No newline at end of file diff --git a/java/src/main/java/com/amido/stacks/core/api/annotations/SearchAPIResponses.java b/java/src/main/java/com/amido/stacks/core/api/annotations/SearchAPIResponses.java new file mode 100644 index 00000000..ee32cfa0 --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/api/annotations/SearchAPIResponses.java @@ -0,0 +1,23 @@ +package com.amido.stacks.core.api.annotations; + +import com.amido.stacks.core.api.dto.ErrorResponse; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ElementType.METHOD, ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +@ApiResponse( + responseCode = "400", + description = "Bad Request", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))) +@SecurityRequirement(name = "bearerAuth") +public @interface SearchAPIResponses {} \ No newline at end of file diff --git a/java/src/main/java/com/amido/stacks/core/api/annotations/UpdateAPIResponses.java b/java/src/main/java/com/amido/stacks/core/api/annotations/UpdateAPIResponses.java new file mode 100644 index 00000000..14cd6dc9 --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/api/annotations/UpdateAPIResponses.java @@ -0,0 +1,66 @@ +package com.amido.stacks.core.api.annotations; + +import com.amido.stacks.core.api.dto.ErrorResponse; +import com.amido.stacks.core.api.dto.response.ResourceUpdatedResponse; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ElementType.METHOD, ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +@ApiResponse( + responseCode = "200", + description = "Success", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = ResourceUpdatedResponse.class))) +@ApiResponse( + responseCode = "204", + description = "No Content", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))) +@ApiResponse( + responseCode = "400", + description = "Bad Request", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))) +@ApiResponse( + responseCode = "401", + description = "Unauthorized, Access token is missing or invalid", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))) +@ApiResponse( + responseCode = "403", + description = "Forbidden, the user does not have permission to execute this operation", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))) +@ApiResponse( + responseCode = "404", + description = "Resource not found", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))) +@ApiResponse( + responseCode = "409", + description = "Conflict, an item already exists", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = ErrorResponse.class))) +@SecurityRequirement(name = "bearerAuth") +public @interface UpdateAPIResponses {} \ No newline at end of file diff --git a/java/src/main/java/com/amido/stacks/core/api/dto/ErrorResponse.java b/java/src/main/java/com/amido/stacks/core/api/dto/ErrorResponse.java new file mode 100644 index 00000000..647ddb02 --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/api/dto/ErrorResponse.java @@ -0,0 +1,16 @@ +package com.amido.stacks.core.api.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ErrorResponse { + + int errorCode; + int operationCode; + String correlationId; + String description; +} \ No newline at end of file diff --git a/java/src/main/java/com/amido/stacks/core/api/dto/request/GenerateTokenRequest.java b/java/src/main/java/com/amido/stacks/core/api/dto/request/GenerateTokenRequest.java new file mode 100644 index 00000000..2ccb1bda --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/api/dto/request/GenerateTokenRequest.java @@ -0,0 +1,30 @@ +package com.amido.stacks.core.api.dto.request; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class GenerateTokenRequest { + + @JsonProperty("client_id") + @NotBlank + private String client_id = null; + + @JsonProperty("client_secret") + @NotBlank + private String client_secret = null; + + @JsonProperty("audience") + @NotNull + private String audience = null; + + @JsonProperty("grant_type") + @NotNull + private String grant_type = null; +} \ No newline at end of file diff --git a/java/src/main/java/com/amido/stacks/core/api/dto/response/GenerateTokenResponse.java b/java/src/main/java/com/amido/stacks/core/api/dto/response/GenerateTokenResponse.java new file mode 100644 index 00000000..d9bb11cf --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/api/dto/response/GenerateTokenResponse.java @@ -0,0 +1,21 @@ +package com.amido.stacks.core.api.dto.response; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class GenerateTokenResponse { + + @JsonProperty("access_token") + private String access_token = null; + + @JsonProperty("expires_in") + private String expires_in = null; + + @JsonProperty("token_type") + private String token_type = null; +} diff --git a/java/src/main/java/com/amido/stacks/core/api/dto/response/ResourceCreatedResponse.java b/java/src/main/java/com/amido/stacks/core/api/dto/response/ResourceCreatedResponse.java new file mode 100644 index 00000000..60eaf444 --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/api/dto/response/ResourceCreatedResponse.java @@ -0,0 +1,16 @@ +package com.amido.stacks.core.api.dto.response; + +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.UUID; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ResourceCreatedResponse { + + @JsonProperty("id") + private UUID id = null; +} \ No newline at end of file diff --git a/java/src/main/java/com/amido/stacks/core/api/dto/response/ResourceUpdatedResponse.java b/java/src/main/java/com/amido/stacks/core/api/dto/response/ResourceUpdatedResponse.java new file mode 100644 index 00000000..8cb588fc --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/api/dto/response/ResourceUpdatedResponse.java @@ -0,0 +1,15 @@ +package com.amido.stacks.core.api.dto.response; + +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.UUID; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ResourceUpdatedResponse { + @JsonProperty("id") + private UUID id = null; +} \ No newline at end of file diff --git a/java/src/main/java/com/amido/stacks/core/api/exception/ApiException.java b/java/src/main/java/com/amido/stacks/core/api/exception/ApiException.java new file mode 100644 index 00000000..9588f061 --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/api/exception/ApiException.java @@ -0,0 +1,23 @@ +package com.amido.stacks.core.api.exception; + +public abstract class ApiException extends RuntimeException { + + final int operationCode; + final String correlationId; + + protected ApiException(String message, int operationCode, String correlationId) { + super(message); + this.operationCode = operationCode; + this.correlationId = correlationId; + } + + public int getOperationCode() { + return operationCode; + } + + public String getCorrelationId() { + return correlationId; + } + + public abstract int getExceptionCode(); +} \ No newline at end of file diff --git a/java/src/main/java/com/amido/stacks/core/api/exception/ApiExceptionAdvice.java b/java/src/main/java/com/amido/stacks/core/api/exception/ApiExceptionAdvice.java new file mode 100644 index 00000000..2bdaa4bf --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/api/exception/ApiExceptionAdvice.java @@ -0,0 +1,47 @@ +package com.amido.stacks.core.api.exception; + +import static org.springframework.http.HttpStatus.BAD_REQUEST; +import static org.springframework.web.context.request.RequestAttributes.SCOPE_REQUEST; + +import com.amido.stacks.core.api.dto.ErrorResponse; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatusCode; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.FieldError; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.context.request.WebRequest; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; + +@RestControllerAdvice +public class ApiExceptionAdvice extends ResponseEntityExceptionHandler { + + @Override + protected ResponseEntity handleMethodArgumentNotValid( + MethodArgumentNotValidException ex, + HttpHeaders headers, + HttpStatusCode status, + WebRequest request) { + + var validationIssues = processFieldErrors(ex.getBindingResult().getFieldErrors()); + ErrorResponse response = + new ErrorResponse( + BAD_REQUEST.value(), + 0, + Objects.toString(request.getAttribute("CorrelationId", SCOPE_REQUEST)), + "Invalid Request: " + validationIssues); + return new ResponseEntity<>(response, BAD_REQUEST); + } + + private Map processFieldErrors(List fieldErrors) { + Map errors = new HashMap<>(); + for (FieldError fieldError : fieldErrors) { + errors.put(fieldError.getField(), fieldError.getDefaultMessage()); + } + return errors; + } +} \ No newline at end of file diff --git a/java/src/main/java/com/amido/stacks/core/api/filter/CorrelationIdFilter.java b/java/src/main/java/com/amido/stacks/core/api/filter/CorrelationIdFilter.java new file mode 100644 index 00000000..3085d4b8 --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/api/filter/CorrelationIdFilter.java @@ -0,0 +1,47 @@ +package com.amido.stacks.core.api.filter; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.UUID; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.MDC; +import org.springframework.core.annotation.Order; +import org.springframework.web.filter.OncePerRequestFilter; + +@Order(1) +public class CorrelationIdFilter extends OncePerRequestFilter { + + private final String correlationIdHeader; + private final String mdcTokenKey; + + public CorrelationIdFilter(String correlationIdHeader, String mdcTokenKey) { + this.correlationIdHeader = correlationIdHeader; + this.mdcTokenKey = mdcTokenKey; + } + + @Override + protected void doFilterInternal( + HttpServletRequest httpServletRequest, + HttpServletResponse httpServletResponse, + FilterChain filterChain) + throws ServletException, IOException { + + try { + final String correlationId = UUID.randomUUID().toString(); + MDC.put(mdcTokenKey, correlationId); + + if (!StringUtils.isEmpty(correlationIdHeader)) { + httpServletResponse.addHeader(correlationIdHeader, correlationId); + } + + httpServletRequest.setAttribute(mdcTokenKey, correlationId); + filterChain.doFilter(httpServletRequest, httpServletResponse); + + } finally { + MDC.remove(mdcTokenKey); + } + } +} diff --git a/java/src/main/java/com/amido/stacks/core/api/filter/CorrelationIdFilterConfiguration.java b/java/src/main/java/com/amido/stacks/core/api/filter/CorrelationIdFilterConfiguration.java new file mode 100644 index 00000000..8dcb9a6e --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/api/filter/CorrelationIdFilterConfiguration.java @@ -0,0 +1,25 @@ +package com.amido.stacks.core.api.filter; + +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class CorrelationIdFilterConfiguration { + + public static final String DEFAULT_CORRELATION_ID_HEADER = "x-correlation-id"; + public static final String DEFAULT_MDC_UUID_TOKEN_KEY = "CorrelationId"; + + @Bean + public FilterRegistrationBean servletRegistrationBean() { + + final FilterRegistrationBean registrationBean = + new FilterRegistrationBean<>(); + + final CorrelationIdFilter logFilter = + new CorrelationIdFilter(DEFAULT_CORRELATION_ID_HEADER, DEFAULT_MDC_UUID_TOKEN_KEY); + + registrationBean.setFilter(logFilter); + return registrationBean; + } +} \ No newline at end of file diff --git a/java/src/main/java/com/amido/stacks/core/mapping/BaseMapper.java b/java/src/main/java/com/amido/stacks/core/mapping/BaseMapper.java new file mode 100644 index 00000000..c12e1439 --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/mapping/BaseMapper.java @@ -0,0 +1,18 @@ +package com.amido.stacks.core.mapping; + +import java.util.List; +import org.mapstruct.MappingTarget; + +public interface BaseMapper { + D toDto(E entity); + + E fromDto(D dto); + + void updateFromDto(D dto, @MappingTarget E entity); + + void updateFromEntity(E entity, @MappingTarget D dto); + + List toDtoList(List list); + + List fromDtoList(List list); +} \ No newline at end of file diff --git a/java/src/main/java/com/amido/stacks/core/mapping/MapperUtils.java b/java/src/main/java/com/amido/stacks/core/mapping/MapperUtils.java new file mode 100644 index 00000000..fd89aa7e --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/mapping/MapperUtils.java @@ -0,0 +1,20 @@ +package com.amido.stacks.core.mapping; + +import static java.util.UUID.fromString; + +import java.util.UUID; + +public class MapperUtils { + + private MapperUtils() { + // Utility class + } + + public static UUID map(String value) { + return (value != null && !value.trim().isEmpty()) ? fromString(value) : null; + } + + public static String map(UUID uuid) { + return uuid != null ? uuid.toString() : null; + } +} diff --git a/java/src/main/java/com/amido/stacks/core/operations/OperationContext.java b/java/src/main/java/com/amido/stacks/core/operations/OperationContext.java new file mode 100644 index 00000000..f977ba10 --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/operations/OperationContext.java @@ -0,0 +1,31 @@ +package com.amido.stacks.core.operations; + +public abstract class OperationContext { + + private String correlationId; + + protected OperationContext(final String correlationId) { + this.correlationId = correlationId; + } + + public abstract int getOperationCode(); + + /** No arg constructor. */ + protected OperationContext() { + // NO-OP + } + + public String getCorrelationId() { + return correlationId; + } + + public void setCorrelationId(final String correlationId) { + this.correlationId = correlationId; + } + + @Override + public String toString() { + return String.format( + "OperationContext{operationCode=%d, correlationId=%s}", getOperationCode(), correlationId); + } +} diff --git a/java/src/main/java/com/amido/stacks/core/repository/StacksPersistence.java b/java/src/main/java/com/amido/stacks/core/repository/StacksPersistence.java new file mode 100644 index 00000000..8cc743e9 --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/repository/StacksPersistence.java @@ -0,0 +1,9 @@ +package com.amido.stacks.core.repository; + +import org.springframework.stereotype.Repository; + +@Repository +@SuppressWarnings( + "java:S2326") // "T is not used in the interface". This Interface is used by other modules in +// other stacks repos. +public interface StacksPersistence {} diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/mappers/MenuMapper.java b/java/src/main/java/com/amido/stacks/workloads/menu/mappers/MenuMapper.java index 001a331c..aee0fd13 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/mappers/MenuMapper.java +++ b/java/src/main/java/com/amido/stacks/workloads/menu/mappers/MenuMapper.java @@ -1,6 +1,7 @@ package com.amido.stacks.workloads.menu.mappers; import com.amido.stacks.core.mapping.BaseMapper; + import com.amido.stacks.core.mapping.MapperUtils; import com.amido.stacks.workloads.menu.api.v1.dto.response.MenuDTO; import com.amido.stacks.workloads.menu.domain.Menu; diff --git a/java/src/main/resources/templates/project-builder-config.json b/java/src/main/resources/templates/project-builder-config.json index 306bbae5..bdfcf90c 100644 --- a/java/src/main/resources/templates/project-builder-config.json +++ b/java/src/main/resources/templates/project-builder-config.json @@ -1,5 +1,6 @@ { "coreIncludes": [ + "com/amido/stacks/core", "com/amido/stacks/workloads", "com/amido/stacks/workloads/menu", "com/amido/stacks/workloads/menu/api", @@ -33,6 +34,8 @@ } ], "excludedGroupIds": [ + "com.amido.stacks.modules", + "com.ensono.stacks.modules", "systems.manifold", "com.github.spullara.mustache.java", "com.spotify.fmt" diff --git a/java/src/main/resources/templates/template.mustache b/java/src/main/resources/templates/template.mustache index e5c61ad4..8629c691 100644 --- a/java/src/main/resources/templates/template.mustache +++ b/java/src/main/resources/templates/template.mustache @@ -26,6 +26,10 @@ 2022.0.4 11.1.0 5.11.3 + 4.0.10 + 4.6.15 + 4.6.15 + 1.6.7 {{#versionProperties}} {{{.}}} diff --git a/java/src/test/java/com/amido/stacks/core/mapping/MapperUtilsTest.java b/java/src/test/java/com/amido/stacks/core/mapping/MapperUtilsTest.java new file mode 100644 index 00000000..9cf6d9ab --- /dev/null +++ b/java/src/test/java/com/amido/stacks/core/mapping/MapperUtilsTest.java @@ -0,0 +1,48 @@ +package com.amido.stacks.core.mapping; + +import static com.amido.stacks.core.mapping.MapperUtils.map; +import static java.util.UUID.randomUUID; + +import java.util.UUID; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; + +@Tag("Unit") +public class MapperUtilsTest { + + @Test + public void shouldConvertBetweenUuidAndString() { + + UUID uuid = randomUUID(); + Assertions.assertEquals(uuid.toString(), map(uuid)); + } + + @Test + public void shouldReturnNullWhenUuidInputIsNull() { + + UUID uuid = null; + Assertions.assertEquals(null, map(uuid)); + } + + @Test + public void shouldConvertBetweenStringAndUuid() { + + UUID uuid = randomUUID(); + Assertions.assertEquals(uuid, map(uuid.toString())); + } + + @Test + public void shouldReturnNullWhenStringInputIsNull() { + + String uuid = null; + Assertions.assertEquals(null, map(uuid)); + } + + @Test + public void shouldReturnNullWhenStringInputIsEmpty() { + + String uuid = " "; + Assertions.assertEquals(null, map(uuid)); + } +} diff --git a/java/src/test/java/com/amido/stacks/core/operations/OperationContextTest.java b/java/src/test/java/com/amido/stacks/core/operations/OperationContextTest.java new file mode 100644 index 00000000..d5b949bb --- /dev/null +++ b/java/src/test/java/com/amido/stacks/core/operations/OperationContextTest.java @@ -0,0 +1,32 @@ +package com.amido.stacks.core.operations; + +import static org.assertj.core.api.BDDAssertions.then; +import static org.mockito.Mockito.when; + +import java.util.UUID; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +@Tag("Component") +public class OperationContextTest { + + private static final int OPERATION_CODE = 100; + + @Test + void shouldReturnRightOperationCodeAndCorrelationId() { + + var uuid = UUID.randomUUID(); + + OperationContext operationContext = + Mockito.mock( + OperationContext.class, + Mockito.withSettings() + .useConstructor(uuid.toString()) + .defaultAnswer(Mockito.CALLS_REAL_METHODS)); + when(operationContext.getOperationCode()).thenReturn(OPERATION_CODE); + + then(operationContext.getOperationCode()).isEqualTo(OPERATION_CODE); + then(operationContext.getCorrelationId()).isEqualTo(uuid.toString()); + } +} From c6cb603ded6333b4d68f0ac4e060d0607e0fe15e Mon Sep 17 00:00:00 2001 From: Alastair Brown Date: Wed, 18 Dec 2024 12:41:19 +0000 Subject: [PATCH 08/12] update to config to fix tests (#6) --- java/pom.xml | 12 ++++++- .../templates/project-builder-config.json | 32 +++++++++++-------- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index 2a80b559..541dbd35 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -18,7 +18,7 @@ Demo project for Java - 1.0.5.11-RELEASE + 1.0.5.11-RELEASE 2.0.7 @@ -530,6 +530,11 @@ + + org.mapstruct + mapstruct-processor + ${org.mapstruct.version} + systems.manifold manifold-preprocessor @@ -550,6 +555,11 @@ lombok ${lombok.version} + + org.projectlombok + lombok-mapstruct-binding + 0.2.0 + diff --git a/java/src/main/resources/templates/project-builder-config.json b/java/src/main/resources/templates/project-builder-config.json index bdfcf90c..a0e1c0f8 100644 --- a/java/src/main/resources/templates/project-builder-config.json +++ b/java/src/main/resources/templates/project-builder-config.json @@ -1,30 +1,36 @@ { "coreIncludes": [ - "com/amido/stacks/core", - "com/amido/stacks/workloads", - "com/amido/stacks/workloads/menu", - "com/amido/stacks/workloads/menu/api", - "com/amido/stacks/workloads/menu/domain", - "com/amido/stacks/workloads/menu/mappers", - "com/amido/stacks/workloads/menu/service" + "**/com/amido/stacks/core/**/*.java" + "**/com/amido/stacks/workloads/*.java", + "**/com/amido/stacks/workloads/menu/*.java", + "**/com/amido/stacks/workloads/menu/api/**/*.java", + "**/com/amido/stacks/workloads/menu/domain/*.java", + "**/com/amido/stacks/workloads/menu/mappers/*.java", + "**/com/amido/stacks/workloads/menu/service/*/*.java" + ], + "coreTestIncludes" : [ + "**/com/amido/stacks/workloads/actuator/ActuatorTest.java", + "**/com/amido/stacks/workloads/menu/**/*Test.java", + "**/com/amido/stacks/workloads/util/TestHelper.java", + "**/com/amido/stacks/workloads/menu/domain/*Helper.java" ], "profileFilters": [ { "id": "cosmosdb", - "packages" : [ - "com/amido/stacks/cosmosdb" + "includes" : [ + "**/com/amido/stacks/cosmosdb/**/*.java" ] }, { "id": "dynamodb", - "packages" : [ - "com/amido/stacks/dynamodb" + "includes" : [ + "**/com/amido/stacks/dynamodb/**/*.java" ] }, { "id": "aws", - "packages" : [ - "com/amido/stacks/aws" + "includes" : [ + "**/com/amido/stacks/aws/**/*.java" ], "propertiesFile": "application-aws.yml" }, From d04e462f72397c74d7357946f9ca6792619676d9 Mon Sep 17 00:00:00 2001 From: Alastair Brown Date: Wed, 18 Dec 2024 14:39:45 +0000 Subject: [PATCH 09/12] config and pom fix --- java/pom.xml | 7 +----- .../templates/core/coreDependencies.mustache | 22 +++++-------------- .../templates/project-builder-config.json | 2 +- 3 files changed, 8 insertions(+), 23 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index 541dbd35..fe9e9c13 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -18,8 +18,6 @@ Demo project for Java - 1.0.5.11-RELEASE - 2.0.7 @@ -36,6 +34,7 @@ 2.6.4 4.0.0 + 4.0.10 4.6.15 4.6.15 @@ -154,13 +153,9 @@ --> - - - org.springframework spring-context - ${spring-context.version} diff --git a/java/src/main/resources/templates/core/coreDependencies.mustache b/java/src/main/resources/templates/core/coreDependencies.mustache index e4d485dd..0b5085d4 100644 --- a/java/src/main/resources/templates/core/coreDependencies.mustache +++ b/java/src/main/resources/templates/core/coreDependencies.mustache @@ -1,21 +1,5 @@ - - com.amido.stacks.modules - stacks-core-api - ${stacks.core.api.version} - - - org.aspectj - aspectjweaver - - - - - com.amido.stacks.modules - stacks-core-commons - ${stacks.core.commons.version} - org.springframework.boot @@ -49,6 +33,12 @@ spring-boot-starter-web + + org.springdoc + springdoc-openapi-starter-webmvc-ui + ${springdoc.openapi.version} + + com.fasterxml.jackson.core jackson-core diff --git a/java/src/main/resources/templates/project-builder-config.json b/java/src/main/resources/templates/project-builder-config.json index a0e1c0f8..5e47362a 100644 --- a/java/src/main/resources/templates/project-builder-config.json +++ b/java/src/main/resources/templates/project-builder-config.json @@ -1,6 +1,6 @@ { "coreIncludes": [ - "**/com/amido/stacks/core/**/*.java" + "**/com/amido/stacks/core/**/*.java", "**/com/amido/stacks/workloads/*.java", "**/com/amido/stacks/workloads/menu/*.java", "**/com/amido/stacks/workloads/menu/api/**/*.java", From f52e2f4c346c1d74215a0619f584cbbd24b6cf45 Mon Sep 17 00:00:00 2001 From: ShaunMathias Date: Thu, 19 Dec 2024 11:54:09 +0000 Subject: [PATCH 10/12] tidied up pom and mustache of duplicates (#7) --- java/pom.xml | 65 +-- .../templates/aws/awsDependencies.mustache | 13 +- .../aws/awsManagedDependencies.mustache | 45 +- .../azure/azureDependencies.mustache | 35 -- .../templates/core/coreDependencies.mustache | 6 +- .../core/coreManagedDependencies.mustache | 1 + .../templates/core/corePlugins.mustache | 1 + .../cosmosdb/cosmosdbDependencies.mustache | 7 +- .../dynamodb/dynamodbDependencies.mustache | 7 +- .../src/main/resources/templates/pom.mustache | 21 +- .../resources/templates/template.mustache | 397 ------------------ 11 files changed, 45 insertions(+), 553 deletions(-) delete mode 100644 java/src/main/resources/templates/azure/azureDependencies.mustache delete mode 100644 java/src/main/resources/templates/template.mustache diff --git a/java/pom.xml b/java/pom.xml index fe9e9c13..efe0eaec 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -113,50 +113,17 @@ - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - ${springdoc.openapi.version} - - - - com.auth0 - auth0-spring-security-api - - - - - - com.amido.stacks.modules - stacks-core-commons - ${stacks.core.commons.version} + org.springframework + spring-context ---> - - - org.springframework - spring-context - org.springframework.boot @@ -741,26 +708,6 @@ - - - com.microsoft.azure - applicationinsights-spring-boot-starter - ${applicationinsights.version} - runtime - - - - com.microsoft.azure - applicationinsights-logging-logback - ${applicationinsights.version} - runtime - - - ch.qos.logback - logback-core - - - diff --git a/java/src/main/resources/templates/aws/awsDependencies.mustache b/java/src/main/resources/templates/aws/awsDependencies.mustache index b8ab3a4d..2f132d44 100644 --- a/java/src/main/resources/templates/aws/awsDependencies.mustache +++ b/java/src/main/resources/templates/aws/awsDependencies.mustache @@ -1,5 +1,4 @@ - - + org.apache.tomcat.embed tomcat-embed-core @@ -7,13 +6,11 @@ - io.awspring.cloud spring-cloud-starter-aws-secrets-manager-config ${spring.cloud.starter.aws.secrets.manager.config.version} - @@ -40,25 +37,27 @@ aws-xray-recorder-sdk-spring ${aws-xray-recorder-sdk.version} + com.amazonaws aws-xray-recorder-sdk-metrics ${aws-xray-recorder-sdk.version} + com.amazonaws aws-xray-recorder-sdk-aws-sdk-instrumentor ${aws-xray-recorder-sdk.version} + com.amazonaws aws-xray-recorder-sdk-log4j ${aws-xray-recorder-sdk.version} + com.amazonaws aws-xray-recorder-sdk-apache-http ${aws-xray-recorder-sdk.version} - - - \ No newline at end of file + \ No newline at end of file diff --git a/java/src/main/resources/templates/aws/awsManagedDependencies.mustache b/java/src/main/resources/templates/aws/awsManagedDependencies.mustache index 67265aae..960b4aa1 100644 --- a/java/src/main/resources/templates/aws/awsManagedDependencies.mustache +++ b/java/src/main/resources/templates/aws/awsManagedDependencies.mustache @@ -1,25 +1,22 @@ - - - io.awspring.cloud - spring-cloud-aws-dependencies - ${spring.cloud.starter.aws.secrets.manager.config.version} - pom - import - - - com.amazonaws - aws-java-sdk-bom - ${aws-java-sdk.version} - pom - import - - - - com.amazonaws - aws-xray-recorder-sdk-bom - ${aws-xray-recorder-sdk.version} - pom - import - - + + io.awspring.cloud + spring-cloud-aws-dependencies + ${spring.cloud.starter.aws.secrets.manager.config.version} + pom + import + + + com.amazonaws + aws-java-sdk-bom + ${aws-java-sdk.version} + pom + import + + + com.amazonaws + aws-xray-recorder-sdk-bom + ${aws-xray-recorder-sdk.version} + pom + import + \ No newline at end of file diff --git a/java/src/main/resources/templates/azure/azureDependencies.mustache b/java/src/main/resources/templates/azure/azureDependencies.mustache deleted file mode 100644 index 94b99ae6..00000000 --- a/java/src/main/resources/templates/azure/azureDependencies.mustache +++ /dev/null @@ -1,35 +0,0 @@ - - - - com.azure.spring - azure-spring-boot - ${azure.springboot.version} - - - net.minidev - json-smart - - - - - - com.microsoft.azure - applicationinsights-spring-boot-starter - ${applicationinsights.version} - runtime - - - - com.microsoft.azure - applicationinsights-logging-logback - ${applicationinsights.version} - runtime - - - ch.qos.logback - logback-core - - - - - diff --git a/java/src/main/resources/templates/core/coreDependencies.mustache b/java/src/main/resources/templates/core/coreDependencies.mustache index 0b5085d4..b971d12e 100644 --- a/java/src/main/resources/templates/core/coreDependencies.mustache +++ b/java/src/main/resources/templates/core/coreDependencies.mustache @@ -1,6 +1,4 @@ - - - + org.springframework.boot spring-boot-properties-migrator @@ -169,4 +167,4 @@ org.springframework.data spring-data-commons ${spring.data.commons.version} - + \ No newline at end of file diff --git a/java/src/main/resources/templates/core/coreManagedDependencies.mustache b/java/src/main/resources/templates/core/coreManagedDependencies.mustache index 02196c92..ab038276 100644 --- a/java/src/main/resources/templates/core/coreManagedDependencies.mustache +++ b/java/src/main/resources/templates/core/coreManagedDependencies.mustache @@ -1,3 +1,4 @@ + org.springframework.cloud diff --git a/java/src/main/resources/templates/core/corePlugins.mustache b/java/src/main/resources/templates/core/corePlugins.mustache index dc6b3840..9dab741b 100644 --- a/java/src/main/resources/templates/core/corePlugins.mustache +++ b/java/src/main/resources/templates/core/corePlugins.mustache @@ -1,3 +1,4 @@ + org.springframework.boot spring-boot-maven-plugin diff --git a/java/src/main/resources/templates/cosmosdb/cosmosdbDependencies.mustache b/java/src/main/resources/templates/cosmosdb/cosmosdbDependencies.mustache index 53f749cc..496387b8 100644 --- a/java/src/main/resources/templates/cosmosdb/cosmosdbDependencies.mustache +++ b/java/src/main/resources/templates/cosmosdb/cosmosdbDependencies.mustache @@ -1,9 +1,6 @@ - - + com.azure azure-spring-data-cosmos ${azure-spring-data-cosmos.version} - - - + \ No newline at end of file diff --git a/java/src/main/resources/templates/dynamodb/dynamodbDependencies.mustache b/java/src/main/resources/templates/dynamodb/dynamodbDependencies.mustache index 260b2c73..dc61c524 100644 --- a/java/src/main/resources/templates/dynamodb/dynamodbDependencies.mustache +++ b/java/src/main/resources/templates/dynamodb/dynamodbDependencies.mustache @@ -1,9 +1,6 @@ - - + io.github.boostchicken spring-data-dynamodb ${spring.data.dynamodb.version} - - - + \ No newline at end of file diff --git a/java/src/main/resources/templates/pom.mustache b/java/src/main/resources/templates/pom.mustache index 4b5bcc8d..585935d5 100644 --- a/java/src/main/resources/templates/pom.mustache +++ b/java/src/main/resources/templates/pom.mustache @@ -22,7 +22,6 @@ {{#versionProperties}} {{{.}}} {{/versionProperties}} - @@ -36,9 +35,7 @@ {{> core/coreManagedDependencies}} - {{#aws}} - {{> aws/awsManagedDependencies}} - {{/aws}} + {{#aws}}{{> aws/awsManagedDependencies}}{{/aws}} @@ -46,21 +43,11 @@ {{> core/coreDependencies}} - {{#aws}} - {{> aws/awsDependencies}} - {{/aws}} - - {{#azure}} - {{> azure/azureDependencies}} - {{/azure}} + {{#aws}}{{> aws/awsDependencies}}{{/aws}} - {{#dynamodb}} - {{> dynamodb/dynamodbDependencies}} - {{/dynamodb}} + {{#dynamodb}}{{> dynamodb/dynamodbDependencies}}{{/dynamodb}} - {{#cosmosdb}} - {{> cosmosdb/cosmosdbDependencies}} - {{/cosmosdb}} + {{#cosmosdb}}{{> cosmosdb/cosmosdbDependencies}}{{/cosmosdb}} diff --git a/java/src/main/resources/templates/template.mustache b/java/src/main/resources/templates/template.mustache deleted file mode 100644 index 8629c691..00000000 --- a/java/src/main/resources/templates/template.mustache +++ /dev/null @@ -1,397 +0,0 @@ - - - 4.0.0 - - - com.amido.stacks.modules - stacks-modules-parent - 3.0.26-RELEASE - - - com.amido.stacks.workloads - stacks-api - 1.0.0 - - stacks-api - Demo project for Java - - - - no-aws - no-azure - - 3.5.0 - 2022.0.4 - 11.1.0 - 5.11.3 - 4.0.10 - 4.6.15 - 4.6.15 - 1.6.7 - - {{#versionProperties}} - {{{.}}} - {{/versionProperties}} - - - - - JavaMenuAPI - http - localhost - 9000 - - - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring.cloud.dependencies.version} - pom - import - - - org.junit - junit-bom - ${junit-jupiter.version} - pom - import - - - io.awspring.cloud - spring-cloud-aws-dependencies - ${spring.cloud.starter.aws.secrets.manager.config.version} - pom - import - - - com.amazonaws - aws-java-sdk-bom - ${aws-java-sdk.version} - pom - import - - - - com.amazonaws - aws-xray-recorder-sdk-bom - ${aws-xray-recorder-sdk.version} - pom - import - - - - - - - {{#dependencies}} - - {{groupId}} - {{artifactId}} - {{#version}} - {{version}} - {{/version}} - {{#hasExclusions}} - - {{#exclusions}} - - {{groupId}} - {{artifactId}} - - {{/exclusions}} - - {{/hasExclusions}} - - - {{/dependencies}} - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - com.amido.stacks.workloads.Application - - - - - repackage - - - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - **/AuthControllerImpl* - **/ApplicationConfig* - - - - - - prepare-agent - - - - report - prepare-package - - report - - - - default-check - - check - - - - - BUNDLE - - - COMPLEXITY - COVEREDRATIO - 0.00 - - - - - - - - - - au.com.dius.pact.provider - maven - ${au.com.dius.pact.provider.maven-version} - - ${pact.broker.url} - ${pact.broker.token} - - true - - - - ${pact.api.name} - ${pact.api.protocol} - ${pact.api.host} - ${pact.api.port} - - - - - - com.coveo - fmt-maven-plugin - ${fmt-maven-plugin.version} - - true - true - .*\.java - - false - false - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - - - com.puppycrawl.tools - checkstyle - ${puppycrawl-tools-checkstyle.version} - - - - google_checks.xml - UTF-8 - true - true - false - - - - validate - validate - - - - - com.github.spotbugs - spotbugs-maven-plugin - ${spotbugs-maven-plugin.version} - - - - com.github.spotbugs - spotbugs - ${spotbugs.version} - - - - - org.pitest - pitest-maven - ${pitest.version} - - - org.pitest - pitest-junit5-plugin - 0.15 - - - - - pitest - verify - - mutationCoverage - - - - - 15 - target/pitHistory.txt - target/pitHistory.txt - false - - STRONGER - - - XML - HTML - - - - - - - - - - - - aws - - - . - - - - aws - - - - - - - azure - - - . - - - - azure - - - - - - - owasp-dependency-check - - - - org.owasp - dependency-check-maven - ${owasp-dependency-check-plugin.version} - - - - check - - - - - - - - - - test - - true - - spring.profiles.active - test - - - - - - local - - - - src/main/resources/local - - - src/main/resources - - - - - - - update-permissions - - - !windows - - - - - - org.codehaus.mojo - exec-maven-plugin - ${exec-maven-plugin.version} - - - Add execution rights on bash scripts - process-resources - - exec - - - chmod - - 755 - ${project.basedir}/mvnw - - - - - - - - - - - \ No newline at end of file From 0d014ca76723851c006f79e2264bf21c6692c896 Mon Sep 17 00:00:00 2001 From: ShaunMathias Date: Fri, 10 Jan 2025 09:53:31 +0000 Subject: [PATCH 11/12] Added core messaging (#8) * added core messaging and servicebus * removed servicebus * removed config for servicebus --- java/pom.xml | 92 ++++++------------- .../messaging/event/ApplicationEvent.java | 51 ++++++++++ .../listen/ApplicationEventListener.java | 5 + .../listen/DefaultEventListener.java | 17 ++++ .../publish/ApplicationEventPublisher.java | 8 ++ ...ApplicationEventPublisherWithListener.java | 17 ++++ .../publish/DefaultEventPublisher.java | 32 +++++++ .../src/main/resources/templates/pom.mustache | 4 - 8 files changed, 160 insertions(+), 66 deletions(-) create mode 100644 java/src/main/java/com/amido/stacks/core/messaging/event/ApplicationEvent.java create mode 100644 java/src/main/java/com/amido/stacks/core/messaging/listen/ApplicationEventListener.java create mode 100644 java/src/main/java/com/amido/stacks/core/messaging/listen/DefaultEventListener.java create mode 100644 java/src/main/java/com/amido/stacks/core/messaging/publish/ApplicationEventPublisher.java create mode 100644 java/src/main/java/com/amido/stacks/core/messaging/publish/ApplicationEventPublisherWithListener.java create mode 100644 java/src/main/java/com/amido/stacks/core/messaging/publish/DefaultEventPublisher.java diff --git a/java/pom.xml b/java/pom.xml index efe0eaec..dca32385 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -27,14 +27,13 @@ - + - + 2.6.4 4.0.0 - 4.0.10 4.6.15 4.6.15 @@ -54,11 +53,6 @@ 2024.1.38 2.25 - 2.4.4 - - 1.12.579 - 2.14.0 - @@ -87,28 +81,6 @@ pom import - - io.awspring.cloud - spring-cloud-aws-dependencies - ${spring.cloud.starter.aws.secrets.manager.config.version} - pom - import - - - com.amazonaws - aws-java-sdk-bom - ${aws-java-sdk.version} - pom - import - - - - com.amazonaws - aws-xray-recorder-sdk-bom - ${aws-xray-recorder-sdk.version} - pom - import - @@ -472,7 +444,6 @@ - org.apache.maven.plugins maven-compiler-plugin @@ -575,8 +546,6 @@ - - @@ -662,32 +631,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + io.awspring.cloud + spring-cloud-aws-dependencies + ${spring.cloud.starter.aws.secrets.manager.config.version} + pom + import + + + com.amazonaws + aws-java-sdk-bom + ${aws-java-sdk.version} + pom + import + + + com.amazonaws + aws-xray-recorder-sdk-bom + ${aws-xray-recorder-sdk.version} + pom + import + + + @@ -715,7 +683,7 @@ cosmosdb -AUSE_COSMOSDB= - cosmosdb + cosmosdb 5.6.0 @@ -731,8 +699,8 @@ dynamodb - -AUSE_DYNAMODB= - dynamodb + -AUSE_DYNAMODB= + dynamodb diff --git a/java/src/main/java/com/amido/stacks/core/messaging/event/ApplicationEvent.java b/java/src/main/java/com/amido/stacks/core/messaging/event/ApplicationEvent.java new file mode 100644 index 00000000..4e3a43d0 --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/messaging/event/ApplicationEvent.java @@ -0,0 +1,51 @@ +package com.amido.stacks.core.messaging.event; + +import static java.time.ZonedDateTime.now; + +import com.amido.stacks.core.operations.OperationContext; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.datatype.jsr310.ser.ZonedDateTimeSerializer; +import lombok.Getter; + +import java.io.Serializable; +import java.time.ZonedDateTime; +import java.util.UUID; + +public abstract class ApplicationEvent extends OperationContext implements Serializable { + + @Getter + private final UUID id; + @Getter + private final int operationCode; + + @JsonSerialize(using = ZonedDateTimeSerializer.class) + private final ZonedDateTime creationDate; + + public ApplicationEvent(int operationCode, String correlationId) { + super(correlationId); + this.operationCode = operationCode; + this.id = UUID.randomUUID(); + this.creationDate = now(); + } + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSSZ") + public ZonedDateTime getCreationDate() { + return creationDate; + } + + public abstract int getEventCode(); + + @Override + public String toString() { + return "ApplicationEvent{" + + "id=" + + id + + ", eventCode=" + + getEventCode() + + ", creationDate=" + + creationDate + + "} " + + super.toString(); + } +} diff --git a/java/src/main/java/com/amido/stacks/core/messaging/listen/ApplicationEventListener.java b/java/src/main/java/com/amido/stacks/core/messaging/listen/ApplicationEventListener.java new file mode 100644 index 00000000..47e2e48f --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/messaging/listen/ApplicationEventListener.java @@ -0,0 +1,5 @@ +package com.amido.stacks.core.messaging.listen; + +public interface ApplicationEventListener { + public void listen(); +} diff --git a/java/src/main/java/com/amido/stacks/core/messaging/listen/DefaultEventListener.java b/java/src/main/java/com/amido/stacks/core/messaging/listen/DefaultEventListener.java new file mode 100644 index 00000000..c3e61b12 --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/messaging/listen/DefaultEventListener.java @@ -0,0 +1,17 @@ +package com.amido.stacks.core.messaging.listen; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Component; + +@Component +@ConditionalOnProperty( + value = "azure.servicebus.enabled", + havingValue = "false", + matchIfMissing = true) +public class DefaultEventListener implements ApplicationEventListener { + + @Override + public void listen() { + // Nothing to listen to for default listener + } +} diff --git a/java/src/main/java/com/amido/stacks/core/messaging/publish/ApplicationEventPublisher.java b/java/src/main/java/com/amido/stacks/core/messaging/publish/ApplicationEventPublisher.java new file mode 100644 index 00000000..7841ff24 --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/messaging/publish/ApplicationEventPublisher.java @@ -0,0 +1,8 @@ +package com.amido.stacks.core.messaging.publish; + +import com.amido.stacks.core.messaging.event.ApplicationEvent; + +public interface ApplicationEventPublisher { + + void publish(ApplicationEvent applicationEvent); +} diff --git a/java/src/main/java/com/amido/stacks/core/messaging/publish/ApplicationEventPublisherWithListener.java b/java/src/main/java/com/amido/stacks/core/messaging/publish/ApplicationEventPublisherWithListener.java new file mode 100644 index 00000000..a117bd1e --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/messaging/publish/ApplicationEventPublisherWithListener.java @@ -0,0 +1,17 @@ +package com.amido.stacks.core.messaging.publish; + +import com.amido.stacks.core.messaging.listen.ApplicationEventListener; + +public abstract class ApplicationEventPublisherWithListener implements ApplicationEventPublisher { + + protected ApplicationEventListener applicationEventListener; + + protected ApplicationEventPublisherWithListener( + ApplicationEventListener applicationEventListener) { + this.applicationEventListener = applicationEventListener; + } + + protected void listen() { + applicationEventListener.listen(); + } +} diff --git a/java/src/main/java/com/amido/stacks/core/messaging/publish/DefaultEventPublisher.java b/java/src/main/java/com/amido/stacks/core/messaging/publish/DefaultEventPublisher.java new file mode 100644 index 00000000..72ff7b94 --- /dev/null +++ b/java/src/main/java/com/amido/stacks/core/messaging/publish/DefaultEventPublisher.java @@ -0,0 +1,32 @@ +package com.amido.stacks.core.messaging.publish; + +import com.amido.stacks.core.messaging.event.ApplicationEvent; +import com.amido.stacks.core.messaging.listen.ApplicationEventListener; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Component; + +@Component +@ConditionalOnProperty( + value = "azure.servicebus.enabled", + havingValue = "false", + matchIfMissing = true) +public class DefaultEventPublisher extends ApplicationEventPublisherWithListener { + + Logger logger = LoggerFactory.getLogger(DefaultEventPublisher.class); + + protected DefaultEventPublisher(ApplicationEventListener applicationEventListener) { + super(applicationEventListener); + } + + @Override + public void publish(ApplicationEvent applicationEvent) { + logger.info(applicationEvent.toString()); + } + + @Override + public void listen() { + // Nothing to listen to + } +} diff --git a/java/src/main/resources/templates/pom.mustache b/java/src/main/resources/templates/pom.mustache index 585935d5..9e56a25b 100644 --- a/java/src/main/resources/templates/pom.mustache +++ b/java/src/main/resources/templates/pom.mustache @@ -34,7 +34,6 @@ {{> core/coreManagedDependencies}} - {{#aws}}{{> aws/awsManagedDependencies}}{{/aws}} @@ -42,11 +41,8 @@ {{> core/coreDependencies}} - {{#aws}}{{> aws/awsDependencies}}{{/aws}} - {{#dynamodb}}{{> dynamodb/dynamodbDependencies}}{{/dynamodb}} - {{#cosmosdb}}{{> cosmosdb/cosmosdbDependencies}}{{/cosmosdb}} From c250c71c322e4ebbc94748682602910209a1400d Mon Sep 17 00:00:00 2001 From: Shaun Mathias Date: Mon, 13 Jan 2025 10:38:49 +0000 Subject: [PATCH 12/12] renamed to ensono for package names of text and java --- java/pom.xml | 4 +- .../publish/ApplicationEventPublisher.java | 8 ---- .../stacks/aws/tracing/XRayInspector.java | 2 +- .../stacks/aws/tracing/XRayTracingFilter.java | 2 +- .../api/annotations/CreateAPIResponses.java | 6 +-- .../api/annotations/DeleteAPIResponses.java | 4 +- .../api/annotations/ReadAPIResponses.java | 4 +- .../api/annotations/SearchAPIResponses.java | 4 +- .../api/annotations/UpdateAPIResponses.java | 6 +-- .../stacks/core/api/dto/ErrorResponse.java | 2 +- .../api/dto/request/GenerateTokenRequest.java | 2 +- .../dto/response/GenerateTokenResponse.java | 2 +- .../dto/response/ResourceCreatedResponse.java | 2 +- .../dto/response/ResourceUpdatedResponse.java | 2 +- .../core/api/exception/ApiException.java | 2 +- .../api/exception/ApiExceptionAdvice.java | 4 +- .../core/api/filter/CorrelationIdFilter.java | 2 +- .../CorrelationIdFilterConfiguration.java | 2 +- .../stacks/core/mapping/BaseMapper.java | 2 +- .../stacks/core/mapping/MapperUtils.java | 2 +- .../messaging/event/ApplicationEvent.java | 4 +- .../listen/ApplicationEventListener.java | 2 +- .../listen/DefaultEventListener.java | 2 +- .../publish/ApplicationEventPublisher.java | 8 ++++ ...ApplicationEventPublisherWithListener.java | 4 +- .../publish/DefaultEventPublisher.java | 6 +-- .../core/operations/OperationContext.java | 2 +- .../core/repository/StacksPersistence.java | 2 +- .../cosmosdb/config/CosmosDBConfig.java | 4 +- .../repository/StacksCosmosDBRepository.java | 4 +- .../dynamodb/config/DynamoDBConfig.java | 2 +- .../repository/StacksDynamoDBRepository.java | 4 +- .../stacks/workloads/Application.java | 2 +- .../stacks/workloads/ApplicationConfig.java | 2 +- .../workloads/ApplicationNoSecurity.java | 2 +- .../menu/api/OpenApiConfiguration.java | 2 +- .../menu/api/v1/CategoryController.java | 18 ++++----- .../workloads/menu/api/v1/ItemController.java | 18 ++++----- .../workloads/menu/api/v1/MenuController.java | 26 ++++++------ .../menu/api/v1/SecretsController.java | 4 +- .../v1/dto/request/CreateCategoryRequest.java | 2 +- .../api/v1/dto/request/CreateItemRequest.java | 2 +- .../api/v1/dto/request/CreateMenuRequest.java | 2 +- .../v1/dto/request/UpdateCategoryRequest.java | 2 +- .../api/v1/dto/request/UpdateItemRequest.java | 2 +- .../api/v1/dto/request/UpdateMenuRequest.java | 2 +- .../menu/api/v1/dto/response/CategoryDTO.java | 2 +- .../menu/api/v1/dto/response/ItemDTO.java | 2 +- .../menu/api/v1/dto/response/MenuDTO.java | 2 +- .../api/v1/dto/response/SearchMenuResult.java | 2 +- .../v1/dto/response/SearchMenuResultItem.java | 2 +- .../menu/api/v2/MenuControllerV2.java | 8 ++-- .../workloads/menu/domain/Category.java | 2 +- .../stacks/workloads/menu/domain/Item.java | 2 +- .../stacks/workloads/menu/domain/Menu.java | 2 +- .../menu/mappers/CategoryMapper.java | 8 ++-- .../workloads/menu/mappers/ItemMapper.java | 8 ++-- .../workloads/menu/mappers/MenuMapper.java | 10 ++--- .../mappers/SearchMenuResultItemMapper.java | 10 ++--- .../service/utility/MenuHelperService.java | 8 ++-- .../menu/service/v1/CategoryService.java | 10 ++--- .../menu/service/v1/ItemService.java | 10 ++--- .../menu/service/v1/MenuService.java | 28 ++++++------- .../menu/service/v1/SecretsService.java | 2 +- .../menu/service/v2/MenuServiceV2.java | 14 +++---- .../templates/core/corePlugins.mustache | 2 +- .../templates/project-builder-config.json | 30 +++++++------- .../stacks/core/mapping/MapperUtilsTest.java | 4 +- .../core/operations/OperationContextTest.java | 2 +- .../workloads/actuator/ActuatorTest.java | 4 +- .../menu/api/v1/CategoryControllerTest.java | 32 +++++++-------- .../menu/api/v1/ItemControllerTest.java | 34 ++++++++-------- .../menu/api/v1/MenuControllerTest.java | 40 +++++++++---------- .../menu/api/v1/SecretsControllerTest.java | 6 +-- .../api/v1/dto/response/CategoryDTOTest.java | 2 +- .../menu/api/v1/dto/response/ItemDTOTest.java | 2 +- .../menu/api/v1/dto/response/MenuDTOTest.java | 2 +- .../response/SearchMenuResultItemTest.java | 2 +- .../v1/dto/response/SearchMenuResultTest.java | 2 +- .../menu/api/v2/MenuControllerV2Test.java | 12 +++--- .../workloads/menu/domain/CategoryHelper.java | 2 +- .../workloads/menu/domain/ItemHelper.java | 2 +- .../workloads/menu/domain/MenuHelper.java | 2 +- .../workloads/menu/domain/MenuTest.java | 2 +- .../DomainToDtoMapperMapstructTest.java | 16 ++++---- .../utility/MenuHelperServiceTest.java | 8 ++-- .../stacks/workloads/util/TestHelper.java | 2 +- 87 files changed, 268 insertions(+), 268 deletions(-) delete mode 100644 java/src/main/java/com/amido/stacks/core/messaging/publish/ApplicationEventPublisher.java rename java/src/main/java/com/{amido => ensono}/stacks/aws/tracing/XRayInspector.java (94%) rename java/src/main/java/com/{amido => ensono}/stacks/aws/tracing/XRayTracingFilter.java (97%) rename java/src/main/java/com/{amido => ensono}/stacks/core/api/annotations/CreateAPIResponses.java (91%) rename java/src/main/java/com/{amido => ensono}/stacks/core/api/annotations/DeleteAPIResponses.java (95%) rename java/src/main/java/com/{amido => ensono}/stacks/core/api/annotations/ReadAPIResponses.java (91%) rename java/src/main/java/com/{amido => ensono}/stacks/core/api/annotations/SearchAPIResponses.java (88%) rename java/src/main/java/com/{amido => ensono}/stacks/core/api/annotations/UpdateAPIResponses.java (93%) rename java/src/main/java/com/{amido => ensono}/stacks/core/api/dto/ErrorResponse.java (86%) rename java/src/main/java/com/{amido => ensono}/stacks/core/api/dto/request/GenerateTokenRequest.java (93%) rename java/src/main/java/com/{amido => ensono}/stacks/core/api/dto/response/GenerateTokenResponse.java (90%) rename java/src/main/java/com/{amido => ensono}/stacks/core/api/dto/response/ResourceCreatedResponse.java (86%) rename java/src/main/java/com/{amido => ensono}/stacks/core/api/dto/response/ResourceUpdatedResponse.java (86%) rename java/src/main/java/com/{amido => ensono}/stacks/core/api/exception/ApiException.java (91%) rename java/src/main/java/com/{amido => ensono}/stacks/core/api/exception/ApiExceptionAdvice.java (94%) rename java/src/main/java/com/{amido => ensono}/stacks/core/api/filter/CorrelationIdFilter.java (97%) rename java/src/main/java/com/{amido => ensono}/stacks/core/api/filter/CorrelationIdFilterConfiguration.java (95%) rename java/src/main/java/com/{amido => ensono}/stacks/core/mapping/BaseMapper.java (89%) rename java/src/main/java/com/{amido => ensono}/stacks/core/mapping/MapperUtils.java (90%) rename java/src/main/java/com/{amido => ensono}/stacks/core/messaging/event/ApplicationEvent.java (92%) rename java/src/main/java/com/{amido => ensono}/stacks/core/messaging/listen/ApplicationEventListener.java (59%) rename java/src/main/java/com/{amido => ensono}/stacks/core/messaging/listen/DefaultEventListener.java (90%) create mode 100644 java/src/main/java/com/ensono/stacks/core/messaging/publish/ApplicationEventPublisher.java rename java/src/main/java/com/{amido => ensono}/stacks/core/messaging/publish/ApplicationEventPublisherWithListener.java (78%) rename java/src/main/java/com/{amido => ensono}/stacks/core/messaging/publish/DefaultEventPublisher.java (81%) rename java/src/main/java/com/{amido => ensono}/stacks/core/operations/OperationContext.java (94%) rename java/src/main/java/com/{amido => ensono}/stacks/core/repository/StacksPersistence.java (85%) rename java/src/main/java/com/{amido => ensono}/stacks/cosmosdb/config/CosmosDBConfig.java (94%) rename java/src/main/java/com/{amido => ensono}/stacks/cosmosdb/repository/StacksCosmosDBRepository.java (86%) rename java/src/main/java/com/{amido => ensono}/stacks/dynamodb/config/DynamoDBConfig.java (97%) rename java/src/main/java/com/{amido => ensono}/stacks/dynamodb/repository/StacksDynamoDBRepository.java (86%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/Application.java (95%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/ApplicationConfig.java (99%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/ApplicationNoSecurity.java (98%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/api/OpenApiConfiguration.java (98%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/CategoryController.java (83%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/ItemController.java (84%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/MenuController.java (83%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/SecretsController.java (85%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/dto/request/CreateCategoryRequest.java (87%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/dto/request/CreateItemRequest.java (92%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/dto/request/CreateMenuRequest.java (91%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/dto/request/UpdateCategoryRequest.java (88%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/dto/request/UpdateItemRequest.java (92%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/dto/request/UpdateMenuRequest.java (89%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/dto/response/CategoryDTO.java (91%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/dto/response/ItemDTO.java (89%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/dto/response/MenuDTO.java (92%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/dto/response/SearchMenuResult.java (90%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultItem.java (89%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/api/v2/MenuControllerV2.java (87%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/domain/Category.java (86%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/domain/Item.java (82%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/domain/Menu.java (90%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/mappers/CategoryMapper.java (55%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/mappers/ItemMapper.java (53%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/mappers/MenuMapper.java (52%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/mappers/SearchMenuResultItemMapper.java (53%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/service/utility/MenuHelperService.java (81%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/service/v1/CategoryService.java (61%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/service/v1/ItemService.java (60%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/service/v1/MenuService.java (71%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/service/v1/SecretsService.java (94%) rename java/src/main/java/com/{amido => ensono}/stacks/workloads/menu/service/v2/MenuServiceV2.java (61%) rename java/src/test/java/com/{amido => ensono}/stacks/core/mapping/MapperUtilsTest.java (90%) rename java/src/test/java/com/{amido => ensono}/stacks/core/operations/OperationContextTest.java (95%) rename java/src/test/java/com/{amido => ensono}/stacks/workloads/actuator/ActuatorTest.java (92%) rename java/src/test/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/CategoryControllerTest.java (86%) rename java/src/test/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/ItemControllerTest.java (82%) rename java/src/test/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/MenuControllerTest.java (82%) rename java/src/test/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/SecretsControllerTest.java (91%) rename java/src/test/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/dto/response/CategoryDTOTest.java (81%) rename java/src/test/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/dto/response/ItemDTOTest.java (81%) rename java/src/test/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/dto/response/MenuDTOTest.java (81%) rename java/src/test/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultItemTest.java (81%) rename java/src/test/java/com/{amido => ensono}/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultTest.java (81%) rename java/src/test/java/com/{amido => ensono}/stacks/workloads/menu/api/v2/MenuControllerV2Test.java (78%) rename java/src/test/java/com/{amido => ensono}/stacks/workloads/menu/domain/CategoryHelper.java (92%) rename java/src/test/java/com/{amido => ensono}/stacks/workloads/menu/domain/ItemHelper.java (91%) rename java/src/test/java/com/{amido => ensono}/stacks/workloads/menu/domain/MenuHelper.java (92%) rename java/src/test/java/com/{amido => ensono}/stacks/workloads/menu/domain/MenuTest.java (94%) rename java/src/test/java/com/{amido => ensono}/stacks/workloads/menu/mappers/DomainToDtoMapperMapstructTest.java (91%) rename java/src/test/java/com/{amido => ensono}/stacks/workloads/menu/service/utility/MenuHelperServiceTest.java (85%) rename java/src/test/java/com/{amido => ensono}/stacks/workloads/util/TestHelper.java (91%) diff --git a/java/pom.xml b/java/pom.xml index dca32385..045a2f7e 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -10,7 +10,7 @@ 3.0.52 - com.amido.stacks.workloads + com.ensono.stacks.workloads stacks-api 1.0.0 @@ -281,7 +281,7 @@ spring-boot-maven-plugin ${spring.boot.version} - com.amido.stacks.workloads.Application + com.ensono.stacks.workloads.Application diff --git a/java/src/main/java/com/amido/stacks/core/messaging/publish/ApplicationEventPublisher.java b/java/src/main/java/com/amido/stacks/core/messaging/publish/ApplicationEventPublisher.java deleted file mode 100644 index 7841ff24..00000000 --- a/java/src/main/java/com/amido/stacks/core/messaging/publish/ApplicationEventPublisher.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.amido.stacks.core.messaging.publish; - -import com.amido.stacks.core.messaging.event.ApplicationEvent; - -public interface ApplicationEventPublisher { - - void publish(ApplicationEvent applicationEvent); -} diff --git a/java/src/main/java/com/amido/stacks/aws/tracing/XRayInspector.java b/java/src/main/java/com/ensono/stacks/aws/tracing/XRayInspector.java similarity index 94% rename from java/src/main/java/com/amido/stacks/aws/tracing/XRayInspector.java rename to java/src/main/java/com/ensono/stacks/aws/tracing/XRayInspector.java index d5b54260..9260f094 100644 --- a/java/src/main/java/com/amido/stacks/aws/tracing/XRayInspector.java +++ b/java/src/main/java/com/ensono/stacks/aws/tracing/XRayInspector.java @@ -1,4 +1,4 @@ -package com.amido.stacks.aws.tracing; +package com.ensono.stacks.aws.tracing; #if USE_AWS diff --git a/java/src/main/java/com/amido/stacks/aws/tracing/XRayTracingFilter.java b/java/src/main/java/com/ensono/stacks/aws/tracing/XRayTracingFilter.java similarity index 97% rename from java/src/main/java/com/amido/stacks/aws/tracing/XRayTracingFilter.java rename to java/src/main/java/com/ensono/stacks/aws/tracing/XRayTracingFilter.java index 982d6914..8a61f50a 100644 --- a/java/src/main/java/com/amido/stacks/aws/tracing/XRayTracingFilter.java +++ b/java/src/main/java/com/ensono/stacks/aws/tracing/XRayTracingFilter.java @@ -1,4 +1,4 @@ -package com.amido.stacks.aws.tracing; +package com.ensono.stacks.aws.tracing; #if USE_AWS diff --git a/java/src/main/java/com/amido/stacks/core/api/annotations/CreateAPIResponses.java b/java/src/main/java/com/ensono/stacks/core/api/annotations/CreateAPIResponses.java similarity index 91% rename from java/src/main/java/com/amido/stacks/core/api/annotations/CreateAPIResponses.java rename to java/src/main/java/com/ensono/stacks/core/api/annotations/CreateAPIResponses.java index cd33af1e..6a8cb01e 100644 --- a/java/src/main/java/com/amido/stacks/core/api/annotations/CreateAPIResponses.java +++ b/java/src/main/java/com/ensono/stacks/core/api/annotations/CreateAPIResponses.java @@ -1,7 +1,7 @@ -package com.amido.stacks.core.api.annotations; +package com.ensono.stacks.core.api.annotations; -import com.amido.stacks.core.api.dto.ErrorResponse; -import com.amido.stacks.core.api.dto.response.ResourceCreatedResponse; +import com.ensono.stacks.core.api.dto.ErrorResponse; +import com.ensono.stacks.core.api.dto.response.ResourceCreatedResponse; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/java/src/main/java/com/amido/stacks/core/api/annotations/DeleteAPIResponses.java b/java/src/main/java/com/ensono/stacks/core/api/annotations/DeleteAPIResponses.java similarity index 95% rename from java/src/main/java/com/amido/stacks/core/api/annotations/DeleteAPIResponses.java rename to java/src/main/java/com/ensono/stacks/core/api/annotations/DeleteAPIResponses.java index 34e0450d..d03a47d0 100644 --- a/java/src/main/java/com/amido/stacks/core/api/annotations/DeleteAPIResponses.java +++ b/java/src/main/java/com/ensono/stacks/core/api/annotations/DeleteAPIResponses.java @@ -1,6 +1,6 @@ -package com.amido.stacks.core.api.annotations; +package com.ensono.stacks.core.api.annotations; -import com.amido.stacks.core.api.dto.ErrorResponse; +import com.ensono.stacks.core.api.dto.ErrorResponse; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/java/src/main/java/com/amido/stacks/core/api/annotations/ReadAPIResponses.java b/java/src/main/java/com/ensono/stacks/core/api/annotations/ReadAPIResponses.java similarity index 91% rename from java/src/main/java/com/amido/stacks/core/api/annotations/ReadAPIResponses.java rename to java/src/main/java/com/ensono/stacks/core/api/annotations/ReadAPIResponses.java index c365f63c..56ab7ccc 100644 --- a/java/src/main/java/com/amido/stacks/core/api/annotations/ReadAPIResponses.java +++ b/java/src/main/java/com/ensono/stacks/core/api/annotations/ReadAPIResponses.java @@ -1,6 +1,6 @@ -package com.amido.stacks.core.api.annotations; +package com.ensono.stacks.core.api.annotations; -import com.amido.stacks.core.api.dto.ErrorResponse; +import com.ensono.stacks.core.api.dto.ErrorResponse; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/java/src/main/java/com/amido/stacks/core/api/annotations/SearchAPIResponses.java b/java/src/main/java/com/ensono/stacks/core/api/annotations/SearchAPIResponses.java similarity index 88% rename from java/src/main/java/com/amido/stacks/core/api/annotations/SearchAPIResponses.java rename to java/src/main/java/com/ensono/stacks/core/api/annotations/SearchAPIResponses.java index ee32cfa0..a1226262 100644 --- a/java/src/main/java/com/amido/stacks/core/api/annotations/SearchAPIResponses.java +++ b/java/src/main/java/com/ensono/stacks/core/api/annotations/SearchAPIResponses.java @@ -1,6 +1,6 @@ -package com.amido.stacks.core.api.annotations; +package com.ensono.stacks.core.api.annotations; -import com.amido.stacks.core.api.dto.ErrorResponse; +import com.ensono.stacks.core.api.dto.ErrorResponse; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/java/src/main/java/com/amido/stacks/core/api/annotations/UpdateAPIResponses.java b/java/src/main/java/com/ensono/stacks/core/api/annotations/UpdateAPIResponses.java similarity index 93% rename from java/src/main/java/com/amido/stacks/core/api/annotations/UpdateAPIResponses.java rename to java/src/main/java/com/ensono/stacks/core/api/annotations/UpdateAPIResponses.java index 14cd6dc9..f4618f07 100644 --- a/java/src/main/java/com/amido/stacks/core/api/annotations/UpdateAPIResponses.java +++ b/java/src/main/java/com/ensono/stacks/core/api/annotations/UpdateAPIResponses.java @@ -1,7 +1,7 @@ -package com.amido.stacks.core.api.annotations; +package com.ensono.stacks.core.api.annotations; -import com.amido.stacks.core.api.dto.ErrorResponse; -import com.amido.stacks.core.api.dto.response.ResourceUpdatedResponse; +import com.ensono.stacks.core.api.dto.ErrorResponse; +import com.ensono.stacks.core.api.dto.response.ResourceUpdatedResponse; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/java/src/main/java/com/amido/stacks/core/api/dto/ErrorResponse.java b/java/src/main/java/com/ensono/stacks/core/api/dto/ErrorResponse.java similarity index 86% rename from java/src/main/java/com/amido/stacks/core/api/dto/ErrorResponse.java rename to java/src/main/java/com/ensono/stacks/core/api/dto/ErrorResponse.java index 647ddb02..a1faf1dd 100644 --- a/java/src/main/java/com/amido/stacks/core/api/dto/ErrorResponse.java +++ b/java/src/main/java/com/ensono/stacks/core/api/dto/ErrorResponse.java @@ -1,4 +1,4 @@ -package com.amido.stacks.core.api.dto; +package com.ensono.stacks.core.api.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/java/src/main/java/com/amido/stacks/core/api/dto/request/GenerateTokenRequest.java b/java/src/main/java/com/ensono/stacks/core/api/dto/request/GenerateTokenRequest.java similarity index 93% rename from java/src/main/java/com/amido/stacks/core/api/dto/request/GenerateTokenRequest.java rename to java/src/main/java/com/ensono/stacks/core/api/dto/request/GenerateTokenRequest.java index 2ccb1bda..c6286b0e 100644 --- a/java/src/main/java/com/amido/stacks/core/api/dto/request/GenerateTokenRequest.java +++ b/java/src/main/java/com/ensono/stacks/core/api/dto/request/GenerateTokenRequest.java @@ -1,4 +1,4 @@ -package com.amido.stacks.core.api.dto.request; +package com.ensono.stacks.core.api.dto.request; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotBlank; diff --git a/java/src/main/java/com/amido/stacks/core/api/dto/response/GenerateTokenResponse.java b/java/src/main/java/com/ensono/stacks/core/api/dto/response/GenerateTokenResponse.java similarity index 90% rename from java/src/main/java/com/amido/stacks/core/api/dto/response/GenerateTokenResponse.java rename to java/src/main/java/com/ensono/stacks/core/api/dto/response/GenerateTokenResponse.java index d9bb11cf..6bea67da 100644 --- a/java/src/main/java/com/amido/stacks/core/api/dto/response/GenerateTokenResponse.java +++ b/java/src/main/java/com/ensono/stacks/core/api/dto/response/GenerateTokenResponse.java @@ -1,4 +1,4 @@ -package com.amido.stacks.core.api.dto.response; +package com.ensono.stacks.core.api.dto.response; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/java/src/main/java/com/amido/stacks/core/api/dto/response/ResourceCreatedResponse.java b/java/src/main/java/com/ensono/stacks/core/api/dto/response/ResourceCreatedResponse.java similarity index 86% rename from java/src/main/java/com/amido/stacks/core/api/dto/response/ResourceCreatedResponse.java rename to java/src/main/java/com/ensono/stacks/core/api/dto/response/ResourceCreatedResponse.java index 60eaf444..8c5880be 100644 --- a/java/src/main/java/com/amido/stacks/core/api/dto/response/ResourceCreatedResponse.java +++ b/java/src/main/java/com/ensono/stacks/core/api/dto/response/ResourceCreatedResponse.java @@ -1,4 +1,4 @@ -package com.amido.stacks.core.api.dto.response; +package com.ensono.stacks.core.api.dto.response; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.UUID; diff --git a/java/src/main/java/com/amido/stacks/core/api/dto/response/ResourceUpdatedResponse.java b/java/src/main/java/com/ensono/stacks/core/api/dto/response/ResourceUpdatedResponse.java similarity index 86% rename from java/src/main/java/com/amido/stacks/core/api/dto/response/ResourceUpdatedResponse.java rename to java/src/main/java/com/ensono/stacks/core/api/dto/response/ResourceUpdatedResponse.java index 8cb588fc..702cd40e 100644 --- a/java/src/main/java/com/amido/stacks/core/api/dto/response/ResourceUpdatedResponse.java +++ b/java/src/main/java/com/ensono/stacks/core/api/dto/response/ResourceUpdatedResponse.java @@ -1,4 +1,4 @@ -package com.amido.stacks.core.api.dto.response; +package com.ensono.stacks.core.api.dto.response; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.UUID; diff --git a/java/src/main/java/com/amido/stacks/core/api/exception/ApiException.java b/java/src/main/java/com/ensono/stacks/core/api/exception/ApiException.java similarity index 91% rename from java/src/main/java/com/amido/stacks/core/api/exception/ApiException.java rename to java/src/main/java/com/ensono/stacks/core/api/exception/ApiException.java index 9588f061..abbe52e0 100644 --- a/java/src/main/java/com/amido/stacks/core/api/exception/ApiException.java +++ b/java/src/main/java/com/ensono/stacks/core/api/exception/ApiException.java @@ -1,4 +1,4 @@ -package com.amido.stacks.core.api.exception; +package com.ensono.stacks.core.api.exception; public abstract class ApiException extends RuntimeException { diff --git a/java/src/main/java/com/amido/stacks/core/api/exception/ApiExceptionAdvice.java b/java/src/main/java/com/ensono/stacks/core/api/exception/ApiExceptionAdvice.java similarity index 94% rename from java/src/main/java/com/amido/stacks/core/api/exception/ApiExceptionAdvice.java rename to java/src/main/java/com/ensono/stacks/core/api/exception/ApiExceptionAdvice.java index 2bdaa4bf..7b37d57a 100644 --- a/java/src/main/java/com/amido/stacks/core/api/exception/ApiExceptionAdvice.java +++ b/java/src/main/java/com/ensono/stacks/core/api/exception/ApiExceptionAdvice.java @@ -1,9 +1,9 @@ -package com.amido.stacks.core.api.exception; +package com.ensono.stacks.core.api.exception; import static org.springframework.http.HttpStatus.BAD_REQUEST; import static org.springframework.web.context.request.RequestAttributes.SCOPE_REQUEST; -import com.amido.stacks.core.api.dto.ErrorResponse; +import com.ensono.stacks.core.api.dto.ErrorResponse; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/java/src/main/java/com/amido/stacks/core/api/filter/CorrelationIdFilter.java b/java/src/main/java/com/ensono/stacks/core/api/filter/CorrelationIdFilter.java similarity index 97% rename from java/src/main/java/com/amido/stacks/core/api/filter/CorrelationIdFilter.java rename to java/src/main/java/com/ensono/stacks/core/api/filter/CorrelationIdFilter.java index 3085d4b8..cbd56740 100644 --- a/java/src/main/java/com/amido/stacks/core/api/filter/CorrelationIdFilter.java +++ b/java/src/main/java/com/ensono/stacks/core/api/filter/CorrelationIdFilter.java @@ -1,4 +1,4 @@ -package com.amido.stacks.core.api.filter; +package com.ensono.stacks.core.api.filter; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; diff --git a/java/src/main/java/com/amido/stacks/core/api/filter/CorrelationIdFilterConfiguration.java b/java/src/main/java/com/ensono/stacks/core/api/filter/CorrelationIdFilterConfiguration.java similarity index 95% rename from java/src/main/java/com/amido/stacks/core/api/filter/CorrelationIdFilterConfiguration.java rename to java/src/main/java/com/ensono/stacks/core/api/filter/CorrelationIdFilterConfiguration.java index 8dcb9a6e..02eb98a2 100644 --- a/java/src/main/java/com/amido/stacks/core/api/filter/CorrelationIdFilterConfiguration.java +++ b/java/src/main/java/com/ensono/stacks/core/api/filter/CorrelationIdFilterConfiguration.java @@ -1,4 +1,4 @@ -package com.amido.stacks.core.api.filter; +package com.ensono.stacks.core.api.filter; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; diff --git a/java/src/main/java/com/amido/stacks/core/mapping/BaseMapper.java b/java/src/main/java/com/ensono/stacks/core/mapping/BaseMapper.java similarity index 89% rename from java/src/main/java/com/amido/stacks/core/mapping/BaseMapper.java rename to java/src/main/java/com/ensono/stacks/core/mapping/BaseMapper.java index c12e1439..d62d63fd 100644 --- a/java/src/main/java/com/amido/stacks/core/mapping/BaseMapper.java +++ b/java/src/main/java/com/ensono/stacks/core/mapping/BaseMapper.java @@ -1,4 +1,4 @@ -package com.amido.stacks.core.mapping; +package com.ensono.stacks.core.mapping; import java.util.List; import org.mapstruct.MappingTarget; diff --git a/java/src/main/java/com/amido/stacks/core/mapping/MapperUtils.java b/java/src/main/java/com/ensono/stacks/core/mapping/MapperUtils.java similarity index 90% rename from java/src/main/java/com/amido/stacks/core/mapping/MapperUtils.java rename to java/src/main/java/com/ensono/stacks/core/mapping/MapperUtils.java index fd89aa7e..a94c635f 100644 --- a/java/src/main/java/com/amido/stacks/core/mapping/MapperUtils.java +++ b/java/src/main/java/com/ensono/stacks/core/mapping/MapperUtils.java @@ -1,4 +1,4 @@ -package com.amido.stacks.core.mapping; +package com.ensono.stacks.core.mapping; import static java.util.UUID.fromString; diff --git a/java/src/main/java/com/amido/stacks/core/messaging/event/ApplicationEvent.java b/java/src/main/java/com/ensono/stacks/core/messaging/event/ApplicationEvent.java similarity index 92% rename from java/src/main/java/com/amido/stacks/core/messaging/event/ApplicationEvent.java rename to java/src/main/java/com/ensono/stacks/core/messaging/event/ApplicationEvent.java index 4e3a43d0..91a2c9cf 100644 --- a/java/src/main/java/com/amido/stacks/core/messaging/event/ApplicationEvent.java +++ b/java/src/main/java/com/ensono/stacks/core/messaging/event/ApplicationEvent.java @@ -1,8 +1,8 @@ -package com.amido.stacks.core.messaging.event; +package com.ensono.stacks.core.messaging.event; import static java.time.ZonedDateTime.now; -import com.amido.stacks.core.operations.OperationContext; +import com.ensono.stacks.core.operations.OperationContext; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.datatype.jsr310.ser.ZonedDateTimeSerializer; diff --git a/java/src/main/java/com/amido/stacks/core/messaging/listen/ApplicationEventListener.java b/java/src/main/java/com/ensono/stacks/core/messaging/listen/ApplicationEventListener.java similarity index 59% rename from java/src/main/java/com/amido/stacks/core/messaging/listen/ApplicationEventListener.java rename to java/src/main/java/com/ensono/stacks/core/messaging/listen/ApplicationEventListener.java index 47e2e48f..132820f7 100644 --- a/java/src/main/java/com/amido/stacks/core/messaging/listen/ApplicationEventListener.java +++ b/java/src/main/java/com/ensono/stacks/core/messaging/listen/ApplicationEventListener.java @@ -1,4 +1,4 @@ -package com.amido.stacks.core.messaging.listen; +package com.ensono.stacks.core.messaging.listen; public interface ApplicationEventListener { public void listen(); diff --git a/java/src/main/java/com/amido/stacks/core/messaging/listen/DefaultEventListener.java b/java/src/main/java/com/ensono/stacks/core/messaging/listen/DefaultEventListener.java similarity index 90% rename from java/src/main/java/com/amido/stacks/core/messaging/listen/DefaultEventListener.java rename to java/src/main/java/com/ensono/stacks/core/messaging/listen/DefaultEventListener.java index c3e61b12..0d483c3c 100644 --- a/java/src/main/java/com/amido/stacks/core/messaging/listen/DefaultEventListener.java +++ b/java/src/main/java/com/ensono/stacks/core/messaging/listen/DefaultEventListener.java @@ -1,4 +1,4 @@ -package com.amido.stacks.core.messaging.listen; +package com.ensono.stacks.core.messaging.listen; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; diff --git a/java/src/main/java/com/ensono/stacks/core/messaging/publish/ApplicationEventPublisher.java b/java/src/main/java/com/ensono/stacks/core/messaging/publish/ApplicationEventPublisher.java new file mode 100644 index 00000000..4ba6a2fd --- /dev/null +++ b/java/src/main/java/com/ensono/stacks/core/messaging/publish/ApplicationEventPublisher.java @@ -0,0 +1,8 @@ +package com.ensono.stacks.core.messaging.publish; + +import com.ensono.stacks.core.messaging.event.ApplicationEvent; + +public interface ApplicationEventPublisher { + + void publish(ApplicationEvent applicationEvent); +} diff --git a/java/src/main/java/com/amido/stacks/core/messaging/publish/ApplicationEventPublisherWithListener.java b/java/src/main/java/com/ensono/stacks/core/messaging/publish/ApplicationEventPublisherWithListener.java similarity index 78% rename from java/src/main/java/com/amido/stacks/core/messaging/publish/ApplicationEventPublisherWithListener.java rename to java/src/main/java/com/ensono/stacks/core/messaging/publish/ApplicationEventPublisherWithListener.java index a117bd1e..36c89b29 100644 --- a/java/src/main/java/com/amido/stacks/core/messaging/publish/ApplicationEventPublisherWithListener.java +++ b/java/src/main/java/com/ensono/stacks/core/messaging/publish/ApplicationEventPublisherWithListener.java @@ -1,6 +1,6 @@ -package com.amido.stacks.core.messaging.publish; +package com.ensono.stacks.core.messaging.publish; -import com.amido.stacks.core.messaging.listen.ApplicationEventListener; +import com.ensono.stacks.core.messaging.listen.ApplicationEventListener; public abstract class ApplicationEventPublisherWithListener implements ApplicationEventPublisher { diff --git a/java/src/main/java/com/amido/stacks/core/messaging/publish/DefaultEventPublisher.java b/java/src/main/java/com/ensono/stacks/core/messaging/publish/DefaultEventPublisher.java similarity index 81% rename from java/src/main/java/com/amido/stacks/core/messaging/publish/DefaultEventPublisher.java rename to java/src/main/java/com/ensono/stacks/core/messaging/publish/DefaultEventPublisher.java index 72ff7b94..0b69e43a 100644 --- a/java/src/main/java/com/amido/stacks/core/messaging/publish/DefaultEventPublisher.java +++ b/java/src/main/java/com/ensono/stacks/core/messaging/publish/DefaultEventPublisher.java @@ -1,7 +1,7 @@ -package com.amido.stacks.core.messaging.publish; +package com.ensono.stacks.core.messaging.publish; -import com.amido.stacks.core.messaging.event.ApplicationEvent; -import com.amido.stacks.core.messaging.listen.ApplicationEventListener; +import com.ensono.stacks.core.messaging.event.ApplicationEvent; +import com.ensono.stacks.core.messaging.listen.ApplicationEventListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/java/src/main/java/com/amido/stacks/core/operations/OperationContext.java b/java/src/main/java/com/ensono/stacks/core/operations/OperationContext.java similarity index 94% rename from java/src/main/java/com/amido/stacks/core/operations/OperationContext.java rename to java/src/main/java/com/ensono/stacks/core/operations/OperationContext.java index f977ba10..e06cccb3 100644 --- a/java/src/main/java/com/amido/stacks/core/operations/OperationContext.java +++ b/java/src/main/java/com/ensono/stacks/core/operations/OperationContext.java @@ -1,4 +1,4 @@ -package com.amido.stacks.core.operations; +package com.ensono.stacks.core.operations; public abstract class OperationContext { diff --git a/java/src/main/java/com/amido/stacks/core/repository/StacksPersistence.java b/java/src/main/java/com/ensono/stacks/core/repository/StacksPersistence.java similarity index 85% rename from java/src/main/java/com/amido/stacks/core/repository/StacksPersistence.java rename to java/src/main/java/com/ensono/stacks/core/repository/StacksPersistence.java index 8cc743e9..2977f359 100644 --- a/java/src/main/java/com/amido/stacks/core/repository/StacksPersistence.java +++ b/java/src/main/java/com/ensono/stacks/core/repository/StacksPersistence.java @@ -1,4 +1,4 @@ -package com.amido.stacks.core.repository; +package com.ensono.stacks.core.repository; import org.springframework.stereotype.Repository; diff --git a/java/src/main/java/com/amido/stacks/cosmosdb/config/CosmosDBConfig.java b/java/src/main/java/com/ensono/stacks/cosmosdb/config/CosmosDBConfig.java similarity index 94% rename from java/src/main/java/com/amido/stacks/cosmosdb/config/CosmosDBConfig.java rename to java/src/main/java/com/ensono/stacks/cosmosdb/config/CosmosDBConfig.java index 1db3d75b..eb3a6378 100644 --- a/java/src/main/java/com/amido/stacks/cosmosdb/config/CosmosDBConfig.java +++ b/java/src/main/java/com/ensono/stacks/cosmosdb/config/CosmosDBConfig.java @@ -1,4 +1,4 @@ -package com.amido.stacks.cosmosdb.config; +package com.ensono.stacks.cosmosdb.config; #if USE_COSMOSDB import com.azure.core.credential.AzureKeyCredential; @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.context.annotation.Bean; -import com.amido.stacks.core.repository.StacksPersistence; +import com.ensono.stacks.core.repository.StacksPersistence; #endif import org.springframework.context.annotation.Configuration; diff --git a/java/src/main/java/com/amido/stacks/cosmosdb/repository/StacksCosmosDBRepository.java b/java/src/main/java/com/ensono/stacks/cosmosdb/repository/StacksCosmosDBRepository.java similarity index 86% rename from java/src/main/java/com/amido/stacks/cosmosdb/repository/StacksCosmosDBRepository.java rename to java/src/main/java/com/ensono/stacks/cosmosdb/repository/StacksCosmosDBRepository.java index 710ff606..449994b8 100644 --- a/java/src/main/java/com/amido/stacks/cosmosdb/repository/StacksCosmosDBRepository.java +++ b/java/src/main/java/com/ensono/stacks/cosmosdb/repository/StacksCosmosDBRepository.java @@ -1,10 +1,10 @@ -package com.amido.stacks.cosmosdb.repository; +package com.ensono.stacks.cosmosdb.repository; #if USE_COSMOSDB import com.azure.spring.data.cosmos.repository.CosmosRepository; import org.springframework.data.repository.CrudRepository; #endif -import com.amido.stacks.core.repository.StacksPersistence; +import com.ensono.stacks.core.repository.StacksPersistence; import org.springframework.data.repository.NoRepositoryBean; #if USE_COSMOSDB diff --git a/java/src/main/java/com/amido/stacks/dynamodb/config/DynamoDBConfig.java b/java/src/main/java/com/ensono/stacks/dynamodb/config/DynamoDBConfig.java similarity index 97% rename from java/src/main/java/com/amido/stacks/dynamodb/config/DynamoDBConfig.java rename to java/src/main/java/com/ensono/stacks/dynamodb/config/DynamoDBConfig.java index 86b7a708..28e49ed0 100644 --- a/java/src/main/java/com/amido/stacks/dynamodb/config/DynamoDBConfig.java +++ b/java/src/main/java/com/ensono/stacks/dynamodb/config/DynamoDBConfig.java @@ -1,4 +1,4 @@ -package com.amido.stacks.dynamodb.config; +package com.ensono.stacks.dynamodb.config; #if USE_DYNAMODB import static com.amazonaws.util.StringUtils.isNullOrEmpty; diff --git a/java/src/main/java/com/amido/stacks/dynamodb/repository/StacksDynamoDBRepository.java b/java/src/main/java/com/ensono/stacks/dynamodb/repository/StacksDynamoDBRepository.java similarity index 86% rename from java/src/main/java/com/amido/stacks/dynamodb/repository/StacksDynamoDBRepository.java rename to java/src/main/java/com/ensono/stacks/dynamodb/repository/StacksDynamoDBRepository.java index ac7b99cf..d8a555ed 100644 --- a/java/src/main/java/com/amido/stacks/dynamodb/repository/StacksDynamoDBRepository.java +++ b/java/src/main/java/com/ensono/stacks/dynamodb/repository/StacksDynamoDBRepository.java @@ -1,10 +1,10 @@ -package com.amido.stacks.dynamodb.repository; +package com.ensono.stacks.dynamodb.repository; #if USE_DYNAMODB import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.PagingAndSortingRepository; #endif -import com.amido.stacks.core.repository.StacksPersistence; +import com.ensono.stacks.core.repository.StacksPersistence; import org.springframework.data.repository.NoRepositoryBean; diff --git a/java/src/main/java/com/amido/stacks/workloads/Application.java b/java/src/main/java/com/ensono/stacks/workloads/Application.java similarity index 95% rename from java/src/main/java/com/amido/stacks/workloads/Application.java rename to java/src/main/java/com/ensono/stacks/workloads/Application.java index e2d88636..96a0d27c 100644 --- a/java/src/main/java/com/amido/stacks/workloads/Application.java +++ b/java/src/main/java/com/ensono/stacks/workloads/Application.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads; +package com.ensono.stacks.workloads; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/java/src/main/java/com/amido/stacks/workloads/ApplicationConfig.java b/java/src/main/java/com/ensono/stacks/workloads/ApplicationConfig.java similarity index 99% rename from java/src/main/java/com/amido/stacks/workloads/ApplicationConfig.java rename to java/src/main/java/com/ensono/stacks/workloads/ApplicationConfig.java index 75dab57c..5b0fa595 100644 --- a/java/src/main/java/com/amido/stacks/workloads/ApplicationConfig.java +++ b/java/src/main/java/com/ensono/stacks/workloads/ApplicationConfig.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads; +package com.ensono.stacks.workloads; import java.util.Arrays; import java.util.List; diff --git a/java/src/main/java/com/amido/stacks/workloads/ApplicationNoSecurity.java b/java/src/main/java/com/ensono/stacks/workloads/ApplicationNoSecurity.java similarity index 98% rename from java/src/main/java/com/amido/stacks/workloads/ApplicationNoSecurity.java rename to java/src/main/java/com/ensono/stacks/workloads/ApplicationNoSecurity.java index 774ff4b1..14ea5bad 100644 --- a/java/src/main/java/com/amido/stacks/workloads/ApplicationNoSecurity.java +++ b/java/src/main/java/com/ensono/stacks/workloads/ApplicationNoSecurity.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads; +package com.ensono.stacks.workloads; import static org.springframework.security.config.Customizer.withDefaults; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/api/OpenApiConfiguration.java b/java/src/main/java/com/ensono/stacks/workloads/menu/api/OpenApiConfiguration.java similarity index 98% rename from java/src/main/java/com/amido/stacks/workloads/menu/api/OpenApiConfiguration.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/api/OpenApiConfiguration.java index 2f3245b6..d0369ddc 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/api/OpenApiConfiguration.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/api/OpenApiConfiguration.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.api; +package com.ensono.stacks.workloads.menu.api; import io.swagger.v3.oas.annotations.enums.SecuritySchemeType; import io.swagger.v3.oas.annotations.security.SecurityScheme; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/CategoryController.java b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/CategoryController.java similarity index 83% rename from java/src/main/java/com/amido/stacks/workloads/menu/api/v1/CategoryController.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/CategoryController.java index c718cdec..c48e50a7 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/CategoryController.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/CategoryController.java @@ -1,15 +1,15 @@ -package com.amido.stacks.workloads.menu.api.v1; +package com.ensono.stacks.workloads.menu.api.v1; import static org.springframework.http.HttpStatus.OK; -import com.amido.stacks.core.api.annotations.CreateAPIResponses; -import com.amido.stacks.core.api.annotations.DeleteAPIResponses; -import com.amido.stacks.core.api.annotations.UpdateAPIResponses; -import com.amido.stacks.core.api.dto.response.ResourceCreatedResponse; -import com.amido.stacks.core.api.dto.response.ResourceUpdatedResponse; -import com.amido.stacks.workloads.menu.api.v1.dto.request.CreateCategoryRequest; -import com.amido.stacks.workloads.menu.api.v1.dto.request.UpdateCategoryRequest; -import com.amido.stacks.workloads.menu.service.v1.CategoryService; +import com.ensono.stacks.core.api.annotations.CreateAPIResponses; +import com.ensono.stacks.core.api.annotations.DeleteAPIResponses; +import com.ensono.stacks.core.api.annotations.UpdateAPIResponses; +import com.ensono.stacks.core.api.dto.response.ResourceCreatedResponse; +import com.ensono.stacks.core.api.dto.response.ResourceUpdatedResponse; +import com.ensono.stacks.workloads.menu.api.v1.dto.request.CreateCategoryRequest; +import com.ensono.stacks.workloads.menu.api.v1.dto.request.UpdateCategoryRequest; +import com.ensono.stacks.workloads.menu.service.v1.CategoryService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import jakarta.validation.Valid; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/ItemController.java b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/ItemController.java similarity index 84% rename from java/src/main/java/com/amido/stacks/workloads/menu/api/v1/ItemController.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/ItemController.java index 126e1f66..0580f4bd 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/ItemController.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/ItemController.java @@ -1,15 +1,15 @@ -package com.amido.stacks.workloads.menu.api.v1; +package com.ensono.stacks.workloads.menu.api.v1; import static org.springframework.http.HttpStatus.OK; -import com.amido.stacks.core.api.annotations.CreateAPIResponses; -import com.amido.stacks.core.api.annotations.DeleteAPIResponses; -import com.amido.stacks.core.api.annotations.UpdateAPIResponses; -import com.amido.stacks.core.api.dto.response.ResourceCreatedResponse; -import com.amido.stacks.core.api.dto.response.ResourceUpdatedResponse; -import com.amido.stacks.workloads.menu.api.v1.dto.request.CreateItemRequest; -import com.amido.stacks.workloads.menu.api.v1.dto.request.UpdateItemRequest; -import com.amido.stacks.workloads.menu.service.v1.ItemService; +import com.ensono.stacks.core.api.annotations.CreateAPIResponses; +import com.ensono.stacks.core.api.annotations.DeleteAPIResponses; +import com.ensono.stacks.core.api.annotations.UpdateAPIResponses; +import com.ensono.stacks.core.api.dto.response.ResourceCreatedResponse; +import com.ensono.stacks.core.api.dto.response.ResourceUpdatedResponse; +import com.ensono.stacks.workloads.menu.api.v1.dto.request.CreateItemRequest; +import com.ensono.stacks.workloads.menu.api.v1.dto.request.UpdateItemRequest; +import com.ensono.stacks.workloads.menu.service.v1.ItemService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import jakarta.validation.Valid; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/MenuController.java b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/MenuController.java similarity index 83% rename from java/src/main/java/com/amido/stacks/workloads/menu/api/v1/MenuController.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/MenuController.java index 28b72a8c..2be21087 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/MenuController.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/MenuController.java @@ -1,19 +1,19 @@ -package com.amido.stacks.workloads.menu.api.v1; +package com.ensono.stacks.workloads.menu.api.v1; import static org.springframework.http.HttpStatus.OK; -import com.amido.stacks.core.api.annotations.CreateAPIResponses; -import com.amido.stacks.core.api.annotations.DeleteAPIResponses; -import com.amido.stacks.core.api.annotations.ReadAPIResponses; -import com.amido.stacks.core.api.annotations.SearchAPIResponses; -import com.amido.stacks.core.api.annotations.UpdateAPIResponses; -import com.amido.stacks.core.api.dto.response.ResourceCreatedResponse; -import com.amido.stacks.core.api.dto.response.ResourceUpdatedResponse; -import com.amido.stacks.workloads.menu.api.v1.dto.request.CreateMenuRequest; -import com.amido.stacks.workloads.menu.api.v1.dto.request.UpdateMenuRequest; -import com.amido.stacks.workloads.menu.api.v1.dto.response.MenuDTO; -import com.amido.stacks.workloads.menu.api.v1.dto.response.SearchMenuResult; -import com.amido.stacks.workloads.menu.service.v1.MenuService; +import com.ensono.stacks.core.api.annotations.CreateAPIResponses; +import com.ensono.stacks.core.api.annotations.DeleteAPIResponses; +import com.ensono.stacks.core.api.annotations.ReadAPIResponses; +import com.ensono.stacks.core.api.annotations.SearchAPIResponses; +import com.ensono.stacks.core.api.annotations.UpdateAPIResponses; +import com.ensono.stacks.core.api.dto.response.ResourceCreatedResponse; +import com.ensono.stacks.core.api.dto.response.ResourceUpdatedResponse; +import com.ensono.stacks.workloads.menu.api.v1.dto.request.CreateMenuRequest; +import com.ensono.stacks.workloads.menu.api.v1.dto.request.UpdateMenuRequest; +import com.ensono.stacks.workloads.menu.api.v1.dto.response.MenuDTO; +import com.ensono.stacks.workloads.menu.api.v1.dto.response.SearchMenuResult; +import com.ensono.stacks.workloads.menu.service.v1.MenuService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Content; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/SecretsController.java b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/SecretsController.java similarity index 85% rename from java/src/main/java/com/amido/stacks/workloads/menu/api/v1/SecretsController.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/SecretsController.java index 46643dd2..3692597a 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/SecretsController.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/SecretsController.java @@ -1,6 +1,6 @@ -package com.amido.stacks.workloads.menu.api.v1; +package com.ensono.stacks.workloads.menu.api.v1; -import com.amido.stacks.workloads.menu.service.v1.SecretsService; +import com.ensono.stacks.workloads.menu.service.v1.SecretsService; import lombok.RequiredArgsConstructor; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/request/CreateCategoryRequest.java b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/request/CreateCategoryRequest.java similarity index 87% rename from java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/request/CreateCategoryRequest.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/request/CreateCategoryRequest.java index b2747cc9..edd8914b 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/request/CreateCategoryRequest.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/request/CreateCategoryRequest.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.api.v1.dto.request; +package com.ensono.stacks.workloads.menu.api.v1.dto.request; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotBlank; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/request/CreateItemRequest.java b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/request/CreateItemRequest.java similarity index 92% rename from java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/request/CreateItemRequest.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/request/CreateItemRequest.java index b64eb004..5903ccd5 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/request/CreateItemRequest.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/request/CreateItemRequest.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.api.v1.dto.request; +package com.ensono.stacks.workloads.menu.api.v1.dto.request; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotBlank; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/request/CreateMenuRequest.java b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/request/CreateMenuRequest.java similarity index 91% rename from java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/request/CreateMenuRequest.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/request/CreateMenuRequest.java index 0f17cd28..b02c7830 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/request/CreateMenuRequest.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/request/CreateMenuRequest.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.api.v1.dto.request; +package com.ensono.stacks.workloads.menu.api.v1.dto.request; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotBlank; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/request/UpdateCategoryRequest.java b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/request/UpdateCategoryRequest.java similarity index 88% rename from java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/request/UpdateCategoryRequest.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/request/UpdateCategoryRequest.java index f66385dd..6eedca0d 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/request/UpdateCategoryRequest.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/request/UpdateCategoryRequest.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.api.v1.dto.request; +package com.ensono.stacks.workloads.menu.api.v1.dto.request; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotBlank; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/request/UpdateItemRequest.java b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/request/UpdateItemRequest.java similarity index 92% rename from java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/request/UpdateItemRequest.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/request/UpdateItemRequest.java index a11cac0c..cc58442b 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/request/UpdateItemRequest.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/request/UpdateItemRequest.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.api.v1.dto.request; +package com.ensono.stacks.workloads.menu.api.v1.dto.request; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotBlank; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/request/UpdateMenuRequest.java b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/request/UpdateMenuRequest.java similarity index 89% rename from java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/request/UpdateMenuRequest.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/request/UpdateMenuRequest.java index 0c53a6ce..98bb7dd2 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/request/UpdateMenuRequest.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/request/UpdateMenuRequest.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.api.v1.dto.request; +package com.ensono.stacks.workloads.menu.api.v1.dto.request; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotBlank; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/response/CategoryDTO.java b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/CategoryDTO.java similarity index 91% rename from java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/response/CategoryDTO.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/CategoryDTO.java index a601afa5..dc76452b 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/response/CategoryDTO.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/CategoryDTO.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.api.v1.dto.response; +package com.ensono.stacks.workloads.menu.api.v1.dto.response; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/response/ItemDTO.java b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/ItemDTO.java similarity index 89% rename from java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/response/ItemDTO.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/ItemDTO.java index 53642a3a..30050757 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/response/ItemDTO.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/ItemDTO.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.api.v1.dto.response; +package com.ensono.stacks.workloads.menu.api.v1.dto.response; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/response/MenuDTO.java b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/MenuDTO.java similarity index 92% rename from java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/response/MenuDTO.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/MenuDTO.java index c253a242..042dce17 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/response/MenuDTO.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/MenuDTO.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.api.v1.dto.response; +package com.ensono.stacks.workloads.menu.api.v1.dto.response; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/response/SearchMenuResult.java b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/SearchMenuResult.java similarity index 90% rename from java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/response/SearchMenuResult.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/SearchMenuResult.java index 6649614f..54a1c684 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/response/SearchMenuResult.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/SearchMenuResult.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.api.v1.dto.response; +package com.ensono.stacks.workloads.menu.api.v1.dto.response; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultItem.java b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultItem.java similarity index 89% rename from java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultItem.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultItem.java index e03cefb8..6dd30ace 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultItem.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultItem.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.api.v1.dto.response; +package com.ensono.stacks.workloads.menu.api.v1.dto.response; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.UUID; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/api/v2/MenuControllerV2.java b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v2/MenuControllerV2.java similarity index 87% rename from java/src/main/java/com/amido/stacks/workloads/menu/api/v2/MenuControllerV2.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/api/v2/MenuControllerV2.java index a53e562a..ab377941 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/api/v2/MenuControllerV2.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/api/v2/MenuControllerV2.java @@ -1,8 +1,8 @@ -package com.amido.stacks.workloads.menu.api.v2; +package com.ensono.stacks.workloads.menu.api.v2; -import com.amido.stacks.core.api.annotations.ReadAPIResponses; -import com.amido.stacks.workloads.menu.api.v1.dto.response.MenuDTO; -import com.amido.stacks.workloads.menu.service.v2.MenuServiceV2; +import com.ensono.stacks.core.api.annotations.ReadAPIResponses; +import com.ensono.stacks.workloads.menu.api.v1.dto.response.MenuDTO; +import com.ensono.stacks.workloads.menu.service.v2.MenuServiceV2; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Content; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/domain/Category.java b/java/src/main/java/com/ensono/stacks/workloads/menu/domain/Category.java similarity index 86% rename from java/src/main/java/com/amido/stacks/workloads/menu/domain/Category.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/domain/Category.java index 9e967172..8b77ef12 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/domain/Category.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/domain/Category.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.domain; +package com.ensono.stacks.workloads.menu.domain; import java.util.ArrayList; import java.util.List; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/domain/Item.java b/java/src/main/java/com/ensono/stacks/workloads/menu/domain/Item.java similarity index 82% rename from java/src/main/java/com/amido/stacks/workloads/menu/domain/Item.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/domain/Item.java index 5d3c5496..19ff947f 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/domain/Item.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/domain/Item.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.domain; +package com.ensono.stacks.workloads.menu.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/domain/Menu.java b/java/src/main/java/com/ensono/stacks/workloads/menu/domain/Menu.java similarity index 90% rename from java/src/main/java/com/amido/stacks/workloads/menu/domain/Menu.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/domain/Menu.java index ded01d5d..53c8c04d 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/domain/Menu.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/domain/Menu.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.domain; +package com.ensono.stacks.workloads.menu.domain; import java.util.ArrayList; import java.util.List; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/mappers/CategoryMapper.java b/java/src/main/java/com/ensono/stacks/workloads/menu/mappers/CategoryMapper.java similarity index 55% rename from java/src/main/java/com/amido/stacks/workloads/menu/mappers/CategoryMapper.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/mappers/CategoryMapper.java index e4172ee0..3f7860e0 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/mappers/CategoryMapper.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/mappers/CategoryMapper.java @@ -1,8 +1,8 @@ -package com.amido.stacks.workloads.menu.mappers; +package com.ensono.stacks.workloads.menu.mappers; -import com.amido.stacks.core.mapping.BaseMapper; -import com.amido.stacks.workloads.menu.api.v1.dto.response.CategoryDTO; -import com.amido.stacks.workloads.menu.domain.Category; +import com.ensono.stacks.core.mapping.BaseMapper; +import com.ensono.stacks.workloads.menu.api.v1.dto.response.CategoryDTO; +import com.ensono.stacks.workloads.menu.domain.Category; import org.mapstruct.Mapper; import org.mapstruct.NullValueCheckStrategy; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/mappers/ItemMapper.java b/java/src/main/java/com/ensono/stacks/workloads/menu/mappers/ItemMapper.java similarity index 53% rename from java/src/main/java/com/amido/stacks/workloads/menu/mappers/ItemMapper.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/mappers/ItemMapper.java index 2d8da0d1..2d667dc4 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/mappers/ItemMapper.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/mappers/ItemMapper.java @@ -1,8 +1,8 @@ -package com.amido.stacks.workloads.menu.mappers; +package com.ensono.stacks.workloads.menu.mappers; -import com.amido.stacks.core.mapping.BaseMapper; -import com.amido.stacks.workloads.menu.api.v1.dto.response.ItemDTO; -import com.amido.stacks.workloads.menu.domain.Item; +import com.ensono.stacks.core.mapping.BaseMapper; +import com.ensono.stacks.workloads.menu.api.v1.dto.response.ItemDTO; +import com.ensono.stacks.workloads.menu.domain.Item; import org.mapstruct.Mapper; import org.mapstruct.NullValueCheckStrategy; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/mappers/MenuMapper.java b/java/src/main/java/com/ensono/stacks/workloads/menu/mappers/MenuMapper.java similarity index 52% rename from java/src/main/java/com/amido/stacks/workloads/menu/mappers/MenuMapper.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/mappers/MenuMapper.java index aee0fd13..61546b25 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/mappers/MenuMapper.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/mappers/MenuMapper.java @@ -1,10 +1,10 @@ -package com.amido.stacks.workloads.menu.mappers; +package com.ensono.stacks.workloads.menu.mappers; -import com.amido.stacks.core.mapping.BaseMapper; +import com.ensono.stacks.core.mapping.BaseMapper; -import com.amido.stacks.core.mapping.MapperUtils; -import com.amido.stacks.workloads.menu.api.v1.dto.response.MenuDTO; -import com.amido.stacks.workloads.menu.domain.Menu; +import com.ensono.stacks.core.mapping.MapperUtils; +import com.ensono.stacks.workloads.menu.api.v1.dto.response.MenuDTO; +import com.ensono.stacks.workloads.menu.domain.Menu; import org.mapstruct.Mapper; import org.mapstruct.NullValueCheckStrategy; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/mappers/SearchMenuResultItemMapper.java b/java/src/main/java/com/ensono/stacks/workloads/menu/mappers/SearchMenuResultItemMapper.java similarity index 53% rename from java/src/main/java/com/amido/stacks/workloads/menu/mappers/SearchMenuResultItemMapper.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/mappers/SearchMenuResultItemMapper.java index 6536061f..ab6de58f 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/mappers/SearchMenuResultItemMapper.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/mappers/SearchMenuResultItemMapper.java @@ -1,9 +1,9 @@ -package com.amido.stacks.workloads.menu.mappers; +package com.ensono.stacks.workloads.menu.mappers; -import com.amido.stacks.core.mapping.BaseMapper; -import com.amido.stacks.core.mapping.MapperUtils; -import com.amido.stacks.workloads.menu.api.v1.dto.response.SearchMenuResultItem; -import com.amido.stacks.workloads.menu.domain.Menu; +import com.ensono.stacks.core.mapping.BaseMapper; +import com.ensono.stacks.core.mapping.MapperUtils; +import com.ensono.stacks.workloads.menu.api.v1.dto.response.SearchMenuResultItem; +import com.ensono.stacks.workloads.menu.domain.Menu; import org.mapstruct.Mapper; import org.mapstruct.NullValueCheckStrategy; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/service/utility/MenuHelperService.java b/java/src/main/java/com/ensono/stacks/workloads/menu/service/utility/MenuHelperService.java similarity index 81% rename from java/src/main/java/com/amido/stacks/workloads/menu/service/utility/MenuHelperService.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/service/utility/MenuHelperService.java index d07a5fee..865c4834 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/service/utility/MenuHelperService.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/service/utility/MenuHelperService.java @@ -1,8 +1,8 @@ -package com.amido.stacks.workloads.menu.service.utility; +package com.ensono.stacks.workloads.menu.service.utility; -import com.amido.stacks.workloads.menu.domain.Category; -import com.amido.stacks.workloads.menu.domain.Item; -import com.amido.stacks.workloads.menu.domain.Menu; +import com.ensono.stacks.workloads.menu.domain.Category; +import com.ensono.stacks.workloads.menu.domain.Item; +import com.ensono.stacks.workloads.menu.domain.Menu; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/service/v1/CategoryService.java b/java/src/main/java/com/ensono/stacks/workloads/menu/service/v1/CategoryService.java similarity index 61% rename from java/src/main/java/com/amido/stacks/workloads/menu/service/v1/CategoryService.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/service/v1/CategoryService.java index e99f657a..bdf386a1 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/service/v1/CategoryService.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/service/v1/CategoryService.java @@ -1,9 +1,9 @@ -package com.amido.stacks.workloads.menu.service.v1; +package com.ensono.stacks.workloads.menu.service.v1; -import com.amido.stacks.core.api.dto.response.ResourceCreatedResponse; -import com.amido.stacks.core.api.dto.response.ResourceUpdatedResponse; -import com.amido.stacks.workloads.menu.api.v1.dto.request.CreateCategoryRequest; -import com.amido.stacks.workloads.menu.api.v1.dto.request.UpdateCategoryRequest; +import com.ensono.stacks.core.api.dto.response.ResourceCreatedResponse; +import com.ensono.stacks.core.api.dto.response.ResourceUpdatedResponse; +import com.ensono.stacks.workloads.menu.api.v1.dto.request.CreateCategoryRequest; +import com.ensono.stacks.workloads.menu.api.v1.dto.request.UpdateCategoryRequest; import jakarta.validation.Valid; import java.util.UUID; import lombok.RequiredArgsConstructor; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/service/v1/ItemService.java b/java/src/main/java/com/ensono/stacks/workloads/menu/service/v1/ItemService.java similarity index 60% rename from java/src/main/java/com/amido/stacks/workloads/menu/service/v1/ItemService.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/service/v1/ItemService.java index c2cc6852..c889effb 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/service/v1/ItemService.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/service/v1/ItemService.java @@ -1,9 +1,9 @@ -package com.amido.stacks.workloads.menu.service.v1; +package com.ensono.stacks.workloads.menu.service.v1; -import com.amido.stacks.core.api.dto.response.ResourceCreatedResponse; -import com.amido.stacks.core.api.dto.response.ResourceUpdatedResponse; -import com.amido.stacks.workloads.menu.api.v1.dto.request.CreateItemRequest; -import com.amido.stacks.workloads.menu.api.v1.dto.request.UpdateItemRequest; +import com.ensono.stacks.core.api.dto.response.ResourceCreatedResponse; +import com.ensono.stacks.core.api.dto.response.ResourceUpdatedResponse; +import com.ensono.stacks.workloads.menu.api.v1.dto.request.CreateItemRequest; +import com.ensono.stacks.workloads.menu.api.v1.dto.request.UpdateItemRequest; import jakarta.validation.Valid; import java.util.UUID; import org.springframework.stereotype.Service; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/service/v1/MenuService.java b/java/src/main/java/com/ensono/stacks/workloads/menu/service/v1/MenuService.java similarity index 71% rename from java/src/main/java/com/amido/stacks/workloads/menu/service/v1/MenuService.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/service/v1/MenuService.java index e80f2303..c05ab7dd 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/service/v1/MenuService.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/service/v1/MenuService.java @@ -1,17 +1,17 @@ -package com.amido.stacks.workloads.menu.service.v1; - -import com.amido.stacks.core.api.dto.response.ResourceCreatedResponse; -import com.amido.stacks.core.api.dto.response.ResourceUpdatedResponse; -import com.amido.stacks.workloads.menu.api.v1.dto.request.CreateMenuRequest; -import com.amido.stacks.workloads.menu.api.v1.dto.request.UpdateMenuRequest; -import com.amido.stacks.workloads.menu.api.v1.dto.response.MenuDTO; -import com.amido.stacks.workloads.menu.api.v1.dto.response.SearchMenuResult; -import com.amido.stacks.workloads.menu.domain.Category; -import com.amido.stacks.workloads.menu.domain.Item; -import com.amido.stacks.workloads.menu.domain.Menu; -import com.amido.stacks.workloads.menu.mappers.MenuMapper; -import com.amido.stacks.workloads.menu.mappers.SearchMenuResultItemMapper; -import com.amido.stacks.workloads.menu.service.utility.MenuHelperService; +package com.ensono.stacks.workloads.menu.service.v1; + +import com.ensono.stacks.core.api.dto.response.ResourceCreatedResponse; +import com.ensono.stacks.core.api.dto.response.ResourceUpdatedResponse; +import com.ensono.stacks.workloads.menu.api.v1.dto.request.CreateMenuRequest; +import com.ensono.stacks.workloads.menu.api.v1.dto.request.UpdateMenuRequest; +import com.ensono.stacks.workloads.menu.api.v1.dto.response.MenuDTO; +import com.ensono.stacks.workloads.menu.api.v1.dto.response.SearchMenuResult; +import com.ensono.stacks.workloads.menu.domain.Category; +import com.ensono.stacks.workloads.menu.domain.Item; +import com.ensono.stacks.workloads.menu.domain.Menu; +import com.ensono.stacks.workloads.menu.mappers.MenuMapper; +import com.ensono.stacks.workloads.menu.mappers.SearchMenuResultItemMapper; +import com.ensono.stacks.workloads.menu.service.utility.MenuHelperService; import jakarta.validation.Valid; import java.util.ArrayList; import java.util.List; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/service/v1/SecretsService.java b/java/src/main/java/com/ensono/stacks/workloads/menu/service/v1/SecretsService.java similarity index 94% rename from java/src/main/java/com/amido/stacks/workloads/menu/service/v1/SecretsService.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/service/v1/SecretsService.java index 2ef02827..582067ad 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/service/v1/SecretsService.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/service/v1/SecretsService.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.service.v1; +package com.ensono.stacks.workloads.menu.service.v1; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/service/v2/MenuServiceV2.java b/java/src/main/java/com/ensono/stacks/workloads/menu/service/v2/MenuServiceV2.java similarity index 61% rename from java/src/main/java/com/amido/stacks/workloads/menu/service/v2/MenuServiceV2.java rename to java/src/main/java/com/ensono/stacks/workloads/menu/service/v2/MenuServiceV2.java index 135a0f61..654409be 100644 --- a/java/src/main/java/com/amido/stacks/workloads/menu/service/v2/MenuServiceV2.java +++ b/java/src/main/java/com/ensono/stacks/workloads/menu/service/v2/MenuServiceV2.java @@ -1,11 +1,11 @@ -package com.amido.stacks.workloads.menu.service.v2; +package com.ensono.stacks.workloads.menu.service.v2; -import com.amido.stacks.workloads.menu.api.v1.dto.response.MenuDTO; -import com.amido.stacks.workloads.menu.domain.Menu; -import com.amido.stacks.workloads.menu.mappers.MenuMapper; -import com.amido.stacks.workloads.menu.mappers.SearchMenuResultItemMapper; -import com.amido.stacks.workloads.menu.service.utility.MenuHelperService; -import com.amido.stacks.workloads.menu.service.v1.MenuService; +import com.ensono.stacks.workloads.menu.api.v1.dto.response.MenuDTO; +import com.ensono.stacks.workloads.menu.domain.Menu; +import com.ensono.stacks.workloads.menu.mappers.MenuMapper; +import com.ensono.stacks.workloads.menu.mappers.SearchMenuResultItemMapper; +import com.ensono.stacks.workloads.menu.service.utility.MenuHelperService; +import com.ensono.stacks.workloads.menu.service.v1.MenuService; import java.util.ArrayList; import java.util.UUID; import org.springframework.stereotype.Service; diff --git a/java/src/main/resources/templates/core/corePlugins.mustache b/java/src/main/resources/templates/core/corePlugins.mustache index 9dab741b..950a14ca 100644 --- a/java/src/main/resources/templates/core/corePlugins.mustache +++ b/java/src/main/resources/templates/core/corePlugins.mustache @@ -4,7 +4,7 @@ spring-boot-maven-plugin ${spring.boot.version} - com.amido.stacks.workloads.Application + com.ensono.stacks.workloads.Application diff --git a/java/src/main/resources/templates/project-builder-config.json b/java/src/main/resources/templates/project-builder-config.json index 5e47362a..9b8f0827 100644 --- a/java/src/main/resources/templates/project-builder-config.json +++ b/java/src/main/resources/templates/project-builder-config.json @@ -1,36 +1,36 @@ { "coreIncludes": [ - "**/com/amido/stacks/core/**/*.java", - "**/com/amido/stacks/workloads/*.java", - "**/com/amido/stacks/workloads/menu/*.java", - "**/com/amido/stacks/workloads/menu/api/**/*.java", - "**/com/amido/stacks/workloads/menu/domain/*.java", - "**/com/amido/stacks/workloads/menu/mappers/*.java", - "**/com/amido/stacks/workloads/menu/service/*/*.java" + "**/com/ensono/stacks/core/**/*.java", + "**/com/ensono/stacks/workloads/*.java", + "**/com/ensono/stacks/workloads/menu/*.java", + "**/com/ensono/stacks/workloads/menu/api/**/*.java", + "**/com/ensono/stacks/workloads/menu/domain/*.java", + "**/com/ensono/stacks/workloads/menu/mappers/*.java", + "**/com/ensono/stacks/workloads/menu/service/*/*.java" ], "coreTestIncludes" : [ - "**/com/amido/stacks/workloads/actuator/ActuatorTest.java", - "**/com/amido/stacks/workloads/menu/**/*Test.java", - "**/com/amido/stacks/workloads/util/TestHelper.java", - "**/com/amido/stacks/workloads/menu/domain/*Helper.java" + "**/com/ensono/stacks/workloads/actuator/ActuatorTest.java", + "**/com/ensono/stacks/workloads/menu/**/*Test.java", + "**/com/ensnon/stacks/workloads/util/TestHelper.java", + "**/com/ensono/stacks/workloads/menu/domain/*Helper.java" ], "profileFilters": [ { "id": "cosmosdb", "includes" : [ - "**/com/amido/stacks/cosmosdb/**/*.java" + "**/com/ensono/stacks/cosmosdb/**/*.java" ] }, { "id": "dynamodb", "includes" : [ - "**/com/amido/stacks/dynamodb/**/*.java" + "**/com/ensono/stacks/dynamodb/**/*.java" ] }, { "id": "aws", "includes" : [ - "**/com/amido/stacks/aws/**/*.java" + "**/com/ensono/stacks/aws/**/*.java" ], "propertiesFile": "application-aws.yml" }, @@ -40,7 +40,7 @@ } ], "excludedGroupIds": [ - "com.amido.stacks.modules", + "com.ensono.stacks.modules", "com.ensono.stacks.modules", "systems.manifold", "com.github.spullara.mustache.java", diff --git a/java/src/test/java/com/amido/stacks/core/mapping/MapperUtilsTest.java b/java/src/test/java/com/ensono/stacks/core/mapping/MapperUtilsTest.java similarity index 90% rename from java/src/test/java/com/amido/stacks/core/mapping/MapperUtilsTest.java rename to java/src/test/java/com/ensono/stacks/core/mapping/MapperUtilsTest.java index 9cf6d9ab..95e1e393 100644 --- a/java/src/test/java/com/amido/stacks/core/mapping/MapperUtilsTest.java +++ b/java/src/test/java/com/ensono/stacks/core/mapping/MapperUtilsTest.java @@ -1,6 +1,6 @@ -package com.amido.stacks.core.mapping; +package com.ensono.stacks.core.mapping; -import static com.amido.stacks.core.mapping.MapperUtils.map; +import static com.ensono.stacks.core.mapping.MapperUtils.map; import static java.util.UUID.randomUUID; import java.util.UUID; diff --git a/java/src/test/java/com/amido/stacks/core/operations/OperationContextTest.java b/java/src/test/java/com/ensono/stacks/core/operations/OperationContextTest.java similarity index 95% rename from java/src/test/java/com/amido/stacks/core/operations/OperationContextTest.java rename to java/src/test/java/com/ensono/stacks/core/operations/OperationContextTest.java index d5b949bb..bb8d09df 100644 --- a/java/src/test/java/com/amido/stacks/core/operations/OperationContextTest.java +++ b/java/src/test/java/com/ensono/stacks/core/operations/OperationContextTest.java @@ -1,4 +1,4 @@ -package com.amido.stacks.core.operations; +package com.ensono.stacks.core.operations; import static org.assertj.core.api.BDDAssertions.then; import static org.mockito.Mockito.when; diff --git a/java/src/test/java/com/amido/stacks/workloads/actuator/ActuatorTest.java b/java/src/test/java/com/ensono/stacks/workloads/actuator/ActuatorTest.java similarity index 92% rename from java/src/test/java/com/amido/stacks/workloads/actuator/ActuatorTest.java rename to java/src/test/java/com/ensono/stacks/workloads/actuator/ActuatorTest.java index db8f210d..f2f70e09 100644 --- a/java/src/test/java/com/amido/stacks/workloads/actuator/ActuatorTest.java +++ b/java/src/test/java/com/ensono/stacks/workloads/actuator/ActuatorTest.java @@ -1,6 +1,6 @@ -package com.amido.stacks.workloads.actuator; +package com.ensono.stacks.workloads.actuator; -import static com.amido.stacks.workloads.util.TestHelper.getBaseURL; +import static com.ensono.stacks.workloads.util.TestHelper.getBaseURL; import static org.assertj.core.api.BDDAssertions.then; import java.util.Map; diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/CategoryControllerTest.java b/java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/CategoryControllerTest.java similarity index 86% rename from java/src/test/java/com/amido/stacks/workloads/menu/api/v1/CategoryControllerTest.java rename to java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/CategoryControllerTest.java index 190d49ec..7c071427 100644 --- a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/CategoryControllerTest.java +++ b/java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/CategoryControllerTest.java @@ -1,24 +1,24 @@ -package com.amido.stacks.workloads.menu.api.v1; - -import static com.amido.stacks.workloads.menu.domain.CategoryHelper.createCategories; -import static com.amido.stacks.workloads.menu.domain.CategoryHelper.createCategory; -import static com.amido.stacks.workloads.menu.domain.ItemHelper.createItem; -import static com.amido.stacks.workloads.menu.domain.MenuHelper.createMenu; -import static com.amido.stacks.workloads.util.TestHelper.getBaseURL; -import static com.amido.stacks.workloads.util.TestHelper.getRequestHttpEntity; +package com.ensono.stacks.workloads.menu.api.v1; + +import static com.ensono.stacks.workloads.menu.domain.CategoryHelper.createCategories; +import static com.ensono.stacks.workloads.menu.domain.CategoryHelper.createCategory; +import static com.ensono.stacks.workloads.menu.domain.ItemHelper.createItem; +import static com.ensono.stacks.workloads.menu.domain.MenuHelper.createMenu; +import static com.ensono.stacks.workloads.util.TestHelper.getBaseURL; +import static com.ensono.stacks.workloads.util.TestHelper.getRequestHttpEntity; import static java.util.UUID.fromString; import static org.assertj.core.api.BDDAssertions.then; import static org.springframework.http.HttpStatus.BAD_REQUEST; import static org.springframework.http.HttpStatus.OK; -import com.amido.stacks.core.api.dto.ErrorResponse; -import com.amido.stacks.core.api.dto.response.ResourceCreatedResponse; -import com.amido.stacks.core.api.dto.response.ResourceUpdatedResponse; -import com.amido.stacks.workloads.menu.api.v1.dto.request.CreateCategoryRequest; -import com.amido.stacks.workloads.menu.api.v1.dto.request.UpdateCategoryRequest; -import com.amido.stacks.workloads.menu.domain.Category; -import com.amido.stacks.workloads.menu.domain.Menu; -import com.amido.stacks.workloads.menu.service.utility.MenuHelperService; +import com.ensono.stacks.core.api.dto.ErrorResponse; +import com.ensono.stacks.core.api.dto.response.ResourceCreatedResponse; +import com.ensono.stacks.core.api.dto.response.ResourceUpdatedResponse; +import com.ensono.stacks.workloads.menu.api.v1.dto.request.CreateCategoryRequest; +import com.ensono.stacks.workloads.menu.api.v1.dto.request.UpdateCategoryRequest; +import com.ensono.stacks.workloads.menu.domain.Category; +import com.ensono.stacks.workloads.menu.domain.Menu; +import com.ensono.stacks.workloads.menu.service.utility.MenuHelperService; import java.util.List; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/ItemControllerTest.java b/java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/ItemControllerTest.java similarity index 82% rename from java/src/test/java/com/amido/stacks/workloads/menu/api/v1/ItemControllerTest.java rename to java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/ItemControllerTest.java index 9f72446f..693745c6 100644 --- a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/ItemControllerTest.java +++ b/java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/ItemControllerTest.java @@ -1,25 +1,25 @@ -package com.amido.stacks.workloads.menu.api.v1; - -import static com.amido.stacks.workloads.menu.domain.CategoryHelper.createCategory; -import static com.amido.stacks.workloads.menu.domain.ItemHelper.createItem; -import static com.amido.stacks.workloads.menu.domain.ItemHelper.createItems; -import static com.amido.stacks.workloads.menu.domain.MenuHelper.createMenu; -import static com.amido.stacks.workloads.util.TestHelper.getBaseURL; -import static com.amido.stacks.workloads.util.TestHelper.getRequestHttpEntity; +package com.ensono.stacks.workloads.menu.api.v1; + +import static com.ensono.stacks.workloads.menu.domain.CategoryHelper.createCategory; +import static com.ensono.stacks.workloads.menu.domain.ItemHelper.createItem; +import static com.ensono.stacks.workloads.menu.domain.ItemHelper.createItems; +import static com.ensono.stacks.workloads.menu.domain.MenuHelper.createMenu; +import static com.ensono.stacks.workloads.util.TestHelper.getBaseURL; +import static com.ensono.stacks.workloads.util.TestHelper.getRequestHttpEntity; import static java.util.UUID.randomUUID; import static org.assertj.core.api.BDDAssertions.then; import static org.springframework.http.HttpStatus.BAD_REQUEST; import static org.springframework.http.HttpStatus.OK; -import com.amido.stacks.core.api.dto.ErrorResponse; -import com.amido.stacks.core.api.dto.response.ResourceCreatedResponse; -import com.amido.stacks.core.api.dto.response.ResourceUpdatedResponse; -import com.amido.stacks.workloads.menu.api.v1.dto.request.CreateItemRequest; -import com.amido.stacks.workloads.menu.api.v1.dto.request.UpdateItemRequest; -import com.amido.stacks.workloads.menu.domain.Category; -import com.amido.stacks.workloads.menu.domain.Item; -import com.amido.stacks.workloads.menu.domain.Menu; -import com.amido.stacks.workloads.menu.service.utility.MenuHelperService; +import com.ensono.stacks.core.api.dto.ErrorResponse; +import com.ensono.stacks.core.api.dto.response.ResourceCreatedResponse; +import com.ensono.stacks.core.api.dto.response.ResourceUpdatedResponse; +import com.ensono.stacks.workloads.menu.api.v1.dto.request.CreateItemRequest; +import com.ensono.stacks.workloads.menu.api.v1.dto.request.UpdateItemRequest; +import com.ensono.stacks.workloads.menu.domain.Category; +import com.ensono.stacks.workloads.menu.domain.Item; +import com.ensono.stacks.workloads.menu.domain.Menu; +import com.ensono.stacks.workloads.menu.service.utility.MenuHelperService; import java.util.ArrayList; import java.util.List; import java.util.UUID; diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/MenuControllerTest.java b/java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/MenuControllerTest.java similarity index 82% rename from java/src/test/java/com/amido/stacks/workloads/menu/api/v1/MenuControllerTest.java rename to java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/MenuControllerTest.java index 010a09f8..75c15178 100644 --- a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/MenuControllerTest.java +++ b/java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/MenuControllerTest.java @@ -1,30 +1,30 @@ -package com.amido.stacks.workloads.menu.api.v1; +package com.ensono.stacks.workloads.menu.api.v1; -import static com.amido.stacks.workloads.menu.domain.MenuHelper.createMenu; -import static com.amido.stacks.workloads.menu.domain.MenuHelper.createMenus; -import static com.amido.stacks.workloads.util.TestHelper.getBaseURL; -import static com.amido.stacks.workloads.util.TestHelper.getRequestHttpEntity; +import static com.ensono.stacks.workloads.menu.domain.MenuHelper.createMenu; +import static com.ensono.stacks.workloads.menu.domain.MenuHelper.createMenus; +import static com.ensono.stacks.workloads.util.TestHelper.getBaseURL; +import static com.ensono.stacks.workloads.util.TestHelper.getRequestHttpEntity; import static org.assertj.core.api.BDDAssertions.then; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.core.IsNull.notNullValue; import static org.springframework.http.HttpStatus.OK; -import com.amido.stacks.core.api.dto.response.ResourceCreatedResponse; -import com.amido.stacks.core.api.dto.response.ResourceUpdatedResponse; -import com.amido.stacks.workloads.menu.api.v1.dto.request.CreateMenuRequest; -import com.amido.stacks.workloads.menu.api.v1.dto.request.UpdateMenuRequest; -import com.amido.stacks.workloads.menu.api.v1.dto.response.MenuDTO; -import com.amido.stacks.workloads.menu.api.v1.dto.response.SearchMenuResult; -import com.amido.stacks.workloads.menu.api.v1.dto.response.SearchMenuResultItem; -import com.amido.stacks.workloads.menu.domain.Category; -import com.amido.stacks.workloads.menu.domain.Item; -import com.amido.stacks.workloads.menu.domain.Menu; -import com.amido.stacks.workloads.menu.mappers.CategoryMapper; -import com.amido.stacks.workloads.menu.mappers.ItemMapper; -import com.amido.stacks.workloads.menu.mappers.MenuMapper; -import com.amido.stacks.workloads.menu.mappers.SearchMenuResultItemMapper; -import com.amido.stacks.workloads.menu.service.utility.MenuHelperService; +import com.ensono.stacks.core.api.dto.response.ResourceCreatedResponse; +import com.ensono.stacks.core.api.dto.response.ResourceUpdatedResponse; +import com.ensono.stacks.workloads.menu.api.v1.dto.request.CreateMenuRequest; +import com.ensono.stacks.workloads.menu.api.v1.dto.request.UpdateMenuRequest; +import com.ensono.stacks.workloads.menu.api.v1.dto.response.MenuDTO; +import com.ensono.stacks.workloads.menu.api.v1.dto.response.SearchMenuResult; +import com.ensono.stacks.workloads.menu.api.v1.dto.response.SearchMenuResultItem; +import com.ensono.stacks.workloads.menu.domain.Category; +import com.ensono.stacks.workloads.menu.domain.Item; +import com.ensono.stacks.workloads.menu.domain.Menu; +import com.ensono.stacks.workloads.menu.mappers.CategoryMapper; +import com.ensono.stacks.workloads.menu.mappers.ItemMapper; +import com.ensono.stacks.workloads.menu.mappers.MenuMapper; +import com.ensono.stacks.workloads.menu.mappers.SearchMenuResultItemMapper; +import com.ensono.stacks.workloads.menu.service.utility.MenuHelperService; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/SecretsControllerTest.java b/java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/SecretsControllerTest.java similarity index 91% rename from java/src/test/java/com/amido/stacks/workloads/menu/api/v1/SecretsControllerTest.java rename to java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/SecretsControllerTest.java index 56838aa5..c9c5fee3 100644 --- a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/SecretsControllerTest.java +++ b/java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/SecretsControllerTest.java @@ -1,9 +1,9 @@ -package com.amido.stacks.workloads.menu.api.v1; +package com.ensono.stacks.workloads.menu.api.v1; import static org.assertj.core.api.BDDAssertions.then; -import com.amido.stacks.workloads.Application; -import com.amido.stacks.workloads.util.TestHelper; +import com.ensono.stacks.workloads.Application; +import com.ensono.stacks.workloads.util.TestHelper; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/dto/response/CategoryDTOTest.java b/java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/CategoryDTOTest.java similarity index 81% rename from java/src/test/java/com/amido/stacks/workloads/menu/api/v1/dto/response/CategoryDTOTest.java rename to java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/CategoryDTOTest.java index 471eef09..87fac688 100644 --- a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/dto/response/CategoryDTOTest.java +++ b/java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/CategoryDTOTest.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.api.v1.dto.response; +package com.ensono.stacks.workloads.menu.api.v1.dto.response; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Tag; diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/dto/response/ItemDTOTest.java b/java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/ItemDTOTest.java similarity index 81% rename from java/src/test/java/com/amido/stacks/workloads/menu/api/v1/dto/response/ItemDTOTest.java rename to java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/ItemDTOTest.java index 3e56f9cc..df750d57 100644 --- a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/dto/response/ItemDTOTest.java +++ b/java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/ItemDTOTest.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.api.v1.dto.response; +package com.ensono.stacks.workloads.menu.api.v1.dto.response; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Tag; diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/dto/response/MenuDTOTest.java b/java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/MenuDTOTest.java similarity index 81% rename from java/src/test/java/com/amido/stacks/workloads/menu/api/v1/dto/response/MenuDTOTest.java rename to java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/MenuDTOTest.java index c182b819..ca1a9499 100644 --- a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/dto/response/MenuDTOTest.java +++ b/java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/MenuDTOTest.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.api.v1.dto.response; +package com.ensono.stacks.workloads.menu.api.v1.dto.response; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Tag; diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultItemTest.java b/java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultItemTest.java similarity index 81% rename from java/src/test/java/com/amido/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultItemTest.java rename to java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultItemTest.java index 1e1d7079..54a7c230 100644 --- a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultItemTest.java +++ b/java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultItemTest.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.api.v1.dto.response; +package com.ensono.stacks.workloads.menu.api.v1.dto.response; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Tag; diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultTest.java b/java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultTest.java similarity index 81% rename from java/src/test/java/com/amido/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultTest.java rename to java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultTest.java index 3d847a14..eaaedd77 100644 --- a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultTest.java +++ b/java/src/test/java/com/ensono/stacks/workloads/menu/api/v1/dto/response/SearchMenuResultTest.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.api.v1.dto.response; +package com.ensono.stacks.workloads.menu.api.v1.dto.response; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Tag; diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/api/v2/MenuControllerV2Test.java b/java/src/test/java/com/ensono/stacks/workloads/menu/api/v2/MenuControllerV2Test.java similarity index 78% rename from java/src/test/java/com/amido/stacks/workloads/menu/api/v2/MenuControllerV2Test.java rename to java/src/test/java/com/ensono/stacks/workloads/menu/api/v2/MenuControllerV2Test.java index c07c397b..d968e807 100644 --- a/java/src/test/java/com/amido/stacks/workloads/menu/api/v2/MenuControllerV2Test.java +++ b/java/src/test/java/com/ensono/stacks/workloads/menu/api/v2/MenuControllerV2Test.java @@ -1,12 +1,12 @@ -package com.amido.stacks.workloads.menu.api.v2; +package com.ensono.stacks.workloads.menu.api.v2; -import static com.amido.stacks.workloads.menu.domain.MenuHelper.createMenu; -import static com.amido.stacks.workloads.util.TestHelper.getBaseURL; +import static com.ensono.stacks.workloads.menu.domain.MenuHelper.createMenu; +import static com.ensono.stacks.workloads.util.TestHelper.getBaseURL; import static org.assertj.core.api.BDDAssertions.then; -import com.amido.stacks.workloads.menu.api.v1.dto.response.MenuDTO; -import com.amido.stacks.workloads.menu.domain.Menu; -import com.amido.stacks.workloads.menu.mappers.MenuMapper; +import com.ensono.stacks.workloads.menu.api.v1.dto.response.MenuDTO; +import com.ensono.stacks.workloads.menu.domain.Menu; +import com.ensono.stacks.workloads.menu.mappers.MenuMapper; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/domain/CategoryHelper.java b/java/src/test/java/com/ensono/stacks/workloads/menu/domain/CategoryHelper.java similarity index 92% rename from java/src/test/java/com/amido/stacks/workloads/menu/domain/CategoryHelper.java rename to java/src/test/java/com/ensono/stacks/workloads/menu/domain/CategoryHelper.java index 64c02315..2a73541c 100644 --- a/java/src/test/java/com/amido/stacks/workloads/menu/domain/CategoryHelper.java +++ b/java/src/test/java/com/ensono/stacks/workloads/menu/domain/CategoryHelper.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.domain; +package com.ensono.stacks.workloads.menu.domain; import java.util.ArrayList; import java.util.List; diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/domain/ItemHelper.java b/java/src/test/java/com/ensono/stacks/workloads/menu/domain/ItemHelper.java similarity index 91% rename from java/src/test/java/com/amido/stacks/workloads/menu/domain/ItemHelper.java rename to java/src/test/java/com/ensono/stacks/workloads/menu/domain/ItemHelper.java index 3543dd57..32b67e25 100644 --- a/java/src/test/java/com/amido/stacks/workloads/menu/domain/ItemHelper.java +++ b/java/src/test/java/com/ensono/stacks/workloads/menu/domain/ItemHelper.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.domain; +package com.ensono.stacks.workloads.menu.domain; import java.util.ArrayList; import java.util.List; diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/domain/MenuHelper.java b/java/src/test/java/com/ensono/stacks/workloads/menu/domain/MenuHelper.java similarity index 92% rename from java/src/test/java/com/amido/stacks/workloads/menu/domain/MenuHelper.java rename to java/src/test/java/com/ensono/stacks/workloads/menu/domain/MenuHelper.java index c1a179bd..b7e7d5a9 100644 --- a/java/src/test/java/com/amido/stacks/workloads/menu/domain/MenuHelper.java +++ b/java/src/test/java/com/ensono/stacks/workloads/menu/domain/MenuHelper.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.domain; +package com.ensono.stacks.workloads.menu.domain; import java.util.ArrayList; import java.util.List; diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/domain/MenuTest.java b/java/src/test/java/com/ensono/stacks/workloads/menu/domain/MenuTest.java similarity index 94% rename from java/src/test/java/com/amido/stacks/workloads/menu/domain/MenuTest.java rename to java/src/test/java/com/ensono/stacks/workloads/menu/domain/MenuTest.java index 41b7602e..b5db0064 100644 --- a/java/src/test/java/com/amido/stacks/workloads/menu/domain/MenuTest.java +++ b/java/src/test/java/com/ensono/stacks/workloads/menu/domain/MenuTest.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.menu.domain; +package com.ensono.stacks.workloads.menu.domain; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/mappers/DomainToDtoMapperMapstructTest.java b/java/src/test/java/com/ensono/stacks/workloads/menu/mappers/DomainToDtoMapperMapstructTest.java similarity index 91% rename from java/src/test/java/com/amido/stacks/workloads/menu/mappers/DomainToDtoMapperMapstructTest.java rename to java/src/test/java/com/ensono/stacks/workloads/menu/mappers/DomainToDtoMapperMapstructTest.java index 9b4a573b..cb076b7e 100644 --- a/java/src/test/java/com/amido/stacks/workloads/menu/mappers/DomainToDtoMapperMapstructTest.java +++ b/java/src/test/java/com/ensono/stacks/workloads/menu/mappers/DomainToDtoMapperMapstructTest.java @@ -1,15 +1,15 @@ -package com.amido.stacks.workloads.menu.mappers; +package com.ensono.stacks.workloads.menu.mappers; import static java.util.UUID.randomUUID; import static org.assertj.core.api.Assertions.assertThat; -import com.amido.stacks.workloads.menu.api.v1.dto.response.CategoryDTO; -import com.amido.stacks.workloads.menu.api.v1.dto.response.ItemDTO; -import com.amido.stacks.workloads.menu.api.v1.dto.response.MenuDTO; -import com.amido.stacks.workloads.menu.api.v1.dto.response.SearchMenuResultItem; -import com.amido.stacks.workloads.menu.domain.Category; -import com.amido.stacks.workloads.menu.domain.Item; -import com.amido.stacks.workloads.menu.domain.Menu; +import com.ensono.stacks.workloads.menu.api.v1.dto.response.CategoryDTO; +import com.ensono.stacks.workloads.menu.api.v1.dto.response.ItemDTO; +import com.ensono.stacks.workloads.menu.api.v1.dto.response.MenuDTO; +import com.ensono.stacks.workloads.menu.api.v1.dto.response.SearchMenuResultItem; +import com.ensono.stacks.workloads.menu.domain.Category; +import com.ensono.stacks.workloads.menu.domain.Item; +import com.ensono.stacks.workloads.menu.domain.Menu; import java.util.Arrays; import java.util.Collections; import java.util.UUID; diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/service/utility/MenuHelperServiceTest.java b/java/src/test/java/com/ensono/stacks/workloads/menu/service/utility/MenuHelperServiceTest.java similarity index 85% rename from java/src/test/java/com/amido/stacks/workloads/menu/service/utility/MenuHelperServiceTest.java rename to java/src/test/java/com/ensono/stacks/workloads/menu/service/utility/MenuHelperServiceTest.java index 3217bee9..49ad0e1c 100644 --- a/java/src/test/java/com/amido/stacks/workloads/menu/service/utility/MenuHelperServiceTest.java +++ b/java/src/test/java/com/ensono/stacks/workloads/menu/service/utility/MenuHelperServiceTest.java @@ -1,11 +1,11 @@ -package com.amido.stacks.workloads.menu.service.utility; +package com.ensono.stacks.workloads.menu.service.utility; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import com.amido.stacks.workloads.menu.domain.Category; -import com.amido.stacks.workloads.menu.domain.Item; -import com.amido.stacks.workloads.menu.domain.Menu; +import com.ensono.stacks.workloads.menu.domain.Category; +import com.ensono.stacks.workloads.menu.domain.Item; +import com.ensono.stacks.workloads.menu.domain.Menu; import java.util.UUID; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/java/src/test/java/com/amido/stacks/workloads/util/TestHelper.java b/java/src/test/java/com/ensono/stacks/workloads/util/TestHelper.java similarity index 91% rename from java/src/test/java/com/amido/stacks/workloads/util/TestHelper.java rename to java/src/test/java/com/ensono/stacks/workloads/util/TestHelper.java index 5cf39bd4..3713a0ac 100644 --- a/java/src/test/java/com/amido/stacks/workloads/util/TestHelper.java +++ b/java/src/test/java/com/ensono/stacks/workloads/util/TestHelper.java @@ -1,4 +1,4 @@ -package com.amido.stacks.workloads.util; +package com.ensono.stacks.workloads.util; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType;