diff --git a/Dockerfile b/Dockerfile index ddc186ce..d8ec44c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,2 @@ -FROM openjdk:11-slim-buster +FROM openjdk:21-slim-buster WORKDIR /app diff --git a/Makefile b/Makefile index 8a8aff21..0f7981e5 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ run-tests: .PHONY: test test: - @docker exec codelytv-ddd_skeleton-java ./gradlew test --warning-mode all + @docker exec codelytv-ddd_example-java ./gradlew test --warning-mode all .PHONY: run run: @@ -23,13 +23,13 @@ run: .PHONY: ping-mysql ping-mysql: - @docker exec codelytv-java_ddd_skeleton-mysql mysqladmin --user=root --password= --host "127.0.0.1" ping --silent + @docker exec codelytv-java_ddd_example-mysql mysqladmin --user=root --password= --host "127.0.0.1" ping --silent # Start the app .PHONY: start-mooc_backend start-mooc_backend: - @./gradlew :run --args='mooc_backend server' + @./gradlew bootRun --args='mooc_backend server' .PHONY: start-backoffice_frontend start-backoffice_frontend: - @./gradlew :run --args='backoffice_frontend server' + @./gradlew bootRun --args='backoffice_frontend server' diff --git a/README.md b/README.md index 81f71e44..6c6bb260 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ☕🚀 Java DDD Skeleton: Save the boilerplate in your new projects +# ☕🚀 Java DDD example: Save the boilerplate in your new projects @@ -6,7 +6,7 @@ > ⚡ Start your Java projects as fast as possible [![CodelyTV](https://img.shields.io/badge/codely-tv-green.svg?style=flat-square)](https://codely.tv) -[![CI pipeline status](https://github.com/CodelyTV/java-ddd-skeleton/workflows/CI/badge.svg)](https://github.com/CodelyTV/java-ddd-skeleton/actions) +[![CI pipeline status](https://github.com/CodelyTV/java-ddd-example/workflows/CI/badge.svg)](https://github.com/CodelyTV/java-ddd-example/actions) ## ℹī¸ Introduction @@ -18,7 +18,7 @@ Here you have the [course on CodelyTV Pro where we explain step by step all this 1. Install Java 11: `brew cask install corretto` 2. Set it as your default JVM: `export JAVA_HOME='/Library/Java/JavaVirtualMachines/amazon-corretto-11.jdk/Contents/Home'` -3. Clone this repository: `git clone https://github.com/CodelyTV/java-ddd-skeleton`. +3. Clone this repository: `git clone https://github.com/CodelyTV/java-ddd-example`. 4. Bring up the Docker environment: `make up`. 5. Execute some [Gradle lifecycle tasks](https://docs.gradle.org/current/userguide/java_plugin.html#lifecycle_tasks) in order to check everything is OK: 1. Create [the project JAR](https://docs.gradle.org/current/userguide/java_plugin.html#sec:jar): `make build` @@ -33,20 +33,20 @@ Here you have the [course on CodelyTV Pro where we explain step by step all this ### ☕ Java -* 📂 [Java Basic Skeleton](https://github.com/CodelyTV/java-basic-skeleton) +* 📂 [Java Basic example](https://github.com/CodelyTV/java-basic-example) * ⚛ [Java OOP Examples](https://github.com/CodelyTV/java-oop-examples) * 🧱 [Java SOLID Examples](https://github.com/CodelyTV/java-solid-examples) * đŸĨĻ [Java DDD Example](https://github.com/CodelyTV/java-ddd-example) ### 🐘 PHP -* 📂 [PHP Basic Skeleton](https://github.com/CodelyTV/php-basic-skeleton) -* 🎩 [PHP DDD Skeleton](https://github.com/CodelyTV/php-ddd-skeleton) +* 📂 [PHP Basic example](https://github.com/CodelyTV/php-basic-example) +* 🎩 [PHP DDD example](https://github.com/CodelyTV/php-ddd-example) * đŸĨĻ [PHP DDD Example](https://github.com/CodelyTV/php-ddd-example) ### đŸ§Ŧ Scala -* 📂 [Scala Basic Skeleton](https://github.com/CodelyTV/scala-basic-skeleton) -* ⚡ [Scala Basic Skeleton (g8 template)](https://github.com/CodelyTV/scala-basic-skeleton.g8) +* 📂 [Scala Basic example](https://github.com/CodelyTV/scala-basic-example) +* ⚡ [Scala Basic example (g8 template)](https://github.com/CodelyTV/scala-basic-example.g8) * ⚛ [Scala Examples](https://github.com/CodelyTV/scala-examples) * đŸĨĻ [Scala DDD Example](https://github.com/CodelyTV/scala-ddd-example) diff --git a/apps/main/resources/.env b/apps/main/resources/.env index d707f952..ac2f8345 100644 --- a/apps/main/resources/.env +++ b/apps/main/resources/.env @@ -2,7 +2,7 @@ #--------------------------------# MOOC_BACKEND_SERVER_PORT=8081 # MySql -MOOC_DATABASE_HOST=codelytv-java_ddd_skeleton-mysql +MOOC_DATABASE_HOST=codelytv-java_ddd_example-mysql MOOC_DATABASE_PORT=3306 MOOC_DATABASE_NAME=mooc MOOC_DATABASE_USER=root @@ -13,20 +13,20 @@ MOOC_DATABASE_PASSWORD= BACKOFFICE_FRONTEND_SERVER_PORT=8090 BACKOFFICE_BACKEND_SERVER_PORT=8091 # MySql -BACKOFFICE_DATABASE_HOST=codelytv-java_ddd_skeleton-mysql +BACKOFFICE_DATABASE_HOST=codelytv-java_ddd_example-mysql BACKOFFICE_DATABASE_PORT=3306 BACKOFFICE_DATABASE_NAME=backoffice BACKOFFICE_DATABASE_USER=root BACKOFFICE_DATABASE_PASSWORD= # Elasticsearch -BACKOFFICE_ELASTICSEARCH_HOST=codelytv-java_ddd_skeleton-elasticsearch +BACKOFFICE_ELASTICSEARCH_HOST=codelytv-java_ddd_example-elasticsearch BACKOFFICE_ELASTICSEARCH_PORT=9200 BACKOFFICE_ELASTICSEARCH_INDEX_PREFIX=backoffice # COMMON # #--------------------------------# # RabbitMQ -RABBITMQ_HOST=codelytv-java_ddd_skeleton-rabbitmq +RABBITMQ_HOST=codelytv-java_ddd_example-rabbitmq RABBITMQ_PORT=5672 RABBITMQ_LOGIN=codelytv RABBITMQ_PASSWORD=c0d3ly diff --git a/apps/main/resources/log4j2.properties b/apps/main/resources/log4j2.properties index 92d82aef..b5775417 100644 --- a/apps/main/resources/log4j2.properties +++ b/apps/main/resources/log4j2.properties @@ -1,4 +1,4 @@ -name = CodelyTvJavaDddSkeleton +name = CodelyTvJavaDddExample property.filename = logs appenders = console, file @@ -16,7 +16,7 @@ appender.console.logstash.stackTraceEnabled = true appender.file.type = File appender.file.name = LOGFILE -appender.file.fileName = var/log/java-ddd-skeleton.log +appender.file.fileName = var/log/java-ddd-example.log appender.file.logstash.type = LogstashLayout appender.file.logstash.dateTimeFormatPattern = yyyy-MM-dd'T'HH:mm:ss.SSSZZZ appender.file.logstash.eventTemplateUri = classpath:LogstashJsonEventLayoutV1.json @@ -24,7 +24,7 @@ appender.file.logstash.prettyPrintEnabled = false appender.file.logstash.stackTraceEnabled = true loggers = file -logger.file.name = tv.codely.java_ddd_skeleton +logger.file.name = tv.codely.java_ddd_example logger.file.level = info logger.file.appenderRefs = file logger.file.appenderRef.file.ref = LOGFILE diff --git a/apps/main/tv/codely/apps/backoffice/backend/middleware/BasicHttpAuthMiddleware.java b/apps/main/tv/codely/apps/backoffice/backend/middleware/BasicHttpAuthMiddleware.java index 0dc5ac43..268539c5 100644 --- a/apps/main/tv/codely/apps/backoffice/backend/middleware/BasicHttpAuthMiddleware.java +++ b/apps/main/tv/codely/apps/backoffice/backend/middleware/BasicHttpAuthMiddleware.java @@ -6,9 +6,9 @@ import tv.codely.shared.domain.bus.command.CommandBus; import tv.codely.shared.domain.bus.command.CommandHandlerExecutionError; -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Base64; diff --git a/apps/main/tv/codely/apps/mooc/backend/config/MoocBackendServerConfiguration.java b/apps/main/tv/codely/apps/mooc/backend/config/MoocBackendServerConfiguration.java index c5a2b577..f5c6ef6b 100644 --- a/apps/main/tv/codely/apps/mooc/backend/config/MoocBackendServerConfiguration.java +++ b/apps/main/tv/codely/apps/mooc/backend/config/MoocBackendServerConfiguration.java @@ -15,7 +15,7 @@ public MoocBackendServerConfiguration(RequestMappingHandlerMapping mapping) { } @Bean - public FilterRegistrationBean basicHttpAuthMiddleware() { + public FilterRegistrationBean apiExceptionMiddleware() { FilterRegistrationBean registrationBean = new FilterRegistrationBean<>(); registrationBean.setFilter(new ApiExceptionMiddleware(mapping)); diff --git a/apps/test/resources/log4j2.properties b/apps/test/resources/log4j2.properties index a0e4b7ec..98427f22 100644 --- a/apps/test/resources/log4j2.properties +++ b/apps/test/resources/log4j2.properties @@ -1,4 +1,4 @@ -name = CodelyTvJavaDddSkeleton +name = CodelyTvJavaDddExample property.filename = logs appenders = console, file @@ -15,7 +15,7 @@ appender.console.filter.threshold.level = info appender.file.type = File appender.file.name = LOGFILE -appender.file.fileName = var/log/java-ddd-skeleton-test.log +appender.file.fileName = var/log/java-ddd-example-test.log appender.file.logstash.type = LogstashLayout appender.file.logstash.dateTimeFormatPattern = yyyy-MM-dd'T'HH:mm:ss.SSSZZZ appender.file.logstash.eventTemplateUri = classpath:LogstashJsonEventLayoutV1.json @@ -23,7 +23,7 @@ appender.file.logstash.prettyPrintEnabled = false appender.file.logstash.stackTraceEnabled = true loggers = file -logger.file.name = tv.codely.java_ddd_skeleton +logger.file.name = tv.codely.java_ddd_example logger.file.level = info logger.file.appenderRefs = file logger.file.appenderRef.file.ref = LOGFILE diff --git a/apps/test/tv/codely/apps/ApplicationTestCase.java b/apps/test/tv/codely/apps/ApplicationTestCase.java index b1096cc0..c61f3cde 100644 --- a/apps/test/tv/codely/apps/ApplicationTestCase.java +++ b/apps/test/tv/codely/apps/ApplicationTestCase.java @@ -1,12 +1,10 @@ package tv.codely.apps; -import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.ResultMatcher; import tv.codely.shared.domain.bus.event.DomainEvent; @@ -20,7 +18,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@RunWith(SpringRunner.class) @SpringBootTest @AutoConfigureMockMvc public abstract class ApplicationTestCase { diff --git a/build.gradle b/build.gradle index e9571e95..78b66e56 100644 --- a/build.gradle +++ b/build.gradle @@ -1,151 +1,151 @@ // Common for all projects allprojects { - apply plugin: 'java' - apply plugin: 'io.spring.dependency-management' - apply plugin: 'org.springframework.boot' - - sourceCompatibility = 11 - targetCompatibility = 11 - - repositories { - mavenCentral() - maven { url 'https://repo.spring.io/milestone' } - } - - ext { - set('springCloudVersion', "Hoxton.M3") - } - - ext { - set('elasticsearch.version', '6.8.4') - } - - dependencies { - // Prod - implementation 'org.apache.logging.log4j:log4j-core:2.12.1' - implementation 'org.apache.logging.log4j:log4j-api:2.12.1' - implementation 'com.vlkan.log4j2:log4j2-logstash-layout:0.21' - implementation 'io.github.cdimascio:java-dotenv:5.1.3' - - implementation 'org.hibernate:hibernate-core:5.4.9.Final' - implementation 'org.springframework:spring-orm:5.2.2.RELEASE' - implementation 'org.apache.tomcat:tomcat-dbcp:9.0.29' - implementation 'com.sun.xml.bind:jaxb-impl:2.3.2' - implementation 'javax.xml.bind:jaxb-api:2.3.1' - implementation 'org.springframework:spring-context-support:5.2.1.RELEASE' - implementation 'org.freemarker:freemarker-gae:2.3.29' - implementation 'org.reflections:reflections:0.9.11' - implementation 'org.springframework.boot:spring-boot-starter-amqp' - implementation 'org.elasticsearch.client:elasticsearch-rest-client:6.8.5' - implementation 'org.elasticsearch.client:elasticsearch-rest-high-level-client:6.8.4' - implementation 'mysql:mysql-connector-java:8.0.18' - - // Test - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2' - testImplementation 'org.mockito:mockito-core:2.+' - testImplementation 'com.github.javafaker:javafaker:1.0.1' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.2' - } - - dependencyManagement { - imports { - mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}" + apply plugin: 'java' + apply plugin: 'io.spring.dependency-management' + apply plugin: 'org.springframework.boot' + + java { + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } - } - test { - useJUnitPlatform() + repositories { + mavenCentral() + maven { url 'https://repo.spring.io/milestone' } + } - testLogging { - events "passed", "skipped", "failed" + ext { + set('springCloudVersion', "Hoxton.M3") + set('elasticsearchVersion', '6.8.4') } - } + dependencies { + // Prod + implementation 'org.apache.logging.log4j:log4j-core:2.21.1' + implementation 'org.apache.logging.log4j:log4j-api:2.21.1' + implementation 'com.vlkan.log4j2:log4j2-logstash-layout:1.0.5' + implementation 'io.github.cdimascio:dotenv-java:3.0.0' + implementation 'org.hibernate.orm:hibernate-core:6.3.1.Final' + implementation 'jakarta.persistence:jakarta.persistence-api:3.2.0-B01' + implementation 'org.springframework:spring-orm:6.0.13' + implementation 'org.springframework:spring-context-support:6.0.13' + implementation 'org.apache.tomcat:tomcat-dbcp:10.1.15' + implementation 'com.sun.xml.bind:jaxb-impl:4.0.4' + implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1' + implementation 'org.freemarker:freemarker-gae:2.3.32' + implementation 'org.reflections:reflections:0.10.2' + implementation 'com.google.guava:guava:31.0.1-jre' + implementation 'org.springframework.boot:spring-boot-starter-amqp' + implementation "org.elasticsearch.client:elasticsearch-rest-client:${elasticsearchVersion}" + implementation "org.elasticsearch.client:elasticsearch-rest-high-level-client:${elasticsearchVersion}" + implementation 'com.mysql:mysql-connector-j:8.1.0' + + + // Test + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2' + testImplementation 'org.mockito:mockito-core:3.3.3' + testImplementation 'com.github.javafaker:javafaker:1.0.1' + testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.5.2' + } - task view_paths { - doLast { task -> - println "$task.project.name" - println "------------------" - println "Main: $sourceSets.main.java.srcDirTrees" - println " Resources: $sourceSets.main.resources.srcDirTrees" - println "Tests: $sourceSets.test.java.srcDirTrees" - println " Resources: $sourceSets.test.resources.srcDirTrees" + dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}" + } } - } -} -// All subprojects (located in src/*) -subprojects { - group = "tv.codely.${rootProject.name}" + test { + useJUnitPlatform() - sourceSets { - main { - java { srcDirs = ['main'] } - resources { srcDirs = ['main/resources'] } + testLogging { + events "passed", "skipped", "failed" + } } - test { - java { srcDirs = ['test'] } - resources { srcDirs = ['test/resources'] } + task view_paths { + doLast { task -> + println "$task.project.name" + println "------------------" + println "Main: $sourceSets.main.java.srcDirTrees" + println " Resources: $sourceSets.main.resources.srcDirTrees" + println "Tests: $sourceSets.test.java.srcDirTrees" + println " Resources: $sourceSets.test.resources.srcDirTrees" + } } - } +} - dependencies { - implementation 'org.springframework.boot:spring-boot-starter-web:2.1.8.RELEASE' +// All subprojects (located in src/*) +subprojects { + group = "tv.codely.${rootProject.name}" + + sourceSets { + main { + java { srcDirs = ['main'] } + resources { srcDirs = ['main/resources'] } + } + + test { + java { srcDirs = ['test'] } + resources { srcDirs = ['test/resources'] } + } + } - testImplementation rootProject.sourceSets.main.output - testImplementation 'org.springframework.boot:spring-boot-starter-test:2.2.1.RELEASE' + dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web:3.1.5' - if (project.name != "shared") { - implementation project(":shared") - testImplementation project(":shared").sourceSets.test.output + testImplementation rootProject.sourceSets.main.output + testImplementation 'org.springframework.boot:spring-boot-starter-test:3.1.5' + + if (project.name != "shared") { + implementation project(":shared") + testImplementation project(":shared").sourceSets.test.output + } } - } - bootJar { - enabled = false - } + bootJar { + enabled = false + } - jar { - enabled = true - } + jar { + enabled = true + } } // Main project (located in apps/) buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath('org.springframework.boot:spring-boot-gradle-plugin:2.2.1.RELEASE') - } + repositories { + mavenCentral() + } + dependencies { + classpath('org.springframework.boot:spring-boot-gradle-plugin:3.1.5') + } } sourceSets { - main { - java { srcDirs = ['apps/main'] } - resources { srcDirs = ['apps/main/resources'] } - } - - test { - java { srcDirs = ['apps/test'] } - resources { srcDirs = ['apps/test/resources'] } - } + main { + java { srcDirs = ['apps/main'] } + resources { srcDirs = ['apps/main/resources'] } + } + + test { + java { srcDirs = ['apps/test'] } + resources { srcDirs = ['apps/test/resources'] } + } } bootJar { - baseName = 'java-ddd-skeleton' - version = '0.0.1' + archiveBaseName.set('java-ddd-example') + archiveVersion.set('0.0.1') + duplicatesStrategy = DuplicatesStrategy.EXCLUDE } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-web:2.1.8.RELEASE' - - implementation project(":shared") - implementation project(":backoffice") - implementation project(":mooc") + implementation 'org.springframework.boot:spring-boot-starter-web:3.1.5' - testImplementation 'org.springframework.boot:spring-boot-starter-test:2.1.8.RELEASE' - testImplementation project(":shared").sourceSets.test.output -} + implementation project(":shared") + implementation project(":backoffice") + implementation project(":mooc") + testImplementation 'org.springframework.boot:spring-boot-starter-test:3.1.5' + testImplementation project(":shared").sourceSets.test.output +} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 5e75784e..4d6015c0 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,11 +2,11 @@ version: '3' services: mysql: - container_name: codelytv-java_ddd_skeleton-mysql + container_name: codelytv-java_ddd_example-mysql image: mysql:8 platform: linux/amd64 ports: - - "3360:3306" + - "3306:3306" environment: - MYSQL_ROOT_PASSWORD= - MYSQL_ALLOW_EMPTY_PASSWORD=yes @@ -18,30 +18,30 @@ services: command: ["--default-authentication-plugin=mysql_native_password"] rabbitmq: - container_name: codelytv-java_ddd_skeleton-rabbitmq + container_name: codelytv-java_ddd_example-rabbitmq image: 'rabbitmq:3.7-management' platform: linux/amd64 restart: unless-stopped ports: - - 5630:5672 - - 8090:15672 + - "5630:5672" + - "8090:15672" environment: - RABBITMQ_DEFAULT_USER=codelytv - RABBITMQ_DEFAULT_PASS=c0d3ly elasticsearch: - container_name: codelytv-java_ddd_skeleton-elasticsearch + container_name: codelytv-java_ddd_example-elasticsearch image: 'elasticsearch:6.8.4' platform: linux/amd64 restart: unless-stopped ports: - - 9300:9300 - - 9200:9200 + - "9300:9300" + - "9200:9200" environment: - discovery.type=single-node java: - container_name: codelytv-ddd_skeleton-java + container_name: codelytv-ddd_example-java build: context: . dockerfile: Dockerfile diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927a..7f93135c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb879..3fa8f862 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c7873..1aa94a42 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd32..93e3f59f 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle b/settings.gradle index 9a60d80a..4823818f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -rootProject.name = 'java-ddd-skeleton' +rootProject.name = 'java-ddd-example' include ':shared' project(':shared').projectDir = new File('src/shared') diff --git a/src/backoffice/test/tv/codely/backoffice/courses/infrastructure/persistence/MySqlBackofficeCourseRepositoryShould.java b/src/backoffice/test/tv/codely/backoffice/courses/infrastructure/persistence/MySqlBackofficeCourseRepositoryShould.java index d2cf1645..8d9d5ce5 100644 --- a/src/backoffice/test/tv/codely/backoffice/courses/infrastructure/persistence/MySqlBackofficeCourseRepositoryShould.java +++ b/src/backoffice/test/tv/codely/backoffice/courses/infrastructure/persistence/MySqlBackofficeCourseRepositoryShould.java @@ -10,7 +10,7 @@ import tv.codely.backoffice.courses.domain.BackofficeCourseRepository; import tv.codely.shared.domain.criteria.Criteria; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import java.util.Arrays; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/mooc/test/tv/codely/mooc/courses/infrastructure/persistence/MySqlCourseRepositoryShould.java b/src/mooc/test/tv/codely/mooc/courses/infrastructure/persistence/MySqlCourseRepositoryShould.java index c51f1fc4..45b8a1bb 100644 --- a/src/mooc/test/tv/codely/mooc/courses/infrastructure/persistence/MySqlCourseRepositoryShould.java +++ b/src/mooc/test/tv/codely/mooc/courses/infrastructure/persistence/MySqlCourseRepositoryShould.java @@ -6,7 +6,7 @@ import tv.codely.mooc.courses.domain.CourseIdMother; import tv.codely.mooc.courses.domain.CourseMother; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/mooc/test/tv/codely/mooc/courses_counter/application/find/FindCoursesCounterQueryHandlerShould.java b/src/mooc/test/tv/codely/mooc/courses_counter/application/find/FindCoursesCounterQueryHandlerShould.java index 9fa4a65f..1065514d 100644 --- a/src/mooc/test/tv/codely/mooc/courses_counter/application/find/FindCoursesCounterQueryHandlerShould.java +++ b/src/mooc/test/tv/codely/mooc/courses_counter/application/find/FindCoursesCounterQueryHandlerShould.java @@ -7,7 +7,7 @@ import tv.codely.mooc.courses_counter.domain.CoursesCounterMother; import tv.codely.mooc.courses_counter.domain.CoursesCounterNotInitialized; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; final class FindCoursesCounterQueryHandlerShould extends CoursesCounterModuleUnitTestCase { diff --git a/src/mooc/test/tv/codely/mooc/courses_counter/infrastructure/persistence/MySqlCoursesCounterRepositoryShould.java b/src/mooc/test/tv/codely/mooc/courses_counter/infrastructure/persistence/MySqlCoursesCounterRepositoryShould.java index 9ac97f49..fabdfe8d 100644 --- a/src/mooc/test/tv/codely/mooc/courses_counter/infrastructure/persistence/MySqlCoursesCounterRepositoryShould.java +++ b/src/mooc/test/tv/codely/mooc/courses_counter/infrastructure/persistence/MySqlCoursesCounterRepositoryShould.java @@ -5,10 +5,10 @@ import tv.codely.mooc.courses_counter.domain.CoursesCounter; import tv.codely.mooc.courses_counter.domain.CoursesCounterMother; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import java.util.Optional; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; @Transactional class MySqlCoursesCounterRepositoryShould extends CoursesCounterModuleInfrastructureTestCase { diff --git a/src/mooc/test/tv/codely/mooc/shared/infrastructure/bus/event/mysql/MySqlEventBusShould.java b/src/mooc/test/tv/codely/mooc/shared/infrastructure/bus/event/mysql/MySqlEventBusShould.java index 6c236b1f..17dc7035 100644 --- a/src/mooc/test/tv/codely/mooc/shared/infrastructure/bus/event/mysql/MySqlEventBusShould.java +++ b/src/mooc/test/tv/codely/mooc/shared/infrastructure/bus/event/mysql/MySqlEventBusShould.java @@ -8,7 +8,7 @@ import tv.codely.shared.infrastructure.bus.event.mysql.MySqlDomainEventsConsumer; import tv.codely.shared.infrastructure.bus.event.mysql.MySqlEventBus; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import java.util.Collections; @Transactional diff --git a/src/mooc/test/tv/codely/mooc/shared/infrastructure/bus/event/rabbitmq/RabbitMqEventBusShould.java b/src/mooc/test/tv/codely/mooc/shared/infrastructure/bus/event/rabbitmq/RabbitMqEventBusShould.java index d2902575..e5592563 100644 --- a/src/mooc/test/tv/codely/mooc/shared/infrastructure/bus/event/rabbitmq/RabbitMqEventBusShould.java +++ b/src/mooc/test/tv/codely/mooc/shared/infrastructure/bus/event/rabbitmq/RabbitMqEventBusShould.java @@ -14,7 +14,7 @@ import java.util.Collections; import java.util.HashMap; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class RabbitMqEventBusShould extends MoocContextInfrastructureTestCase { @Autowired diff --git a/src/mooc/test/tv/codely/mooc/steps/infrastructure/persistence/MySqlStepRepositoryShould.java b/src/mooc/test/tv/codely/mooc/steps/infrastructure/persistence/MySqlStepRepositoryShould.java index e304dbcf..88c684e5 100644 --- a/src/mooc/test/tv/codely/mooc/steps/infrastructure/persistence/MySqlStepRepositoryShould.java +++ b/src/mooc/test/tv/codely/mooc/steps/infrastructure/persistence/MySqlStepRepositoryShould.java @@ -7,7 +7,7 @@ import tv.codely.mooc.steps.domain.challenge.ChallengeStepMother; import tv.codely.mooc.steps.domain.video.VideoStepMother; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import java.util.Arrays; import java.util.List; import java.util.Optional; diff --git a/src/shared/main/tv/codely/shared/infrastructure/bus/event/mysql/MySqlDomainEventsConsumer.java b/src/shared/main/tv/codely/shared/infrastructure/bus/event/mysql/MySqlDomainEventsConsumer.java index 69b12328..263da44c 100644 --- a/src/shared/main/tv/codely/shared/infrastructure/bus/event/mysql/MySqlDomainEventsConsumer.java +++ b/src/shared/main/tv/codely/shared/infrastructure/bus/event/mysql/MySqlDomainEventsConsumer.java @@ -1,5 +1,6 @@ package tv.codely.shared.infrastructure.bus.event.mysql; +import jakarta.transaction.Transactional; import org.hibernate.SessionFactory; import org.hibernate.query.NativeQuery; import org.springframework.beans.factory.annotation.Qualifier; @@ -8,7 +9,6 @@ import tv.codely.shared.infrastructure.bus.event.DomainEventsInformation; import tv.codely.shared.infrastructure.bus.event.spring.SpringApplicationEventBus; -import javax.transaction.Transactional; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.sql.Timestamp; @@ -36,7 +36,7 @@ public MySqlDomainEventsConsumer( @Transactional public void consume() { while (!shouldStop) { - NativeQuery query = sessionFactory.getCurrentSession().createSQLQuery( + NativeQuery query = sessionFactory.getCurrentSession().createNativeQuery( "SELECT * FROM domain_events ORDER BY occurred_on ASC LIMIT :chunk" ); diff --git a/src/shared/main/tv/codely/shared/infrastructure/hibernate/HibernateConfigurationFactory.java b/src/shared/main/tv/codely/shared/infrastructure/hibernate/HibernateConfigurationFactory.java index 513cb389..14551810 100644 --- a/src/shared/main/tv/codely/shared/infrastructure/hibernate/HibernateConfigurationFactory.java +++ b/src/shared/main/tv/codely/shared/infrastructure/hibernate/HibernateConfigurationFactory.java @@ -13,6 +13,7 @@ import javax.sql.DataSource; import java.io.File; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.*; import java.util.stream.Collectors; @@ -67,7 +68,7 @@ public DataSource dataSource( "classpath:database/%s.sql", databaseName )); - String mysqlSentences = new Scanner(mysqlResource.getInputStream(), "UTF-8").useDelimiter("\\A").next(); + String mysqlSentences = new Scanner(mysqlResource.getInputStream(), StandardCharsets.UTF_8).useDelimiter("\\A").next(); dataSource.setConnectionInitSqls(new ArrayList<>(Arrays.asList(mysqlSentences.split(";")))); @@ -122,7 +123,8 @@ private Properties hibernateProperties() { Properties hibernateProperties = new Properties(); hibernateProperties.put(AvailableSettings.HBM2DDL_AUTO, "none"); hibernateProperties.put(AvailableSettings.SHOW_SQL, "false"); - hibernateProperties.put(AvailableSettings.DIALECT, "org.hibernate.dialect.MySQL8Dialect"); + hibernateProperties.put(AvailableSettings.DIALECT, "org.hibernate.dialect.MySQLDialect"); + hibernateProperties.put(AvailableSettings.TRANSFORM_HBM_XML, true); return hibernateProperties; } diff --git a/src/shared/main/tv/codely/shared/infrastructure/hibernate/HibernateCriteriaConverter.java b/src/shared/main/tv/codely/shared/infrastructure/hibernate/HibernateCriteriaConverter.java index f417c321..5679bbd9 100644 --- a/src/shared/main/tv/codely/shared/infrastructure/hibernate/HibernateCriteriaConverter.java +++ b/src/shared/main/tv/codely/shared/infrastructure/hibernate/HibernateCriteriaConverter.java @@ -1,17 +1,17 @@ package tv.codely.shared.infrastructure.hibernate; +import jakarta.persistence.criteria.*; import tv.codely.shared.domain.criteria.Criteria; import tv.codely.shared.domain.criteria.Filter; import tv.codely.shared.domain.criteria.FilterOperator; -import javax.persistence.criteria.*; import java.util.HashMap; import java.util.List; import java.util.function.BiFunction; import java.util.stream.Collectors; public final class HibernateCriteriaConverter { - private final CriteriaBuilder builder; + private final CriteriaBuilder builder; private final HashMap, Predicate>> predicateTransformers = new HashMap, Predicate>>() {{ put(FilterOperator.EQUAL, HibernateCriteriaConverter.this::equalsPredicateTransformer); put(FilterOperator.NOT_EQUAL, HibernateCriteriaConverter.this::notEqualsPredicateTransformer); diff --git a/src/shared/main/tv/codely/shared/infrastructure/hibernate/HibernateRepository.java b/src/shared/main/tv/codely/shared/infrastructure/hibernate/HibernateRepository.java index 434a0d42..38413cc2 100644 --- a/src/shared/main/tv/codely/shared/infrastructure/hibernate/HibernateRepository.java +++ b/src/shared/main/tv/codely/shared/infrastructure/hibernate/HibernateRepository.java @@ -1,22 +1,22 @@ package tv.codely.shared.infrastructure.hibernate; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.SessionFactory; import tv.codely.shared.domain.Identifier; import tv.codely.shared.domain.criteria.Criteria; -import javax.persistence.criteria.CriteriaQuery; import java.util.List; import java.util.Optional; public abstract class HibernateRepository { protected final SessionFactory sessionFactory; protected final Class aggregateClass; - protected final HibernateCriteriaConverter criteriaConverter; + protected final HibernateCriteriaConverter criteriaConverter; public HibernateRepository(SessionFactory sessionFactory, Class aggregateClass) { this.sessionFactory = sessionFactory; this.aggregateClass = aggregateClass; - this.criteriaConverter = new HibernateCriteriaConverter(sessionFactory.getCriteriaBuilder()); + this.criteriaConverter = new HibernateCriteriaConverter<>(sessionFactory.getCriteriaBuilder()); } protected void persist(T entity) { diff --git a/src/shared/main/tv/codely/shared/infrastructure/hibernate/JsonListType.java b/src/shared/main/tv/codely/shared/infrastructure/hibernate/JsonListType.java index f08e38ba..024f880d 100644 --- a/src/shared/main/tv/codely/shared/infrastructure/hibernate/JsonListType.java +++ b/src/shared/main/tv/codely/shared/infrastructure/hibernate/JsonListType.java @@ -19,14 +19,14 @@ import java.util.*; public class JsonListType implements UserType, DynamicParameterizedType { - private static final int[] SQL_TYPES = new int[]{Types.LONGVARCHAR}; + private static final int[] SQL_TYPES = new int[]{Types.LONGVARCHAR}; private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); - private JavaType valueType = null; - private Class classType = null; + private JavaType valueType = null; + private Class classType = null; @Override - public int[] sqlTypes() { - return SQL_TYPES; + public int getSqlType() { + return Types.LONGVARCHAR; } @Override @@ -46,12 +46,20 @@ public int hashCode(Object x) throws HibernateException { @Override public Object nullSafeGet( - ResultSet rs, - String[] names, - SharedSessionContractImplementor session, - Object owner - ) throws HibernateException, SQLException { - return nullSafeGet(rs, names, owner); + ResultSet resultSet, + int i, + SharedSessionContractImplementor sharedSessionContractImplementor, + Object o + ) throws SQLException { + try { + String json = resultSet.getString(i); + if (json == null) { + return null; + } + return OBJECT_MAPPER.readValue(json, valueType); + } catch (IOException e) { + throw new SQLException("Exception deserializing JSON", e); + } } @Override @@ -65,7 +73,7 @@ public void nullSafeSet( } public Object nullSafeGet(ResultSet rs, String[] names, Object owner) throws HibernateException, SQLException { - String value = rs.getString(names[0]).replace("\"value\"", "").replace("{:", "").replace("}", ""); + String value = rs.getString(names[0]).replace("\"value\"", "").replace("{:", "").replace("}", ""); Object result = null; if (valueType == null) { throw new HibernateException("Value type not set."); @@ -101,7 +109,7 @@ public Object deepCopy(Object value) throws HibernateException { if (value == null) { return null; } else if (valueType.isCollectionLikeType()) { - Object newValue = new ArrayList<>(); + Object newValue = new ArrayList<>(); Collection newValueCollection = (Collection) newValue; newValueCollection.addAll((Collection) value); return newValueCollection; diff --git a/src/shared/main/tv/codely/shared/infrastructure/spring/ApiExceptionMiddleware.java b/src/shared/main/tv/codely/shared/infrastructure/spring/ApiExceptionMiddleware.java index 05b992a8..ac1db973 100644 --- a/src/shared/main/tv/codely/shared/infrastructure/spring/ApiExceptionMiddleware.java +++ b/src/shared/main/tv/codely/shared/infrastructure/spring/ApiExceptionMiddleware.java @@ -9,9 +9,9 @@ import tv.codely.shared.domain.bus.command.CommandHandlerExecutionError; import tv.codely.shared.domain.bus.query.QueryHandlerExecutionError; -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.util.HashMap; @@ -41,7 +41,7 @@ public void doFilter( try { chain.doFilter(request, response); - } catch (NestedServletException exception) { + } catch (Exception exception) { if (possibleController instanceof ApiController) { handleCustomError(response, httpResponse, (ApiController) possibleController, exception); } @@ -55,7 +55,7 @@ private void handleCustomError( ServletResponse response, HttpServletResponse httpResponse, ApiController possibleController, - NestedServletException exception + Exception exception ) throws IOException { HashMap, HttpStatus> errorMapping = possibleController .errorMapping();