From ed3fdac3581cfed280e88f9ada9284a1f99422c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Dec 2021 09:33:34 +0000 Subject: [PATCH 1/4] Bump jakarta.jakartaee-api from 8.0.0 to 9.1.0 Bumps jakarta.jakartaee-api from 8.0.0 to 9.1.0. --- updated-dependencies: - dependency-name: jakarta.platform:jakarta.jakartaee-api dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- base-it/build.gradle | 2 +- base/build.gradle | 2 +- crypto/build.gradle | 2 +- csv/build.gradle | 2 +- dbtools-it/build.gradle | 2 +- es/build.gradle | 2 +- hazelcast/build.gradle | 2 +- infinispan/build.gradle | 2 +- interceptors/build.gradle | 2 +- options/build.gradle | 2 +- owbtest/build.gradle | 2 +- shiro-jee/build.gradle | 2 +- testutils/build.gradle | 2 +- webtools/build.gradle | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/base-it/build.gradle b/base-it/build.gradle index cb9919a4..c6ae2115 100644 --- a/base-it/build.gradle +++ b/base-it/build.gradle @@ -9,7 +9,7 @@ dependencies { testImplementation group: 'com.h2database', name: 'h2', version: '2.0.202' testImplementation group: 'org.jboss.arquillian.container', name: 'arquillian-glassfish-embedded-3.1', version: '1.0.2' testImplementation(group: 'fish.payara.extras', name: 'payara-embedded-all', version: '5.2021.10') - compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') } test { useTestNG() diff --git a/base/build.gradle b/base/build.gradle index e01827cb..c3fab2eb 100644 --- a/base/build.gradle +++ b/base/build.gradle @@ -18,7 +18,7 @@ configurations { } dependencies { - compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') implementation project(':ds2-oss-core-api') implementation project(':ds2-oss-core-statics') testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.+' diff --git a/crypto/build.gradle b/crypto/build.gradle index 54dcee33..ae9e2274 100644 --- a/crypto/build.gradle +++ b/crypto/build.gradle @@ -17,7 +17,7 @@ dependencies { testImplementation project(path: ':ds2-oss-core-testutils') testImplementation group: 'org.jboss', name: 'jandex', version: '2.4.1.Final' compileOnly 'org.slf4j:slf4j-api:1.7.32' - compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') } task copyMainStuffToResources(type: Copy) { diff --git a/csv/build.gradle b/csv/build.gradle index 48e177b8..90d2bc45 100644 --- a/csv/build.gradle +++ b/csv/build.gradle @@ -3,7 +3,7 @@ plugins { } dependencies { - compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') implementation project(':ds2-oss-core-api') implementation project(':ds2-oss-core-statics') testImplementation group: 'org.testng', name: 'testng', version: '7.4.0' diff --git a/dbtools-it/build.gradle b/dbtools-it/build.gradle index 5d4b05c4..4f0f2316 100644 --- a/dbtools-it/build.gradle +++ b/dbtools-it/build.gradle @@ -16,7 +16,7 @@ dependencies { testImplementation group: 'org.eclipse.persistence', name: 'eclipselink', version: '3.0.2' testImplementation(group: 'fish.payara.extras', name: 'payara-embedded-all', version: '5.2021.10') compileOnly 'org.slf4j:slf4j-api:1.7.32' - implementation(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + implementation(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') } bintray { diff --git a/es/build.gradle b/es/build.gradle index 27eb05e8..ca6cb370 100644 --- a/es/build.gradle +++ b/es/build.gradle @@ -16,7 +16,7 @@ dependencies { testRuntimeOnly group: 'org.jboss', name: 'jandex', version: '2.4.1.Final' testImplementation project(':ds2-oss-core-codec-gson') compileOnly 'org.slf4j:slf4j-api:1.7.32' - compileOnly group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0' + compileOnly group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0' } task copyMainStuffToResources(type: Copy) { diff --git a/hazelcast/build.gradle b/hazelcast/build.gradle index 076dbc29..6f6a99ac 100644 --- a/hazelcast/build.gradle +++ b/hazelcast/build.gradle @@ -3,5 +3,5 @@ description = 'DS/2 OSS Core Hazelcast' dependencies { implementation project(':ds2-oss-core-api') implementation 'com.hazelcast:hazelcast:5.0.1' - compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') } diff --git a/infinispan/build.gradle b/infinispan/build.gradle index 3d3211e9..eb1516a3 100644 --- a/infinispan/build.gradle +++ b/infinispan/build.gradle @@ -14,7 +14,7 @@ dependencies { This behavior is not yet supported by Gradle, so this dependency has been converted to a compile dependency. Please review and delete this closure when resolved. */ } - compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') } task copyMainStuffToResources(type: Copy) { diff --git a/interceptors/build.gradle b/interceptors/build.gradle index 8e452b40..043a058c 100644 --- a/interceptors/build.gradle +++ b/interceptors/build.gradle @@ -4,7 +4,7 @@ dependencies { testImplementation group: 'org.apache.openejb', name: 'tomee-embedded', version: '1.7.5' testImplementation group: 'org.testng', name: 'testng', version: '7.4.0' compileOnly 'org.slf4j:slf4j-api:1.7.32' - compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') } task copyMainStuffToResources(type: Copy) { diff --git a/options/build.gradle b/options/build.gradle index bbbfc2af..908bc1cc 100644 --- a/options/build.gradle +++ b/options/build.gradle @@ -38,7 +38,7 @@ dependencies { Please review and delete this closure when resolved. */ } compileOnly(group: 'org.hibernate', name: 'hibernate-jpamodelgen', version: '5.6.3.Final') - compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') compileOnly 'org.projectlombok:lombok:1.18.22' } diff --git a/owbtest/build.gradle b/owbtest/build.gradle index 5e27209d..75dff464 100644 --- a/owbtest/build.gradle +++ b/owbtest/build.gradle @@ -9,7 +9,7 @@ dependencies { testImplementation project(':ds2-oss-core-statics') testImplementation "org.junit.jupiter:junit-jupiter-api:${JUNIT5_VERSION}" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${JUNIT5_VERSION}" - implementation(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + implementation(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') testImplementation "org.apache.openwebbeans:openwebbeans-ee:${OWB_VERSION}" testImplementation "org.apache.openwebbeans:openwebbeans-spi:${OWB_VERSION}" testImplementation "org.apache.openwebbeans:openwebbeans-impl:${OWB_VERSION}" diff --git a/shiro-jee/build.gradle b/shiro-jee/build.gradle index fca39b43..8c2a3715 100644 --- a/shiro-jee/build.gradle +++ b/shiro-jee/build.gradle @@ -5,7 +5,7 @@ dependencies { testAnnotationProcessor 'org.projectlombok:lombok:1.18.22' compileOnly 'org.projectlombok:lombok:1.18.16' //compileOnly 'javax:javaee-web-api:7.0' - compileOnly group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0' + compileOnly group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0' implementation project(':ds2-oss-core-api') implementation 'org.apache.shiro:shiro-core:1.8.0' implementation 'org.apache.shiro:shiro-jaxrs:1.8.0' diff --git a/testutils/build.gradle b/testutils/build.gradle index 5c9660b2..23402a45 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -6,7 +6,7 @@ description = 'DS/2 OSS Core Test Utils' dependencies { implementation project(':ds2-oss-core-api') - compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') compileOnly group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.2.4.Final' compileOnly group: 'org.testng', name: 'testng', version: '7.4.0' compileOnly(group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32') diff --git a/webtools/build.gradle b/webtools/build.gradle index eb5c36ab..dd7d3178 100644 --- a/webtools/build.gradle +++ b/webtools/build.gradle @@ -2,7 +2,7 @@ description = 'DS/2 OSS Core WebTools' dependencies { compileOnly 'org.slf4j:slf4j-api:1.7.32' testImplementation group: 'org.testng', name: 'testng', version: '7.4.0' - compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') implementation(group: 'ch.qos.logback', name: 'logback-classic', version: project.ext.logbackVersion) } test.useTestNG() From 8c96731328ac32c7cd1f4a1a83324a8eba3226bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Dec 2021 13:18:14 +0000 Subject: [PATCH 2/4] Bump jakarta.jakartaee-api from 8.0.0 to 9.1.0 Bumps jakarta.jakartaee-api from 8.0.0 to 9.1.0. --- updated-dependencies: - dependency-name: jakarta.platform:jakarta.jakartaee-api dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- base-it/build.gradle | 2 +- base/build.gradle | 2 +- crypto/build.gradle | 2 +- csv/build.gradle | 2 +- dbtools-it/build.gradle | 2 +- es/build.gradle | 2 +- hazelcast/build.gradle | 2 +- infinispan/build.gradle | 2 +- interceptors/build.gradle | 2 +- options/build.gradle | 2 +- owbtest/build.gradle | 2 +- shiro-jee/build.gradle | 2 +- testutils/build.gradle | 2 +- webtools/build.gradle | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/base-it/build.gradle b/base-it/build.gradle index cb9919a4..c6ae2115 100644 --- a/base-it/build.gradle +++ b/base-it/build.gradle @@ -9,7 +9,7 @@ dependencies { testImplementation group: 'com.h2database', name: 'h2', version: '2.0.202' testImplementation group: 'org.jboss.arquillian.container', name: 'arquillian-glassfish-embedded-3.1', version: '1.0.2' testImplementation(group: 'fish.payara.extras', name: 'payara-embedded-all', version: '5.2021.10') - compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') } test { useTestNG() diff --git a/base/build.gradle b/base/build.gradle index e01827cb..c3fab2eb 100644 --- a/base/build.gradle +++ b/base/build.gradle @@ -18,7 +18,7 @@ configurations { } dependencies { - compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') implementation project(':ds2-oss-core-api') implementation project(':ds2-oss-core-statics') testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.+' diff --git a/crypto/build.gradle b/crypto/build.gradle index 54dcee33..ae9e2274 100644 --- a/crypto/build.gradle +++ b/crypto/build.gradle @@ -17,7 +17,7 @@ dependencies { testImplementation project(path: ':ds2-oss-core-testutils') testImplementation group: 'org.jboss', name: 'jandex', version: '2.4.1.Final' compileOnly 'org.slf4j:slf4j-api:1.7.32' - compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') } task copyMainStuffToResources(type: Copy) { diff --git a/csv/build.gradle b/csv/build.gradle index 48e177b8..90d2bc45 100644 --- a/csv/build.gradle +++ b/csv/build.gradle @@ -3,7 +3,7 @@ plugins { } dependencies { - compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') implementation project(':ds2-oss-core-api') implementation project(':ds2-oss-core-statics') testImplementation group: 'org.testng', name: 'testng', version: '7.4.0' diff --git a/dbtools-it/build.gradle b/dbtools-it/build.gradle index 5d4b05c4..4f0f2316 100644 --- a/dbtools-it/build.gradle +++ b/dbtools-it/build.gradle @@ -16,7 +16,7 @@ dependencies { testImplementation group: 'org.eclipse.persistence', name: 'eclipselink', version: '3.0.2' testImplementation(group: 'fish.payara.extras', name: 'payara-embedded-all', version: '5.2021.10') compileOnly 'org.slf4j:slf4j-api:1.7.32' - implementation(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + implementation(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') } bintray { diff --git a/es/build.gradle b/es/build.gradle index 27eb05e8..ca6cb370 100644 --- a/es/build.gradle +++ b/es/build.gradle @@ -16,7 +16,7 @@ dependencies { testRuntimeOnly group: 'org.jboss', name: 'jandex', version: '2.4.1.Final' testImplementation project(':ds2-oss-core-codec-gson') compileOnly 'org.slf4j:slf4j-api:1.7.32' - compileOnly group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0' + compileOnly group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0' } task copyMainStuffToResources(type: Copy) { diff --git a/hazelcast/build.gradle b/hazelcast/build.gradle index 6ef805ae..c627cb77 100644 --- a/hazelcast/build.gradle +++ b/hazelcast/build.gradle @@ -3,5 +3,5 @@ description = 'DS/2 OSS Core Hazelcast' dependencies { implementation project(':ds2-oss-core-api') implementation 'com.hazelcast:hazelcast:5.0.2' - compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') } diff --git a/infinispan/build.gradle b/infinispan/build.gradle index 3d3211e9..eb1516a3 100644 --- a/infinispan/build.gradle +++ b/infinispan/build.gradle @@ -14,7 +14,7 @@ dependencies { This behavior is not yet supported by Gradle, so this dependency has been converted to a compile dependency. Please review and delete this closure when resolved. */ } - compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') } task copyMainStuffToResources(type: Copy) { diff --git a/interceptors/build.gradle b/interceptors/build.gradle index 8e452b40..043a058c 100644 --- a/interceptors/build.gradle +++ b/interceptors/build.gradle @@ -4,7 +4,7 @@ dependencies { testImplementation group: 'org.apache.openejb', name: 'tomee-embedded', version: '1.7.5' testImplementation group: 'org.testng', name: 'testng', version: '7.4.0' compileOnly 'org.slf4j:slf4j-api:1.7.32' - compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') } task copyMainStuffToResources(type: Copy) { diff --git a/options/build.gradle b/options/build.gradle index bbbfc2af..908bc1cc 100644 --- a/options/build.gradle +++ b/options/build.gradle @@ -38,7 +38,7 @@ dependencies { Please review and delete this closure when resolved. */ } compileOnly(group: 'org.hibernate', name: 'hibernate-jpamodelgen', version: '5.6.3.Final') - compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') compileOnly 'org.projectlombok:lombok:1.18.22' } diff --git a/owbtest/build.gradle b/owbtest/build.gradle index 5e27209d..75dff464 100644 --- a/owbtest/build.gradle +++ b/owbtest/build.gradle @@ -9,7 +9,7 @@ dependencies { testImplementation project(':ds2-oss-core-statics') testImplementation "org.junit.jupiter:junit-jupiter-api:${JUNIT5_VERSION}" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${JUNIT5_VERSION}" - implementation(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + implementation(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') testImplementation "org.apache.openwebbeans:openwebbeans-ee:${OWB_VERSION}" testImplementation "org.apache.openwebbeans:openwebbeans-spi:${OWB_VERSION}" testImplementation "org.apache.openwebbeans:openwebbeans-impl:${OWB_VERSION}" diff --git a/shiro-jee/build.gradle b/shiro-jee/build.gradle index fca39b43..8c2a3715 100644 --- a/shiro-jee/build.gradle +++ b/shiro-jee/build.gradle @@ -5,7 +5,7 @@ dependencies { testAnnotationProcessor 'org.projectlombok:lombok:1.18.22' compileOnly 'org.projectlombok:lombok:1.18.16' //compileOnly 'javax:javaee-web-api:7.0' - compileOnly group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0' + compileOnly group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0' implementation project(':ds2-oss-core-api') implementation 'org.apache.shiro:shiro-core:1.8.0' implementation 'org.apache.shiro:shiro-jaxrs:1.8.0' diff --git a/testutils/build.gradle b/testutils/build.gradle index 5c9660b2..23402a45 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -6,7 +6,7 @@ description = 'DS/2 OSS Core Test Utils' dependencies { implementation project(':ds2-oss-core-api') - compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') compileOnly group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.2.4.Final' compileOnly group: 'org.testng', name: 'testng', version: '7.4.0' compileOnly(group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32') diff --git a/webtools/build.gradle b/webtools/build.gradle index eb5c36ab..dd7d3178 100644 --- a/webtools/build.gradle +++ b/webtools/build.gradle @@ -2,7 +2,7 @@ description = 'DS/2 OSS Core WebTools' dependencies { compileOnly 'org.slf4j:slf4j-api:1.7.32' testImplementation group: 'org.testng', name: 'testng', version: '7.4.0' - compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '8.0.0') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') implementation(group: 'ch.qos.logback', name: 'logback-classic', version: project.ext.logbackVersion) } test.useTestNG() From 8a39ca8690b70bc3352684599a4f0e1e0e7e28bd Mon Sep 17 00:00:00 2001 From: Dirk <472167-dstrauss@users.noreply.gitlab.com> Date: Tue, 21 Dec 2021 19:36:34 +0100 Subject: [PATCH 3/4] CORE-000: upgrade step for JakartaEE9 --- api/build.gradle.kts | 6 +- .../java/ds2/oss/core/api/JpaCrudFacade.java | 3 +- .../ds2/oss/core/api/PersistenceSupport.java | 2 +- .../oss/core/api/annotations/LocaleData.java | 9 +- .../api/annotations/LogResourceRequests.java | 5 +- .../ds2/oss/core/api/annotations/Mock.java | 5 +- .../core/api/annotations/PathLocation.java | 8 +- .../api/annotations/PropertiesLoader.java | 15 +- .../api/annotations/SecureRandomizer.java | 8 +- .../core/api/annotations/SmackPEProvider.java | 10 +- .../api/annotations/SmackPacketListener.java | 12 +- .../core/api/annotations/StringLoader.java | 2 +- .../oss/core/api/cache/InfinispanConfig.java | 10 +- .../java/ds2/oss/core/api/crypto/Argon2.java | 5 +- .../api/crypto/KeyPairGeneratorService.java | 12 +- .../java/ds2/oss/core/api/crypto/Pbkdf2.java | 5 +- .../ds2/oss/core/api/dto/impl/OptionDto.java | 12 +- .../api/dto/impl/OptionValueContextDto.java | 55 ++--- .../oss/core/api/dto/impl/OptionValueDto.java | 23 +-- .../oss/core/api/dto/impl/PagedResult.java | 4 +- .../oss/core/api/environment/ClusterDto.java | 20 +- .../oss/core/api/options/ForValueType.java | 8 +- .../ds2/oss/core/api/options/KeysType.java | 8 +- .../AbstractEntityDtoConverterImpl.java | 2 +- .../persistence/InvalidEntityException.java | 2 +- .../oss/core/api/persistence/JpaSupport.java | 14 +- .../oss/core/api/rest/RestEntityResource.java | 11 +- base-it/build.gradle | 4 +- .../ds2/oss/core/base/itest/DummyEntity.java | 2 +- .../oss/core/base/itest/DummyPersistence.java | 6 +- .../core/base/itest/DummyPersistenceBean.java | 9 +- .../ds2/oss/core/base/it/DummyEntityIT.java | 3 +- base/build.gradle | 6 +- .../impl/AlternateSecurityBaseDataImpl.java | 12 +- .../oss/core/base/impl/Base64Konverter.java | 2 +- .../oss/core/base/impl/BitSupportImpl.java | 3 +- .../oss/core/base/impl/ConverterToolImpl.java | 13 +- .../oss/core/base/impl/DefaultAssertImpl.java | 7 +- .../base/impl/DefaultCoreConfiguration.java | 7 +- .../base/impl/DefaultJavaRuntimeData.java | 3 +- .../ds2/oss/core/base/impl/HexKonverter.java | 2 +- .../base/impl/InetAddressServiceImpl.java | 15 +- .../ds2/oss/core/base/impl/IoServiceImpl.java | 2 +- .../core/base/impl/LocaleSupportProducer.java | 14 +- .../core/base/impl/NameNormalizerImpl.java | 8 +- .../core/base/impl/PathLocationProvider.java | 24 +-- .../base/impl/PropertiesLoaderProvider.java | 100 ++++----- .../oss/core/base/impl/RandomProvider.java | 14 +- .../base/impl/RuntimeEnvironmentImpl.java | 4 +- .../core/base/impl/SecureJavaRuntimeData.java | 5 +- .../core/base/impl/SecureRandomProvider.java | 11 +- .../impl/ServerIdentifierProviderImpl.java | 18 +- .../core/base/impl/SslServerSnooperImpl.java | 4 +- .../base/impl/StringPropertyLoaderImpl.java | 6 +- .../base/impl/SymmetricKeyServiceImpl.java | 2 +- .../base/impl/SystemPropertyServiceImpl.java | 3 +- .../core/base/impl/UserAgentServiceImpl.java | 2 +- .../ds2/oss/core/base/impl/ValidateImpl.java | 3 +- .../base/impl/test/LocaleSupportImplTest.java | 2 +- .../impl/test/LocaleSupportTestProvider.java | 32 ++- .../core/base/impl/test/PropsLoaderDto.java | 6 +- .../oss/core/base/impl/test/SecBaseDto.java | 6 +- build.gradle | 13 +- codec-boon/build.gradle | 2 +- codec-fastxml/build.gradle | 2 +- codec-genson/build.gradle | 2 +- codec-gson/build.gradle | 2 +- crypto-bc/build.gradle | 2 +- crypto/build.gradle | 2 +- .../AppServerSecurityBaseDataServiceImpl.java | 42 ++-- .../crypto/Argon2PasswordServiceImpl.java | 2 +- .../core/crypto/DefaultSecurityProvider.java | 41 ++-- .../oss/core/crypto/EllipticCurveSupport.java | 22 +- .../core/crypto/EncryptionServiceImpl.java | 4 +- .../core/crypto/KeyGeneratorServiceImpl.java | 5 +- .../crypto/KeyPairGeneratorServiceImpl.java | 35 ++-- .../crypto/Pbkdf2PasswordServiceImpl.java | 8 +- .../oss/core/crypto/SecureBytesProvider.java | 8 +- .../oss/core/crypto/SimpleBytesProvider.java | 13 +- .../java/ds2/oss/core/csv/CsvParserImpl.java | 8 +- .../oss/core/dbtools/it/MyStateConverter.java | 9 +- .../core/dbtools/it/entities/MyEntity.java | 34 ++-- .../core/dbtools/it/entities/StateEntity.java | 20 +- .../dbtools/it/impl/MyEntityServiceBean.java | 18 +- .../it/impl/StateEntityOperations.java | 11 +- .../dbtools/it/impl/StateServiceBean.java | 16 +- dbtools/build.gradle | 12 +- .../AbstractCreatedByModifiedByEntity.java | 5 +- .../core/dbtools/AbstractCreatedEntity.java | 4 +- .../AbstractCreatedModifiedEntity.java | 4 +- .../AbstractPersistenceSupportImpl.java | 6 +- .../core/dbtools/AbstractStateAwareBase.java | 3 +- .../dbtools/AbstractStateAwareEntity.java | 10 +- .../core/dbtools/DefaultEntityOperations.java | 10 +- .../java/ds2/oss/core/dbtools/JpaHelper.java | 6 +- .../AbstractEntryStateConverter.java | 4 +- .../dbtools/converters/ClusterConverter.java | 6 +- .../converters/CryptedContentConverter.java | 4 +- .../converters/EntryStatesConverter.java | 5 +- .../LocalDateTimeJpa21Converter.java | 5 +- .../dbtools/converters/LocaleConverter.java | 4 +- .../RuntimeConfigurationConverter.java | 6 +- .../dbtools/converters/TimeZoneConverter.java | 4 +- .../dbtools/modules/CreatedAwareModule.java | 45 +---- .../modules/CreatedModifiedAwareModule.java | 4 +- .../modules/EntryStatesAwareModule.java | 7 +- .../modules/IvEncodedContentModule.java | 19 +- .../dbtools/modules/LifeCycleAwareModule.java | 55 ++--- .../dbtools/modules/ModifiedAwareModule.java | 9 +- .../dbtools/modules/NamedAwareModule.java | 6 +- .../NamedNormalizedDescriptiveModule.java | 6 +- .../modules/NamedNormalizedModule.java | 6 +- .../dbtools/modules/NormalizedNameModule.java | 6 +- .../dbtools/support/CreateSchemaHelper.java | 2 +- es-test/build.gradle | 2 +- es/build.gradle | 2 +- .../api/annotations/EsCodec.java | 16 +- .../api/annotations/UsingTransport.java | 6 +- .../elasticsearch/impl/AbstractTypeCodec.java | 13 +- .../elasticsearch/impl/CodecProviderImpl.java | 20 +- .../impl/ElasticSearchServiceImpl.java | 129 ++++++------ .../oss/core/elasticsearch/impl/UseCases.java | 41 ++-- .../literals/EsCodecAnnotationLiteral.java | 8 +- .../impl/literals/TransportLiteral.java | 3 +- .../impl/node/ext/TransportClientNode.java | 38 ++-- .../impl/node/local/LocalNodeImpl.java | 21 +- .../core/interceptors/InfoLogInterceptor.java | 31 ++- .../oss/core/interceptors/LogCallings.java | 12 +- options/build.gradle | 37 ++-- .../core/options/api/ValueCodecMarker.java | 11 +- .../NumberedOptionStorageServiceImpl.java | 6 +- .../options/impl/OptionDtoFactoryImpl.java | 9 +- .../options/impl/OptionValueDtoFactory.java | 2 +- .../OptionValueEncrypterProviderImpl.java | 68 +++---- .../options/impl/ValueCodecMarkerLiteral.java | 18 +- .../options/impl/ValueTypeParserImpl.java | 39 ++-- ...ractOptionValuePersistenceSupportBean.java | 92 ++++----- ...AbstractOptionsPersistenceSupportBean.java | 8 +- .../StringOptionValueEncrypter.java | 25 ++- .../options/impl/entities/OptionEntity.java | 141 ++++++------- .../entities/OptionValueContextEntity.java | 24 +-- .../impl/entities/OptionValueEntity.java | 8 +- .../identifiers/AbstractOptionIdentifier.java | 61 +++--- .../impl/noop/LoggingOptionJournalImpl.java | 44 ++-- .../NoopKeyedOptionStorageServiceImpl.java | 52 ++--- .../NoopNumberedOptionStorageServiceImpl.java | 54 ++--- ...NumberedOptionsPersistenceSupportImpl.java | 2 +- ...NoopOptionValuePersistenceSupportImpl.java | 3 +- .../internal/OptionStageConverter.java | 13 +- .../internal/OptionValueContextModule.java | 76 +++---- .../internal/OptionValueStageConverter.java | 14 +- .../options/internal/ValueTypeConverter.java | 17 +- settings.gradle.kts | 12 +- .../crypto/shirojee/impl/CdiEnvCreator.java | 4 +- testutils/build.gradle | 27 +-- .../utils/AbstractInjectionEnvironment.java | 16 +- .../utils/TestPathLocationProvider.java | 13 +- .../testonly/utils/TestUtilsProvider.java | 8 +- .../testonly/utils/ValueGeneratorImpl.java | 4 +- thymeleaf/build.gradle.kts | 4 +- .../core/webtools/LogbackConfigListener.java | 12 +- .../LoggingHttpServletRequestWrapper.java | 24 +-- .../LoggingHttpServletResponseWrapper.java | 54 +++-- .../oss/core/webtools/Slf4jRequestFilter.java | 4 +- .../webtools/WrappingServletResponse.java | 191 +++++++++--------- .../io/LoggingServletInputStream.java | 47 +++-- .../io/LoggingServletOutputStream.java | 27 ++- .../io/WrappingServletOutputStream.java | 29 ++- xmpp/build.gradle | 2 +- 169 files changed, 1254 insertions(+), 1610 deletions(-) diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 5b9ba013..b125d8f5 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -8,14 +8,12 @@ description = "DS/2 OSS Core API" val logbackVersion: String by project dependencies { - //compileOnly(group: 'javax.enterprise', name: 'cdi-api', version:'1.2') - //compileOnly(group: 'javax.validation', name: 'validation-api', version:'1.1.0.Final') annotationProcessor("org.projectlombok:lombok:1.18.22") implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.0") compileOnly("org.projectlombok:lombok:1.18.22") implementation("javax.xml.bind:jaxb-api:2.4.0") - compileOnly("jakarta.platform", "jakarta.jakartaee-api", "8.0.0") - testImplementation("jakarta.platform", "jakarta.jakartaee-api", "8.0.0") + compileOnly("jakarta.platform", "jakarta.jakartaee-api", "9.1.0") + testImplementation("jakarta.platform", "jakarta.jakartaee-api", "9.1.0") testImplementation("org.testng:testng:7.4.0") testImplementation("org.slf4j:jul-to-slf4j:1.7.32") testRuntimeOnly("ch.qos.logback", "logback-classic", logbackVersion) diff --git a/api/src/main/java/ds2/oss/core/api/JpaCrudFacade.java b/api/src/main/java/ds2/oss/core/api/JpaCrudFacade.java index 3aff738d..1d6ca1d5 100644 --- a/api/src/main/java/ds2/oss/core/api/JpaCrudFacade.java +++ b/api/src/main/java/ds2/oss/core/api/JpaCrudFacade.java @@ -15,7 +15,8 @@ */ package ds2.oss.core.api; -import javax.persistence.TypedQuery; +import jakarta.persistence.TypedQuery; + import java.util.List; /** diff --git a/api/src/main/java/ds2/oss/core/api/PersistenceSupport.java b/api/src/main/java/ds2/oss/core/api/PersistenceSupport.java index 496da88c..fa28c042 100644 --- a/api/src/main/java/ds2/oss/core/api/PersistenceSupport.java +++ b/api/src/main/java/ds2/oss/core/api/PersistenceSupport.java @@ -17,7 +17,7 @@ import ds2.oss.core.api.persistence.InvalidEntityException; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; /** * A persistence support contract. This can be a database, or a cache instance. Or ElasticSearch. diff --git a/api/src/main/java/ds2/oss/core/api/annotations/LocaleData.java b/api/src/main/java/ds2/oss/core/api/annotations/LocaleData.java index d9176f14..aef751f7 100644 --- a/api/src/main/java/ds2/oss/core/api/annotations/LocaleData.java +++ b/api/src/main/java/ds2/oss/core/api/annotations/LocaleData.java @@ -15,13 +15,14 @@ */ package ds2.oss.core.api.annotations; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.util.Nonbinding; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; - /** * Marks a field to contain some i18n data. * @@ -29,8 +30,8 @@ * @version 0.3 */ @Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) -@javax.enterprise.context.ApplicationScoped +@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER}) +@ApplicationScoped public @interface LocaleData { /** * The base name to the properties file. diff --git a/api/src/main/java/ds2/oss/core/api/annotations/LogResourceRequests.java b/api/src/main/java/ds2/oss/core/api/annotations/LogResourceRequests.java index adb57adf..36c362e0 100644 --- a/api/src/main/java/ds2/oss/core/api/annotations/LogResourceRequests.java +++ b/api/src/main/java/ds2/oss/core/api/annotations/LogResourceRequests.java @@ -15,7 +15,8 @@ */ package ds2.oss.core.api.annotations; -import javax.ws.rs.NameBinding; +import jakarta.ws.rs.NameBinding; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -25,7 +26,7 @@ * Created by deindesign on 18.12.15. */ @Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.TYPE, ElementType.METHOD}) +@Target({ElementType.TYPE, ElementType.METHOD}) @NameBinding public @interface LogResourceRequests { } diff --git a/api/src/main/java/ds2/oss/core/api/annotations/Mock.java b/api/src/main/java/ds2/oss/core/api/annotations/Mock.java index 5cc5ea01..19f794d9 100644 --- a/api/src/main/java/ds2/oss/core/api/annotations/Mock.java +++ b/api/src/main/java/ds2/oss/core/api/annotations/Mock.java @@ -15,8 +15,9 @@ */ package ds2.oss.core.api.annotations; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Stereotype; + import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/api/src/main/java/ds2/oss/core/api/annotations/PathLocation.java b/api/src/main/java/ds2/oss/core/api/annotations/PathLocation.java index 7e6fb58d..c33cd029 100644 --- a/api/src/main/java/ds2/oss/core/api/annotations/PathLocation.java +++ b/api/src/main/java/ds2/oss/core/api/annotations/PathLocation.java @@ -15,14 +15,14 @@ */ package ds2.oss.core.api.annotations; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Qualifier; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.inject.Qualifier; - /** * Used to dynamically inject a path. * @@ -31,7 +31,7 @@ */ @Qualifier @Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE }) +@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE}) public @interface PathLocation { /** * The environment variable to use to insert its value via injection. diff --git a/api/src/main/java/ds2/oss/core/api/annotations/PropertiesLoader.java b/api/src/main/java/ds2/oss/core/api/annotations/PropertiesLoader.java index a604dad4..37c9113b 100644 --- a/api/src/main/java/ds2/oss/core/api/annotations/PropertiesLoader.java +++ b/api/src/main/java/ds2/oss/core/api/annotations/PropertiesLoader.java @@ -15,25 +15,24 @@ */ package ds2.oss.core.api.annotations; -import javax.enterprise.util.Nonbinding; -import javax.inject.Qualifier; -import javax.validation.constraints.Null; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Qualifier; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import java.nio.file.Path; -import java.nio.file.Paths; /** * To load a properties file from a specific location. */ @Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE }) +@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE}) @Qualifier public @interface PropertiesLoader { /** * A path to a file location. + * * @return the file path */ @Nonbinding @@ -41,6 +40,7 @@ /** * A path from a system property. + * * @return a system property name that contains the path */ @Nonbinding @@ -48,6 +48,7 @@ /** * A path from an environment variable. This is tried first. + * * @return a path from an environment variable */ @Nonbinding @@ -55,10 +56,12 @@ /** * A resource to load the properties from. + * * @return a resource name */ @Nonbinding String resource() default ""; + @Nonbinding boolean setNullOnFail() default false; } diff --git a/api/src/main/java/ds2/oss/core/api/annotations/SecureRandomizer.java b/api/src/main/java/ds2/oss/core/api/annotations/SecureRandomizer.java index 233eeafe..86785ff1 100644 --- a/api/src/main/java/ds2/oss/core/api/annotations/SecureRandomizer.java +++ b/api/src/main/java/ds2/oss/core/api/annotations/SecureRandomizer.java @@ -15,14 +15,14 @@ */ package ds2.oss.core.api.annotations; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Qualifier; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.inject.Qualifier; - /** * Qualifier for a secure randomizer. Put this on fields to have a SecureRandom object being * injected. @@ -31,7 +31,7 @@ * @version 0.3 */ @Qualifier -@Target({ ElementType.FIELD, ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER }) +@Target({ElementType.FIELD, ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER}) @Retention(RetentionPolicy.RUNTIME) public @interface SecureRandomizer { /** diff --git a/api/src/main/java/ds2/oss/core/api/annotations/SmackPEProvider.java b/api/src/main/java/ds2/oss/core/api/annotations/SmackPEProvider.java index d9ea9d2f..6c0b0f04 100644 --- a/api/src/main/java/ds2/oss/core/api/annotations/SmackPEProvider.java +++ b/api/src/main/java/ds2/oss/core/api/annotations/SmackPEProvider.java @@ -15,15 +15,15 @@ */ package ds2.oss.core.api.annotations; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Qualifier; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.util.Nonbinding; -import javax.inject.Qualifier; - /** * Marks a type to be a packet extension provider from Smack for XMPP. * @@ -32,7 +32,7 @@ */ @Qualifier @ApplicationScoped -@Target({ ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER }) +@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) @Retention(RetentionPolicy.RUNTIME) public @interface SmackPEProvider { diff --git a/api/src/main/java/ds2/oss/core/api/annotations/SmackPacketListener.java b/api/src/main/java/ds2/oss/core/api/annotations/SmackPacketListener.java index 7e4bce90..86d47766 100644 --- a/api/src/main/java/ds2/oss/core/api/annotations/SmackPacketListener.java +++ b/api/src/main/java/ds2/oss/core/api/annotations/SmackPacketListener.java @@ -15,17 +15,16 @@ */ package ds2.oss.core.api.annotations; -import static ds2.oss.core.api.xmpp.PacketTypes.Message; +import ds2.oss.core.api.xmpp.PacketTypes; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Qualifier; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.inject.Qualifier; - -import ds2.oss.core.api.xmpp.PacketTypes; +import static ds2.oss.core.api.xmpp.PacketTypes.Message; /** * Marks a smack packet listener. @@ -35,12 +34,11 @@ */ @Qualifier @Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) +@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER}) public @interface SmackPacketListener { /** * The type to filter. - * */ @Nonbinding PacketTypes type() default Message; diff --git a/api/src/main/java/ds2/oss/core/api/annotations/StringLoader.java b/api/src/main/java/ds2/oss/core/api/annotations/StringLoader.java index e2bb5da2..ee5e2536 100644 --- a/api/src/main/java/ds2/oss/core/api/annotations/StringLoader.java +++ b/api/src/main/java/ds2/oss/core/api/annotations/StringLoader.java @@ -15,7 +15,7 @@ */ package ds2.oss.core.api.annotations; -import javax.enterprise.util.Nonbinding; +import jakarta.enterprise.util.Nonbinding; /** * To load string values from a property, an environment. diff --git a/api/src/main/java/ds2/oss/core/api/cache/InfinispanConfig.java b/api/src/main/java/ds2/oss/core/api/cache/InfinispanConfig.java index d0f1342b..ccaf8ed5 100644 --- a/api/src/main/java/ds2/oss/core/api/cache/InfinispanConfig.java +++ b/api/src/main/java/ds2/oss/core/api/cache/InfinispanConfig.java @@ -15,22 +15,22 @@ */ package ds2.oss.core.api.cache; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Qualifier; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.inject.Qualifier; - /** * Injection qualifier. * - * @version 0.3 * @author dstrauss + * @version 0.3 */ @Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.FIELD, ElementType.METHOD }) +@Target({ElementType.FIELD, ElementType.METHOD}) @Qualifier public @interface InfinispanConfig { /** diff --git a/api/src/main/java/ds2/oss/core/api/crypto/Argon2.java b/api/src/main/java/ds2/oss/core/api/crypto/Argon2.java index 340cb917..927f9e01 100644 --- a/api/src/main/java/ds2/oss/core/api/crypto/Argon2.java +++ b/api/src/main/java/ds2/oss/core/api/crypto/Argon2.java @@ -15,8 +15,9 @@ */ package ds2.oss.core.api.crypto; -import javax.enterprise.context.Dependent; -import javax.inject.Qualifier; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Qualifier; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/api/src/main/java/ds2/oss/core/api/crypto/KeyPairGeneratorService.java b/api/src/main/java/ds2/oss/core/api/crypto/KeyPairGeneratorService.java index 386252de..6686f7ff 100644 --- a/api/src/main/java/ds2/oss/core/api/crypto/KeyPairGeneratorService.java +++ b/api/src/main/java/ds2/oss/core/api/crypto/KeyPairGeneratorService.java @@ -16,20 +16,20 @@ package ds2.oss.core.api.crypto; import ds2.oss.core.api.CoreException; -import ds2.oss.core.api.maths.WeierstrassCurveData; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; import java.security.KeyPair; /** * Created by deindesign on 11.03.16. */ public interface KeyPairGeneratorService { - KeyPair generate(@Min(128)int bitSize, @NotNull AlgorithmNamed alg) throws CoreException; + KeyPair generate(@Min(128) int bitSize, @NotNull AlgorithmNamed alg) throws CoreException; /** * Generates an RSA key pair. + * * @param bitSize the bit size * @return the generated key pair * @throws CoreException if an error occurred @@ -38,7 +38,8 @@ public interface KeyPairGeneratorService { /** * Generates an elliptic curve key pair. - * @param bitSize the bit size + * + * @param bitSize the bit size * @param curveName the curve name * @return the generated key pair * @throws CoreException if an error occurred @@ -53,6 +54,7 @@ public interface KeyPairGeneratorService { /** * Generates an EC key from a default curve given by the current provider. + * * @param bitSize the bit size to use * @return a keypair with some default key rules * @throws CoreException if an error occurred diff --git a/api/src/main/java/ds2/oss/core/api/crypto/Pbkdf2.java b/api/src/main/java/ds2/oss/core/api/crypto/Pbkdf2.java index 8bec3e7e..32e44b0f 100644 --- a/api/src/main/java/ds2/oss/core/api/crypto/Pbkdf2.java +++ b/api/src/main/java/ds2/oss/core/api/crypto/Pbkdf2.java @@ -15,8 +15,9 @@ */ package ds2.oss.core.api.crypto; -import javax.enterprise.context.Dependent; -import javax.inject.Qualifier; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Qualifier; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/api/src/main/java/ds2/oss/core/api/dto/impl/OptionDto.java b/api/src/main/java/ds2/oss/core/api/dto/impl/OptionDto.java index ba502bbc..fe8fec80 100644 --- a/api/src/main/java/ds2/oss/core/api/dto/impl/OptionDto.java +++ b/api/src/main/java/ds2/oss/core/api/dto/impl/OptionDto.java @@ -19,15 +19,15 @@ import ds2.oss.core.api.options.Option; import ds2.oss.core.api.options.OptionStage; import ds2.oss.core.api.options.ValueType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; import java.time.LocalDateTime; import java.util.Arrays; diff --git a/api/src/main/java/ds2/oss/core/api/dto/impl/OptionValueContextDto.java b/api/src/main/java/ds2/oss/core/api/dto/impl/OptionValueContextDto.java index c3a2bdb4..78f5305c 100644 --- a/api/src/main/java/ds2/oss/core/api/dto/impl/OptionValueContextDto.java +++ b/api/src/main/java/ds2/oss/core/api/dto/impl/OptionValueContextDto.java @@ -15,16 +15,16 @@ */ package ds2.oss.core.api.dto.impl; -import javax.validation.constraints.NotNull; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - import ds2.oss.core.api.environment.Cluster; import ds2.oss.core.api.environment.RuntimeType; import ds2.oss.core.api.environment.ServerIdentifier; import ds2.oss.core.api.options.OptionValueContext; +import jakarta.validation.constraints.NotNull; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; /** * A simple option value context dto. @@ -71,8 +71,7 @@ public OptionValueContextDto() { /** * Inits the dto with empty values. * - * @param c - * the target cluster + * @param c the target cluster */ public OptionValueContextDto(@NotNull final Cluster c) { this(); @@ -82,10 +81,8 @@ public OptionValueContextDto(@NotNull final Cluster c) { /** * Inits the dto. * - * @param c - * the cluster - * @param config - * the runtime configuration + * @param c the cluster + * @param config the runtime configuration */ public OptionValueContextDto(final Cluster c, final RuntimeType config) { this(c); @@ -95,12 +92,9 @@ public OptionValueContextDto(final Cluster c, final RuntimeType config) { /** * Inits the dto. * - * @param c - * the cluster - * @param config - * the runtime configuration - * @param reqDomain - * the requested domain + * @param c the cluster + * @param config the runtime configuration + * @param reqDomain the requested domain */ public OptionValueContextDto(final Cluster c, final RuntimeType config, final String reqDomain) { this(c, config); @@ -108,17 +102,12 @@ public OptionValueContextDto(final Cluster c, final RuntimeType config, final St } /** - * * Inits the dto. * - * @param c - * the cluster - * @param config - * the runtime configuration - * @param reqDomain - * the requested domain - * @param serverIdentifier - * the server identifier + * @param c the cluster + * @param config the runtime configuration + * @param reqDomain the requested domain + * @param serverIdentifier the server identifier */ public OptionValueContextDto(final Cluster c, final RuntimeType config, final String reqDomain, final ServerIdentifier serverIdentifier) { @@ -223,8 +212,7 @@ public int hashCode() { /** * Sets the cluster. * - * @param cluster - * the cluster to set + * @param cluster the cluster to set */ public void setCluster(final Cluster cluster) { this.cluster = cluster; @@ -233,8 +221,7 @@ public void setCluster(final Cluster cluster) { /** * The runtime config. * - * @param configuration - * the configuration to set + * @param configuration the configuration to set */ public void setConfiguration(final RuntimeType configuration) { this.configuration = configuration; @@ -243,8 +230,7 @@ public void setConfiguration(final RuntimeType configuration) { /** * Sets the requested domain. * - * @param requestedDomain - * the requestedDomain to set + * @param requestedDomain the requestedDomain to set */ public void setRequestedDomain(final String requestedDomain) { this.requestedDomain = requestedDomain; @@ -253,8 +239,7 @@ public void setRequestedDomain(final String requestedDomain) { /** * Sets the server id. * - * @param server - * the server to set + * @param server the server to set */ public void setServer(final ServerIdentifier server) { this.server = server; diff --git a/api/src/main/java/ds2/oss/core/api/dto/impl/OptionValueDto.java b/api/src/main/java/ds2/oss/core/api/dto/impl/OptionValueDto.java index b8eced47..0d3dc441 100644 --- a/api/src/main/java/ds2/oss/core/api/dto/impl/OptionValueDto.java +++ b/api/src/main/java/ds2/oss/core/api/dto/impl/OptionValueDto.java @@ -15,18 +15,6 @@ */ package ds2.oss.core.api.dto.impl; -import java.time.LocalDateTime; -import java.util.Arrays; -import java.util.Date; - -import javax.validation.constraints.NotNull; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - import ds2.oss.core.api.EditableCreatedModifiedAware; import ds2.oss.core.api.environment.Cluster; import ds2.oss.core.api.environment.ClusterDto; @@ -35,18 +23,21 @@ import ds2.oss.core.api.options.OptionValue; import ds2.oss.core.api.options.OptionValueStage; import ds2.oss.core.api.options.ValueType; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; +import javax.xml.bind.annotation.*; +import java.time.LocalDateTime; +import java.util.Arrays; + /** * The option value dto. * + * @param the id type + * @param the value type * @author dstrauss * @version 0.3 - * @param - * the id type - * @param - * the value type */ @XmlType(name = "optionValueType") @XmlAccessorType(XmlAccessType.FIELD) diff --git a/api/src/main/java/ds2/oss/core/api/dto/impl/PagedResult.java b/api/src/main/java/ds2/oss/core/api/dto/impl/PagedResult.java index f8fd89b0..07f61b07 100644 --- a/api/src/main/java/ds2/oss/core/api/dto/impl/PagedResult.java +++ b/api/src/main/java/ds2/oss/core/api/dto/impl/PagedResult.java @@ -15,10 +15,10 @@ */ package ds2.oss.core.api.dto.impl; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import lombok.*; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; diff --git a/api/src/main/java/ds2/oss/core/api/environment/ClusterDto.java b/api/src/main/java/ds2/oss/core/api/environment/ClusterDto.java index 89a6fcb0..91111e3f 100644 --- a/api/src/main/java/ds2/oss/core/api/environment/ClusterDto.java +++ b/api/src/main/java/ds2/oss/core/api/environment/ClusterDto.java @@ -15,14 +15,14 @@ */ package ds2.oss.core.api.environment; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import jakarta.validation.constraints.NotNull; -import javax.validation.constraints.NotNull; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * Simple dto. @@ -41,12 +41,11 @@ public class ClusterDto implements Cluster { * The svuid. */ private static final long serialVersionUID = -1435290906373276784L; - + /** * Parses the given string for containing a cluster name. * - * @param s - * the possible name of the cluster + * @param s the possible name of the cluster * @return the cluster character name */ private static char parseFromString(final String s) { @@ -80,8 +79,7 @@ public ClusterDto() { /** * Inits the dto from the given values. * - * @param cluster - * the cluster to copy + * @param cluster the cluster to copy */ public ClusterDto(final Cluster cluster) { this(); @@ -91,8 +89,7 @@ public ClusterDto(final Cluster cluster) { /** * Constructs the cluster name from the given string. * - * @param clusterEnvStr - * the string to analyse. The first letter is taken to be the cluster config name. + * @param clusterEnvStr the string to analyse. The first letter is taken to be the cluster config name. */ public ClusterDto(final String clusterEnvStr) { this(); @@ -144,8 +141,7 @@ public int hashCode() { /** * Sets the cluster name. * - * @param cc - * the clusterName to set + * @param cc the clusterName to set */ public final synchronized void setClusterName(final char cc) { clusterName = cc; diff --git a/api/src/main/java/ds2/oss/core/api/options/ForValueType.java b/api/src/main/java/ds2/oss/core/api/options/ForValueType.java index 831296b7..552ca6a8 100644 --- a/api/src/main/java/ds2/oss/core/api/options/ForValueType.java +++ b/api/src/main/java/ds2/oss/core/api/options/ForValueType.java @@ -15,14 +15,14 @@ */ package ds2.oss.core.api.options; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Qualifier; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Qualifier; - /** * Marker annotation for any implementations and field injections to address a specific value type * behaviour. @@ -32,7 +32,7 @@ */ @Qualifier @ApplicationScoped -@Target({ ElementType.TYPE, ElementType.FIELD, ElementType.METHOD }) +@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) public @interface ForValueType { /** diff --git a/api/src/main/java/ds2/oss/core/api/options/KeysType.java b/api/src/main/java/ds2/oss/core/api/options/KeysType.java index bba3a5f6..c87dcbd8 100644 --- a/api/src/main/java/ds2/oss/core/api/options/KeysType.java +++ b/api/src/main/java/ds2/oss/core/api/options/KeysType.java @@ -18,14 +18,14 @@ */ package ds2.oss.core.api.options; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Qualifier; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Qualifier; - /** * Marker for types, fields etc. to indicate which key type to use. * @@ -34,7 +34,7 @@ */ @Qualifier @ApplicationScoped -@Target({ ElementType.TYPE, ElementType.FIELD }) +@Target({ElementType.TYPE, ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME) public @interface KeysType { /** diff --git a/api/src/main/java/ds2/oss/core/api/persistence/AbstractEntityDtoConverterImpl.java b/api/src/main/java/ds2/oss/core/api/persistence/AbstractEntityDtoConverterImpl.java index 6cf9b268..5214d8a1 100644 --- a/api/src/main/java/ds2/oss/core/api/persistence/AbstractEntityDtoConverterImpl.java +++ b/api/src/main/java/ds2/oss/core/api/persistence/AbstractEntityDtoConverterImpl.java @@ -17,8 +17,8 @@ import ds2.oss.core.api.CoreException; import ds2.oss.core.api.IdAware; +import jakarta.persistence.EntityNotFoundException; -import javax.persistence.EntityNotFoundException; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/api/src/main/java/ds2/oss/core/api/persistence/InvalidEntityException.java b/api/src/main/java/ds2/oss/core/api/persistence/InvalidEntityException.java index 927320fa..2c326050 100644 --- a/api/src/main/java/ds2/oss/core/api/persistence/InvalidEntityException.java +++ b/api/src/main/java/ds2/oss/core/api/persistence/InvalidEntityException.java @@ -15,7 +15,7 @@ */ package ds2.oss.core.api.persistence; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; public class InvalidEntityException extends PersistenceException { public InvalidEntityException(String message) { diff --git a/api/src/main/java/ds2/oss/core/api/persistence/JpaSupport.java b/api/src/main/java/ds2/oss/core/api/persistence/JpaSupport.java index a96991b8..45a1d6a7 100644 --- a/api/src/main/java/ds2/oss/core/api/persistence/JpaSupport.java +++ b/api/src/main/java/ds2/oss/core/api/persistence/JpaSupport.java @@ -16,14 +16,14 @@ package ds2.oss.core.api.persistence; import ds2.oss.core.api.IdAware; +import jakarta.persistence.EntityExistsException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; +import jakarta.validation.constraints.NotNull; -import javax.persistence.EntityExistsException; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import javax.validation.constraints.NotNull; import java.lang.invoke.MethodHandles; import java.util.List; import java.util.logging.Level; diff --git a/api/src/main/java/ds2/oss/core/api/rest/RestEntityResource.java b/api/src/main/java/ds2/oss/core/api/rest/RestEntityResource.java index cf977fb7..12aff19e 100644 --- a/api/src/main/java/ds2/oss/core/api/rest/RestEntityResource.java +++ b/api/src/main/java/ds2/oss/core/api/rest/RestEntityResource.java @@ -18,12 +18,11 @@ import ds2.oss.core.api.CoreException; import ds2.oss.core.api.SearchCriteria; import ds2.oss.core.api.dto.impl.PagedResult; - -import javax.validation.constraints.Min; -import javax.ws.rs.*; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.SecurityContext; +import jakarta.validation.constraints.Min; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.SecurityContext; /** * Sample contract for a rest entity resource. Saying, to reflect database records. diff --git a/base-it/build.gradle b/base-it/build.gradle index c6ae2115..fcf987f1 100644 --- a/base-it/build.gradle +++ b/base-it/build.gradle @@ -7,8 +7,8 @@ dependencies { testImplementation group: 'org.testng', name: 'testng', version: '6.14.3' testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: project.ext.logbackVersion testImplementation group: 'com.h2database', name: 'h2', version: '2.0.202' - testImplementation group: 'org.jboss.arquillian.container', name: 'arquillian-glassfish-embedded-3.1', version: '1.0.2' - testImplementation(group: 'fish.payara.extras', name: 'payara-embedded-all', version: '5.2021.10') + testImplementation group: 'fish.payara.arquillian', name: 'arquillian-payara-server-embedded', version: '2.4.5' + testImplementation(group: 'fish.payara.extras', name: 'payara-embedded-all', version: '6.2021.1.Alpha1') compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') } test { diff --git a/base-it/src/main/java/ds2/oss/core/base/itest/DummyEntity.java b/base-it/src/main/java/ds2/oss/core/base/itest/DummyEntity.java index 346164dc..dca544e5 100644 --- a/base-it/src/main/java/ds2/oss/core/base/itest/DummyEntity.java +++ b/base-it/src/main/java/ds2/oss/core/base/itest/DummyEntity.java @@ -24,8 +24,8 @@ import ds2.oss.core.api.Persistable; import ds2.oss.core.dbtools.modules.CreatedModifiedAwareModule; import ds2.oss.core.dbtools.modules.EntryStatesAwareModule; +import jakarta.persistence.*; -import javax.persistence.*; import java.time.LocalDateTime; /** diff --git a/base-it/src/main/java/ds2/oss/core/base/itest/DummyPersistence.java b/base-it/src/main/java/ds2/oss/core/base/itest/DummyPersistence.java index fbcacaa7..f5876779 100644 --- a/base-it/src/main/java/ds2/oss/core/base/itest/DummyPersistence.java +++ b/base-it/src/main/java/ds2/oss/core/base/itest/DummyPersistence.java @@ -15,17 +15,17 @@ */ package ds2.oss.core.base.itest; -import javax.ejb.Local; +import jakarta.ejb.Local; import ds2.oss.core.api.PersistenceSupport; /** * Dummy persistence contract. - * + * * @author dstrauss * @version 0.2 */ @Local public interface DummyPersistence extends PersistenceSupport { - + } diff --git a/base-it/src/main/java/ds2/oss/core/base/itest/DummyPersistenceBean.java b/base-it/src/main/java/ds2/oss/core/base/itest/DummyPersistenceBean.java index fbc798bf..39fe3804 100644 --- a/base-it/src/main/java/ds2/oss/core/base/itest/DummyPersistenceBean.java +++ b/base-it/src/main/java/ds2/oss/core/base/itest/DummyPersistenceBean.java @@ -19,11 +19,10 @@ package ds2.oss.core.base.itest; import ds2.oss.core.api.persistence.InvalidEntityException; - -import javax.ejb.*; -import javax.persistence.EntityManager; -import javax.persistence.EntityNotFoundException; -import javax.persistence.PersistenceContext; +import jakarta.ejb.*; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.PersistenceContext; /** * The persistence bean. diff --git a/base-it/src/test/java/ds2/oss/core/base/it/DummyEntityIT.java b/base-it/src/test/java/ds2/oss/core/base/it/DummyEntityIT.java index 8b82fd12..f78930a8 100644 --- a/base-it/src/test/java/ds2/oss/core/base/it/DummyEntityIT.java +++ b/base-it/src/test/java/ds2/oss/core/base/it/DummyEntityIT.java @@ -17,6 +17,7 @@ import ds2.oss.core.base.itest.DummyEntity; import ds2.oss.core.base.itest.DummyPersistence; +import jakarta.ejb.EJB; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.ArchivePaths; @@ -29,8 +30,6 @@ import org.testng.Assert; import org.testng.annotations.Test; -import javax.ejb.EJB; - /** * A dummy persistence test. * diff --git a/base/build.gradle b/base/build.gradle index c3fab2eb..92fe6f11 100644 --- a/base/build.gradle +++ b/base/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'java' description = 'DS/2 OSS Core Base' ext.libraryVersions = [ - junit : '4.8.1', arquillian: '1.1.1.Final', jbossJavaeeSpec: '1.0.0.Final', weld: '1.1.1.Final', + junit : '4.8.1', arquillian: '1.1.1.Final', jbossJavaeeSpec: '1.0.0.Final', weld: '3.1.8.Final', slf4j : '1.5.10', log4j: '1.2.14', jbossAS6: '6.0.0.Final', glassfish: '4.0-b72', cdi: '1.0-SP4', hamcrest: '1.2', jbossAS7: '7.1.1.Final', shrinkwrapDesc: '2.0.0-alpha-3' ] @@ -18,16 +18,18 @@ configurations { } dependencies { + implementation (group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2') compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') implementation project(':ds2-oss-core-api') implementation project(':ds2-oss-core-statics') - testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.+' + testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '4.0.2.Final' testImplementation group: 'org.testng', name: 'testng', version: '7.4.0' testImplementation(group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32') testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: project.ext.logbackVersion testImplementation project(path: ':ds2-oss-core-testutils') compileOnly 'org.slf4j:slf4j-api:1.7.32' testRuntimeOnly(group: 'org.jboss', name: 'jandex', version: '2.4.+') + testRuntimeOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') weldEmbeddedTestRuntime group: 'org.jboss.arquillian.container', name: 'arquillian-weld-ee-embedded-1.1', version: '1.0.0.Final' weldEmbeddedTestRuntime group: 'org.jboss.spec', name: 'jboss-javaee-6.0', version: libraryVersions.jbossJavaeeSpec diff --git a/base/src/main/java/ds2/oss/core/base/impl/AlternateSecurityBaseDataImpl.java b/base/src/main/java/ds2/oss/core/base/impl/AlternateSecurityBaseDataImpl.java index d5466a8e..f22735f1 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/AlternateSecurityBaseDataImpl.java +++ b/base/src/main/java/ds2/oss/core/base/impl/AlternateSecurityBaseDataImpl.java @@ -16,13 +16,13 @@ package ds2.oss.core.base.impl; import ds2.oss.core.api.SecurityBaseData; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Inject; +import jakarta.interceptor.Interceptor; -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Alternative; -import javax.inject.Inject; -import javax.interceptor.Interceptor; import java.util.Random; /** diff --git a/base/src/main/java/ds2/oss/core/base/impl/Base64Konverter.java b/base/src/main/java/ds2/oss/core/base/impl/Base64Konverter.java index 8e3cad7e..5ad75088 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/Base64Konverter.java +++ b/base/src/main/java/ds2/oss/core/base/impl/Base64Konverter.java @@ -16,10 +16,10 @@ package ds2.oss.core.base.impl; import ds2.oss.core.api.Base64Codec; +import jakarta.enterprise.context.ApplicationScoped; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.context.ApplicationScoped; import java.io.ByteArrayOutputStream; import java.util.List; import java.util.Vector; diff --git a/base/src/main/java/ds2/oss/core/base/impl/BitSupportImpl.java b/base/src/main/java/ds2/oss/core/base/impl/BitSupportImpl.java index 56236032..44eead8f 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/BitSupportImpl.java +++ b/base/src/main/java/ds2/oss/core/base/impl/BitSupportImpl.java @@ -15,9 +15,8 @@ */ package ds2.oss.core.base.impl; -import javax.enterprise.context.ApplicationScoped; - import ds2.oss.core.api.BitSupport; +import jakarta.enterprise.context.ApplicationScoped; /** * The impl for the bit support contract. diff --git a/base/src/main/java/ds2/oss/core/base/impl/ConverterToolImpl.java b/base/src/main/java/ds2/oss/core/base/impl/ConverterToolImpl.java index 671f9225..f154f133 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/ConverterToolImpl.java +++ b/base/src/main/java/ds2/oss/core/base/impl/ConverterToolImpl.java @@ -15,12 +15,11 @@ */ package ds2.oss.core.base.impl; -import java.util.Date; - -import javax.enterprise.context.ApplicationScoped; - import ds2.oss.core.api.ConverterTool; import ds2.oss.core.statics.Convert; +import jakarta.enterprise.context.ApplicationScoped; + +import java.util.Date; /** * Implemenation of the converter. @@ -30,7 +29,7 @@ */ @ApplicationScoped public class ConverterToolImpl implements ConverterTool { - + @Override public long getDateMillis(final Date d) { if (d == null) { @@ -38,12 +37,12 @@ public long getDateMillis(final Date d) { } return d.getTime(); } - + @Override public Date toDate(final long ms) { return new Date(ms); } - + @Override public int toInt(final Object o, final int defValue) { return Convert.toInt(o, defValue); diff --git a/base/src/main/java/ds2/oss/core/base/impl/DefaultAssertImpl.java b/base/src/main/java/ds2/oss/core/base/impl/DefaultAssertImpl.java index cafbe47f..22d01199 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/DefaultAssertImpl.java +++ b/base/src/main/java/ds2/oss/core/base/impl/DefaultAssertImpl.java @@ -18,10 +18,9 @@ import ds2.oss.core.api.AssertHelper; import ds2.oss.core.api.CoreErrors; import ds2.oss.core.api.CoreRuntimeException; - -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Alternative; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Alternative; /** * Created by deindesign on 17.03.16. diff --git a/base/src/main/java/ds2/oss/core/base/impl/DefaultCoreConfiguration.java b/base/src/main/java/ds2/oss/core/base/impl/DefaultCoreConfiguration.java index 24d234ee..aaaf5413 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/DefaultCoreConfiguration.java +++ b/base/src/main/java/ds2/oss/core/base/impl/DefaultCoreConfiguration.java @@ -16,10 +16,9 @@ package ds2.oss.core.base.impl; import ds2.oss.core.api.CoreConfiguration; - -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; /** * Created by deindesign on 21.03.16. diff --git a/base/src/main/java/ds2/oss/core/base/impl/DefaultJavaRuntimeData.java b/base/src/main/java/ds2/oss/core/base/impl/DefaultJavaRuntimeData.java index 711b521e..7381fe37 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/DefaultJavaRuntimeData.java +++ b/base/src/main/java/ds2/oss/core/base/impl/DefaultJavaRuntimeData.java @@ -15,9 +15,8 @@ */ package ds2.oss.core.base.impl; -import javax.enterprise.context.ApplicationScoped; - import ds2.oss.core.api.crypto.JavaRuntimeData; +import jakarta.enterprise.context.ApplicationScoped; /** * The default java runtime data. diff --git a/base/src/main/java/ds2/oss/core/base/impl/HexKonverter.java b/base/src/main/java/ds2/oss/core/base/impl/HexKonverter.java index 5e6a5696..c23a3a20 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/HexKonverter.java +++ b/base/src/main/java/ds2/oss/core/base/impl/HexKonverter.java @@ -16,10 +16,10 @@ package ds2.oss.core.base.impl; import ds2.oss.core.api.HexCodec; +import jakarta.enterprise.context.ApplicationScoped; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.context.ApplicationScoped; import java.io.ByteArrayOutputStream; import java.lang.invoke.MethodHandles; import java.math.BigInteger; diff --git a/base/src/main/java/ds2/oss/core/base/impl/InetAddressServiceImpl.java b/base/src/main/java/ds2/oss/core/base/impl/InetAddressServiceImpl.java index 041021cc..7b2c6711 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/InetAddressServiceImpl.java +++ b/base/src/main/java/ds2/oss/core/base/impl/InetAddressServiceImpl.java @@ -15,24 +15,21 @@ */ package ds2.oss.core.base.impl; -import java.net.InetAddress; -import java.net.UnknownHostException; - -import javax.enterprise.context.ApplicationScoped; - +import ds2.oss.core.api.InetAddressService; +import jakarta.enterprise.context.ApplicationScoped; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ds2.oss.core.api.InetAddressService; +import java.net.InetAddress; +import java.net.UnknownHostException; /** * @author dstrauss - * */ @ApplicationScoped public class InetAddressServiceImpl implements InetAddressService { private static final Logger LOG = LoggerFactory.getLogger(InetAddressServiceImpl.class); - + /* * (non-Javadoc) * @see ds2.oss.core.api.InetAddressService#getByName(java.lang.String) @@ -46,5 +43,5 @@ public InetAddress getByName(String name) { } return null; } - + } diff --git a/base/src/main/java/ds2/oss/core/base/impl/IoServiceImpl.java b/base/src/main/java/ds2/oss/core/base/impl/IoServiceImpl.java index d54607f7..3c2b0971 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/IoServiceImpl.java +++ b/base/src/main/java/ds2/oss/core/base/impl/IoServiceImpl.java @@ -17,10 +17,10 @@ import ds2.oss.core.api.IoService; import ds2.oss.core.statics.IoMethods; +import jakarta.enterprise.context.ApplicationScoped; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.context.ApplicationScoped; import java.io.BufferedWriter; import java.io.IOException; import java.io.InputStream; diff --git a/base/src/main/java/ds2/oss/core/base/impl/LocaleSupportProducer.java b/base/src/main/java/ds2/oss/core/base/impl/LocaleSupportProducer.java index faba85f7..a9afa4d8 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/LocaleSupportProducer.java +++ b/base/src/main/java/ds2/oss/core/base/impl/LocaleSupportProducer.java @@ -15,14 +15,13 @@ */ package ds2.oss.core.base.impl; -import java.lang.annotation.Annotation; - -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.InjectionPoint; - import ds2.oss.core.api.LocaleSupport; import ds2.oss.core.api.annotations.LocaleData; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.InjectionPoint; + +import java.lang.annotation.Annotation; /** * A producer for LocaleSupport instances. @@ -34,8 +33,7 @@ public class LocaleSupportProducer { /** * Produces a locale support instance. * - * @param p - * the injection point + * @param p the injection point * @return the locale support. */ @Produces diff --git a/base/src/main/java/ds2/oss/core/base/impl/NameNormalizerImpl.java b/base/src/main/java/ds2/oss/core/base/impl/NameNormalizerImpl.java index e86e9c82..a4b8ae10 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/NameNormalizerImpl.java +++ b/base/src/main/java/ds2/oss/core/base/impl/NameNormalizerImpl.java @@ -15,17 +15,15 @@ */ package ds2.oss.core.base.impl; -import javax.enterprise.context.ApplicationScoped; - import ds2.oss.core.api.NameNormalizer; +import jakarta.enterprise.context.ApplicationScoped; /** * @author dstrauss - * */ @ApplicationScoped public class NameNormalizerImpl implements NameNormalizer { - + @Override public String normalize(String s) { if (s == null) { @@ -49,5 +47,5 @@ public String normalize(String s) { StringBuilder sb = new StringBuilder(s); return sb.toString(); } - + } diff --git a/base/src/main/java/ds2/oss/core/base/impl/PathLocationProvider.java b/base/src/main/java/ds2/oss/core/base/impl/PathLocationProvider.java index 266afae2..f8edc247 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/PathLocationProvider.java +++ b/base/src/main/java/ds2/oss/core/base/impl/PathLocationProvider.java @@ -15,24 +15,21 @@ */ package ds2.oss.core.base.impl; +import ds2.oss.core.api.annotations.PathLocation; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.InjectionPoint; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.lang.annotation.Annotation; import java.lang.invoke.MethodHandles; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Set; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.InjectionPoint; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import ds2.oss.core.api.annotations.PathLocation; - /** * The path location provider. * @@ -51,8 +48,7 @@ public class PathLocationProvider { /** * Produces the path object. * - * @param p - * the injection point + * @param p the injection point * @return the path, or null if not found */ @Produces diff --git a/base/src/main/java/ds2/oss/core/base/impl/PropertiesLoaderProvider.java b/base/src/main/java/ds2/oss/core/base/impl/PropertiesLoaderProvider.java index 10db16a7..f4d6f032 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/PropertiesLoaderProvider.java +++ b/base/src/main/java/ds2/oss/core/base/impl/PropertiesLoaderProvider.java @@ -16,16 +16,14 @@ package ds2.oss.core.base.impl; import ds2.oss.core.api.Validate; -import ds2.oss.core.api.annotations.PathLocation; import ds2.oss.core.api.annotations.PropertiesLoader; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Inject; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -53,8 +51,7 @@ public class PropertiesLoaderProvider { /** * Produces the path object. * - * @param p - * the injection point + * @param p the injection point * @return the path, or null if not found */ @Produces @@ -66,85 +63,88 @@ public Properties createProperties(final InjectionPoint p) { for (Annotation a : annotations) { if (a instanceof PropertiesLoader) { PropertiesLoader pl = (PropertiesLoader) a; - rc=readFromFile(pl); - if(rc==null){ - rc=readFromSysprop(pl); + rc = readFromFile(pl); + if (rc == null) { + rc = readFromSysprop(pl); } - if(rc==null){ - rc=readFromEnv(pl); + if (rc == null) { + rc = readFromEnv(pl); } - if(rc==null){ - rc=readFromResource(pl); + if (rc == null) { + rc = readFromResource(pl); } - if(rc==null&&!pl.setNullOnFail()){ - rc=new Properties(); + if (rc == null && !pl.setNullOnFail()) { + rc = new Properties(); } } } LOG.debug("returning properties: {}", rc); + if (rc == null) { + LOG.warn("No properties found??"); + } return rc; } private Properties readFromResource(PropertiesLoader pl) { - String resourcePath=pl.resource(); - Properties rc=null; - if(!val.isEmpty(resourcePath)){ + String resourcePath = pl.resource(); + Properties rc = null; + if (!val.isEmpty(resourcePath)) { LOG.debug("Trying to load resource {}", resourcePath); - try (InputStream is=getClass().getResourceAsStream(resourcePath)){ - rc=new Properties(); + try (InputStream is = getClass().getResourceAsStream(resourcePath)) { + rc = new Properties(); rc.load(is); } catch (IOException e) { - LOG.warn("Error when loading the resource "+resourcePath,e); - rc=null; + LOG.warn("Error when loading the resource " + resourcePath, e); + rc = null; } } return rc; } - private Properties readFromEnv(PropertiesLoader pl){ - String envVal=System.getenv(pl.envProp()); - if(!val.isEmpty(envVal)){ - Path p=Paths.get(envVal); + private Properties readFromEnv(PropertiesLoader pl) { + String envVal = System.getenv(pl.envProp()); + if (!val.isEmpty(envVal)) { + Path p = Paths.get(envVal); return readFile(p); } return null; } - private Properties readFromSysprop(PropertiesLoader pl){ - String sysPropStr=pl.sysProp(); - if(val.isEmpty(sysPropStr)){ + private Properties readFromSysprop(PropertiesLoader pl) { + String sysPropStr = pl.sysProp(); + if (val.isEmpty(sysPropStr)) { return null; } - String sysPropVal=System.getProperty(pl.sysProp()); - if(!val.isEmpty(sysPropVal)){ - Path p=Paths.get(sysPropVal); + String sysPropVal = System.getProperty(pl.sysProp()); + if (!val.isEmpty(sysPropVal)) { + Path p = Paths.get(sysPropVal); return readFile(p); } return null; } - private Properties readFromFile(PropertiesLoader pl){ - String filePath=pl.filePath(); - if(!val.isEmpty(filePath)){ - Path p=Paths.get(filePath); + private Properties readFromFile(PropertiesLoader pl) { + String filePath = pl.filePath(); + if (!val.isEmpty(filePath)) { + Path p = Paths.get(filePath); return readFile(p); } return null; } - private Properties readFile(Path p){ - Properties rc=null; - if(Files.isReadable(p)){ - try(BufferedReader reader=Files.newBufferedReader(p, Charset.forName("utf-8"))) { - rc=new Properties(); - rc.load(reader); - } catch (IOException e) { - LOG.warn("Error when reading the properties file!",e); - } - } else { - LOG.warn("Given file {} is not readable!", p); + private Properties readFile(Path p) { + Properties rc = null; + if (Files.isReadable(p)) { + try (BufferedReader reader = Files.newBufferedReader(p, Charset.forName("utf-8"))) { + rc = new Properties(); + rc.load(reader); + } catch (IOException e) { + LOG.warn("Error when reading the properties file!", e); } - return rc; + } else { + LOG.warn("Given file {} is not readable!", p); + } + return rc; } } diff --git a/base/src/main/java/ds2/oss/core/base/impl/RandomProvider.java b/base/src/main/java/ds2/oss/core/base/impl/RandomProvider.java index 882e72ff..eabc71c4 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/RandomProvider.java +++ b/base/src/main/java/ds2/oss/core/base/impl/RandomProvider.java @@ -15,22 +15,16 @@ */ package ds2.oss.core.base.impl; -import ds2.oss.core.api.annotations.SecureRandomizer; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Produces; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.InjectionPoint; -import java.lang.annotation.Annotation; import java.lang.invoke.MethodHandles; import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; -import java.security.SecureRandom; import java.util.Random; -import java.util.Set; /** * Simple provider for Random instances. diff --git a/base/src/main/java/ds2/oss/core/base/impl/RuntimeEnvironmentImpl.java b/base/src/main/java/ds2/oss/core/base/impl/RuntimeEnvironmentImpl.java index 314b0f98..b4d8d9df 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/RuntimeEnvironmentImpl.java +++ b/base/src/main/java/ds2/oss/core/base/impl/RuntimeEnvironmentImpl.java @@ -18,10 +18,10 @@ import ds2.oss.core.api.annotations.StringLoader; import ds2.oss.core.api.environment.*; import ds2.oss.core.statics.Methods; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; @ApplicationScoped public class RuntimeEnvironmentImpl implements RuntimeEnvironment { diff --git a/base/src/main/java/ds2/oss/core/base/impl/SecureJavaRuntimeData.java b/base/src/main/java/ds2/oss/core/base/impl/SecureJavaRuntimeData.java index b4330fbd..038715a3 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/SecureJavaRuntimeData.java +++ b/base/src/main/java/ds2/oss/core/base/impl/SecureJavaRuntimeData.java @@ -15,10 +15,9 @@ */ package ds2.oss.core.base.impl; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; - import ds2.oss.core.api.crypto.JavaRuntimeData; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; /** * Strong java runtime data. diff --git a/base/src/main/java/ds2/oss/core/base/impl/SecureRandomProvider.java b/base/src/main/java/ds2/oss/core/base/impl/SecureRandomProvider.java index e0be190f..39374297 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/SecureRandomProvider.java +++ b/base/src/main/java/ds2/oss/core/base/impl/SecureRandomProvider.java @@ -19,11 +19,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.InjectionPoint; + import java.lang.annotation.Annotation; import java.lang.invoke.MethodHandles; import java.security.NoSuchAlgorithmException; diff --git a/base/src/main/java/ds2/oss/core/base/impl/ServerIdentifierProviderImpl.java b/base/src/main/java/ds2/oss/core/base/impl/ServerIdentifierProviderImpl.java index 82aa013d..4678c040 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/ServerIdentifierProviderImpl.java +++ b/base/src/main/java/ds2/oss/core/base/impl/ServerIdentifierProviderImpl.java @@ -15,21 +15,15 @@ */ package ds2.oss.core.base.impl; -import java.net.Inet6Address; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.net.UnknownHostException; -import java.util.Enumeration; - -import javax.enterprise.context.ApplicationScoped; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import ds2.oss.core.api.environment.ServerIdentifier; import ds2.oss.core.api.environment.ServerIdentifierDto; import ds2.oss.core.api.environment.ServerIdentifierProvider; +import jakarta.enterprise.context.ApplicationScoped; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.net.*; +import java.util.Enumeration; /** * A server snooper. diff --git a/base/src/main/java/ds2/oss/core/base/impl/SslServerSnooperImpl.java b/base/src/main/java/ds2/oss/core/base/impl/SslServerSnooperImpl.java index 4fe8e225..d0033ec1 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/SslServerSnooperImpl.java +++ b/base/src/main/java/ds2/oss/core/base/impl/SslServerSnooperImpl.java @@ -17,10 +17,10 @@ import ds2.oss.core.api.SslServerSnooper; import ds2.oss.core.api.annotations.SecureRandomizer; +import jakarta.enterprise.context.ApplicationScoped; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.context.ApplicationScoped; import javax.net.ssl.*; import java.io.File; import java.io.FileInputStream; @@ -208,7 +208,7 @@ public X509Certificate[] getServerCertificates(final String hostname, final int } catch (final IOException e) { LOG.error("Error when reading the SSL sockets.", e); } - LOG.debug("Certificates so far: {}", (Object[])rc); + LOG.debug("Certificates so far: {}", (Object[]) rc); return rc; } } diff --git a/base/src/main/java/ds2/oss/core/base/impl/StringPropertyLoaderImpl.java b/base/src/main/java/ds2/oss/core/base/impl/StringPropertyLoaderImpl.java index 35a39add..e7cd11bc 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/StringPropertyLoaderImpl.java +++ b/base/src/main/java/ds2/oss/core/base/impl/StringPropertyLoaderImpl.java @@ -18,12 +18,12 @@ import ds2.oss.core.api.annotations.StringLoader; import ds2.oss.core.statics.Methods; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.InjectionPoint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.InjectionPoint; import java.lang.annotation.Annotation; import java.lang.invoke.MethodHandles; import java.util.Set; diff --git a/base/src/main/java/ds2/oss/core/base/impl/SymmetricKeyServiceImpl.java b/base/src/main/java/ds2/oss/core/base/impl/SymmetricKeyServiceImpl.java index 0873fb9a..421402ae 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/SymmetricKeyServiceImpl.java +++ b/base/src/main/java/ds2/oss/core/base/impl/SymmetricKeyServiceImpl.java @@ -17,13 +17,13 @@ import ds2.oss.core.api.SymmetricKeyNames; import ds2.oss.core.api.SymmetricKeyService; +import jakarta.enterprise.context.ApplicationScoped; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.crypto.SecretKey; import javax.crypto.SecretKeyFactory; import javax.crypto.spec.PBEKeySpec; -import javax.enterprise.context.ApplicationScoped; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; import java.security.spec.KeySpec; diff --git a/base/src/main/java/ds2/oss/core/base/impl/SystemPropertyServiceImpl.java b/base/src/main/java/ds2/oss/core/base/impl/SystemPropertyServiceImpl.java index 4b61d615..b39da054 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/SystemPropertyServiceImpl.java +++ b/base/src/main/java/ds2/oss/core/base/impl/SystemPropertyServiceImpl.java @@ -17,7 +17,8 @@ import ds2.oss.core.api.SystemPropertyService; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; + import java.util.Properties; /** diff --git a/base/src/main/java/ds2/oss/core/base/impl/UserAgentServiceImpl.java b/base/src/main/java/ds2/oss/core/base/impl/UserAgentServiceImpl.java index 12a3c493..9436ab74 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/UserAgentServiceImpl.java +++ b/base/src/main/java/ds2/oss/core/base/impl/UserAgentServiceImpl.java @@ -3,7 +3,7 @@ import ds2.oss.core.api.UserAgentDetails; import ds2.oss.core.api.UserAgentService; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class UserAgentServiceImpl implements UserAgentService { diff --git a/base/src/main/java/ds2/oss/core/base/impl/ValidateImpl.java b/base/src/main/java/ds2/oss/core/base/impl/ValidateImpl.java index 52fcb0ed..ba6f0b88 100644 --- a/base/src/main/java/ds2/oss/core/base/impl/ValidateImpl.java +++ b/base/src/main/java/ds2/oss/core/base/impl/ValidateImpl.java @@ -16,8 +16,7 @@ package ds2.oss.core.base.impl; import ds2.oss.core.api.Validate; - -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; /** * Created by deindesign on 14.12.15. diff --git a/base/src/test/java/ds2/oss/core/base/impl/test/LocaleSupportImplTest.java b/base/src/test/java/ds2/oss/core/base/impl/test/LocaleSupportImplTest.java index a3292c4b..6dc4c934 100644 --- a/base/src/test/java/ds2/oss/core/base/impl/test/LocaleSupportImplTest.java +++ b/base/src/test/java/ds2/oss/core/base/impl/test/LocaleSupportImplTest.java @@ -72,7 +72,7 @@ public void testCurrencyConvertNull() { @Test public void testCurrencyConvert1() { - Assert.assertEquals(to.formatCurrency(Locale.GERMANY, 1234.56), "1.234,56 \u20ac"); + Assert.assertEquals(to.formatCurrency(Locale.GERMANY, 1234.56), "1.234,56 €"); } @Test diff --git a/base/src/test/java/ds2/oss/core/base/impl/test/LocaleSupportTestProvider.java b/base/src/test/java/ds2/oss/core/base/impl/test/LocaleSupportTestProvider.java index 3bea8577..d33b1581 100644 --- a/base/src/test/java/ds2/oss/core/base/impl/test/LocaleSupportTestProvider.java +++ b/base/src/test/java/ds2/oss/core/base/impl/test/LocaleSupportTestProvider.java @@ -15,60 +15,58 @@ */ package ds2.oss.core.base.impl.test; +import ds2.oss.core.api.LocaleSupport; +import ds2.oss.core.api.annotations.LocaleData; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - -import ds2.oss.core.api.LocaleSupport; -import ds2.oss.core.api.annotations.LocaleData; - /** * A dummy provider. * - * @version 0.3 * @author dstrauss + * @version 0.3 */ @ApplicationScoped public class LocaleSupportTestProvider { - + /** * The injection. */ @Inject @LocaleData(baseName = "ds2/oss/core/base/impl/test/LocTest") private LocaleSupport localeSupport; - + public String formatCurrency(final Locale locale, final double val) { return localeSupport.formatCurrency(locale, val); } - + public String formatCurrencyNumber(final Locale locale, final double val) { return localeSupport.formatCurrencyNumber(locale, val); } - + public String formatDate(final Date date, final Locale locale, TimeZone tz, final int dateStyle) { return localeSupport.formatDate(date, locale, tz, dateStyle); } - + public String formatDateTime(final Date date, final Locale locale, TimeZone tz, final int dateStyle, - final int timeStyle) { + final int timeStyle) { return localeSupport.formatDateTime(date, locale, tz, dateStyle, timeStyle); } - + /** * The hello method. * - * @param locale - * the locale + * @param locale the locale * @return the resolved i18n string. */ public String getHello(final Locale locale) { return localeSupport.resolve("hello", locale); } - + public String getHelloParam(final Locale locale, final String name) { return localeSupport.resolve("helloParam", locale, name); } diff --git a/base/src/test/java/ds2/oss/core/base/impl/test/PropsLoaderDto.java b/base/src/test/java/ds2/oss/core/base/impl/test/PropsLoaderDto.java index 37c582a8..3e738cd5 100644 --- a/base/src/test/java/ds2/oss/core/base/impl/test/PropsLoaderDto.java +++ b/base/src/test/java/ds2/oss/core/base/impl/test/PropsLoaderDto.java @@ -16,9 +16,9 @@ package ds2.oss.core.base.impl.test; import ds2.oss.core.api.annotations.PropertiesLoader; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; import java.util.Properties; /** @@ -30,7 +30,7 @@ public class PropsLoaderDto { @PropertiesLoader(resource = "/ds2/oss/core/base/impl/test/propsLoader.properties") private Properties props; - public String getValue(){ + public String getValue() { return props.getProperty("val"); } } diff --git a/base/src/test/java/ds2/oss/core/base/impl/test/SecBaseDto.java b/base/src/test/java/ds2/oss/core/base/impl/test/SecBaseDto.java index 5760229f..64170edf 100644 --- a/base/src/test/java/ds2/oss/core/base/impl/test/SecBaseDto.java +++ b/base/src/test/java/ds2/oss/core/base/impl/test/SecBaseDto.java @@ -16,10 +16,10 @@ package ds2.oss.core.base.impl.test; import ds2.oss.core.api.SecurityBaseData; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; import java.nio.charset.Charset; /** diff --git a/build.gradle b/build.gradle index 1c5c21c3..56331b9e 100644 --- a/build.gradle +++ b/build.gradle @@ -23,9 +23,9 @@ allprojects { group = 'ds2.oss.core' - ext.log4j2Version='2.14.1' - ext.logbackVersion='1.2.4' - ext.jacksonVersion='2.13.1' + ext.log4j2Version = '2.14.1' + ext.logbackVersion = '1.2.4' + ext.jacksonVersion = '2.13.1' baseConfig { javaVersion = JavaVersion.VERSION_1_8 @@ -41,7 +41,8 @@ allprojects { mavenLocal() if (project.hasProperty('ds2RepoUrl')) { println 'Can use DS2 Repo :)' - maven { url ds2RepoUrl + maven { + url ds2RepoUrl credentials { username ds2RepoUser password ds2RepoPw @@ -91,8 +92,8 @@ subprojects { apply plugin: 'java' apply plugin: 'maven-publish' - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 +// sourceCompatibility = JavaVersion.VERSION_1_8 +// targetCompatibility = JavaVersion.VERSION_1_8 publishing { repositories { diff --git a/codec-boon/build.gradle b/codec-boon/build.gradle index 331e7a23..1838008e 100644 --- a/codec-boon/build.gradle +++ b/codec-boon/build.gradle @@ -8,7 +8,7 @@ dependencies { testImplementation(group: 'org.apache.logging.log4j', name: 'log4j-core', version: project.ext.log4j2Version) { exclude(module: 'tools') } - testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version:'2.2.4.Final' + testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version:'4.0.2.Final' testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: project.ext.log4j2Version testImplementation project(path: ':ds2-oss-core-testutils') testImplementation group: 'org.jboss', name: 'jandex', version:'2.4.1.Final' diff --git a/codec-fastxml/build.gradle b/codec-fastxml/build.gradle index e06f909d..30c873b5 100644 --- a/codec-fastxml/build.gradle +++ b/codec-fastxml/build.gradle @@ -6,7 +6,7 @@ dependencies { testImplementation(group: 'org.apache.logging.log4j', name: 'log4j-core', version: project.ext.log4j2Version) { exclude(module: 'tools') } - testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.2.4.Final' + testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '4.0.2.Final' testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: project.ext.log4j2Version testImplementation project(path: ':ds2-oss-core-testutils') testImplementation group: 'org.jboss', name: 'jandex', version: '2.4.1.Final' diff --git a/codec-genson/build.gradle b/codec-genson/build.gradle index 04c5fb07..68a5ad1a 100644 --- a/codec-genson/build.gradle +++ b/codec-genson/build.gradle @@ -6,7 +6,7 @@ dependencies { testImplementation(group: 'org.apache.logging.log4j', name: 'log4j-core', version: project.ext.log4j2Version) { exclude(module: 'tools') } - testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.2.4.Final' + testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '4.0.2.Final' testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: project.ext.log4j2Version testImplementation project(path: ':ds2-oss-core-testutils') testImplementation group: 'org.jboss', name: 'jandex', version: '2.4.1.Final' diff --git a/codec-gson/build.gradle b/codec-gson/build.gradle index 669c8499..17751123 100644 --- a/codec-gson/build.gradle +++ b/codec-gson/build.gradle @@ -9,7 +9,7 @@ dependencies { testImplementation(group: 'org.apache.logging.log4j', name: 'log4j-core', version: project.ext.log4j2Version) { exclude(module: 'tools') } - testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.2.4.Final' + testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '4.0.2.Final' testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: project.ext.log4j2Version testImplementation project(path: ':ds2-oss-core-testutils') testImplementation group: 'org.jboss', name: 'jandex', version: '2.4.1.Final' diff --git a/crypto-bc/build.gradle b/crypto-bc/build.gradle index 2f00b582..62ca3115 100644 --- a/crypto-bc/build.gradle +++ b/crypto-bc/build.gradle @@ -7,7 +7,7 @@ dependencies { testImplementation project(path: ':ds2-oss-core-testutils') testImplementation group: 'org.testng', name: 'testng', version: '7.4.0' testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: project.ext.logbackVersion - testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.2.4.Final' + testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '4.0.2.Final' testImplementation group: 'org.jboss', name: 'jandex', version: '2.4.1.Final' compileOnly 'org.slf4j:slf4j-api:1.7.32' compileOnly(group: 'javax.enterprise', name: 'cdi-api', version: '2.0') { diff --git a/crypto/build.gradle b/crypto/build.gradle index ae9e2274..e01d9fd3 100644 --- a/crypto/build.gradle +++ b/crypto/build.gradle @@ -12,7 +12,7 @@ dependencies { exclude(module: 'tools') } testImplementation group: 'com.googlecode.komarro', name: 'komarro', version: '1.0' - testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.2.4.Final' + testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '4.0.2.Final' testRuntimeOnly group: 'com.lmax', name: 'disruptor', version: '3.4.4' testImplementation project(path: ':ds2-oss-core-testutils') testImplementation group: 'org.jboss', name: 'jandex', version: '2.4.1.Final' diff --git a/crypto/src/main/java/ds2/oss/core/crypto/AppServerSecurityBaseDataServiceImpl.java b/crypto/src/main/java/ds2/oss/core/crypto/AppServerSecurityBaseDataServiceImpl.java index 9b68f42b..b60f0cf4 100644 --- a/crypto/src/main/java/ds2/oss/core/crypto/AppServerSecurityBaseDataServiceImpl.java +++ b/crypto/src/main/java/ds2/oss/core/crypto/AppServerSecurityBaseDataServiceImpl.java @@ -15,6 +15,23 @@ */ package ds2.oss.core.crypto; +import ds2.oss.core.api.AppServerSecurityBaseDataService; +import ds2.oss.core.api.ConverterTool; +import ds2.oss.core.api.HexCodec; +import ds2.oss.core.api.IoService; +import ds2.oss.core.api.annotations.PathLocation; +import ds2.oss.core.api.crypto.BytesProvider; +import ds2.oss.core.api.crypto.KeyGeneratorService; +import ds2.oss.core.base.impl.AlternateSecurityBaseDataImpl; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Specializes; +import jakarta.inject.Inject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import javax.crypto.SecretKey; import java.io.IOException; import java.lang.invoke.MethodHandles; import java.nio.charset.Charset; @@ -28,25 +45,6 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.crypto.SecretKey; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Specializes; -import javax.inject.Inject; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import ds2.oss.core.api.AppServerSecurityBaseDataService; -import ds2.oss.core.api.ConverterTool; -import ds2.oss.core.api.HexCodec; -import ds2.oss.core.api.IoService; -import ds2.oss.core.api.annotations.PathLocation; -import ds2.oss.core.api.crypto.BytesProvider; -import ds2.oss.core.api.crypto.KeyGeneratorService; -import ds2.oss.core.base.impl.AlternateSecurityBaseDataImpl; - /** * The impl for application servers. * @@ -56,8 +54,8 @@ @ApplicationScoped @Specializes public class AppServerSecurityBaseDataServiceImpl extends AlternateSecurityBaseDataImpl - implements - AppServerSecurityBaseDataService { + implements + AppServerSecurityBaseDataService { /** * A simple lock. @@ -186,7 +184,7 @@ public void onLoad() { LOG.debug("Location to use is {}", storageLocation); final String skContent = io.loadFile(storageLocation.resolve(SK_FILENAME), Charset.defaultCharset()); final Properties props = io.loadProperties(storageLocation.resolve(PROPS_FILENAME)); - LOG.debug("Props is {}", new Object[] { props }); + LOG.debug("Props is {}", new Object[]{props}); if (props != null) { minIteration = conv.toInt(props.getProperty("iterations"), minIteration); if (minIteration <= 1000) { diff --git a/crypto/src/main/java/ds2/oss/core/crypto/Argon2PasswordServiceImpl.java b/crypto/src/main/java/ds2/oss/core/crypto/Argon2PasswordServiceImpl.java index 7478e072..da7fc4ee 100644 --- a/crypto/src/main/java/ds2/oss/core/crypto/Argon2PasswordServiceImpl.java +++ b/crypto/src/main/java/ds2/oss/core/crypto/Argon2PasswordServiceImpl.java @@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory; import javax.annotation.PostConstruct; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import java.lang.invoke.MethodHandles; @Dependent diff --git a/crypto/src/main/java/ds2/oss/core/crypto/DefaultSecurityProvider.java b/crypto/src/main/java/ds2/oss/core/crypto/DefaultSecurityProvider.java index 08f133c8..e515e8f0 100644 --- a/crypto/src/main/java/ds2/oss/core/crypto/DefaultSecurityProvider.java +++ b/crypto/src/main/java/ds2/oss/core/crypto/DefaultSecurityProvider.java @@ -15,22 +15,17 @@ */ package ds2.oss.core.crypto; -import java.lang.invoke.MethodHandles; -import java.security.*; - -import javax.annotation.PostConstruct; -import javax.crypto.*; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import ds2.oss.core.api.AssertHelper; import ds2.oss.core.api.crypto.AlgorithmNamed; -import ds2.oss.core.api.crypto.KeyPairGenAlgorithm; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ds2.oss.core.api.crypto.Ciphers; -import ds2.oss.core.api.crypto.KeyGeneratorNames; +import javax.annotation.PostConstruct; +import javax.crypto.*; +import java.lang.invoke.MethodHandles; +import java.security.*; /** * The JVM default security provider. @@ -40,14 +35,14 @@ */ @ApplicationScoped public class DefaultSecurityProvider implements SecurityInstanceProvider { - + /** * A logger. */ private static final transient Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); @Inject private AssertHelper assrt; - + /* * (non-Javadoc) * @see @@ -57,18 +52,18 @@ public class DefaultSecurityProvider implements SecurityInstanceProvider { @Override public Cipher createCipherInstance(final AlgorithmNamed c) { assrt.assertNotNull(c, "No algorithm object given!"); - assrt.assertNotEmpty(c.getAlgorithmName(),"No algorithm name given!"); + assrt.assertNotEmpty(c.getAlgorithmName(), "No algorithm name given!"); LOG.debug("Getting cipher for alg {}", c); Cipher rc = null; try { - rc=Cipher.getInstance(c.getAlgorithmName()); + rc = Cipher.getInstance(c.getAlgorithmName()); } catch (final NoSuchPaddingException | NoSuchAlgorithmException e) { LOG.error("Error when creating the cipher instance!", e); } - LOG.debug("Returning cipher {} for {}", new Object[] { rc, c }); + LOG.debug("Returning cipher {} for {}", new Object[]{rc, c}); return rc; } - + /* * (non-Javadoc) * @see ds2.oss.core.crypto.SecurityInstanceProvider#createKeyGenerator(ds2.oss.core.api.crypto. @@ -77,7 +72,7 @@ public Cipher createCipherInstance(final AlgorithmNamed c) { @Override public KeyGenerator createKeyGenerator(final AlgorithmNamed name) { assrt.assertNotNull(name, "No algorithm object given!"); - assrt.assertNotEmpty(name.getAlgorithmName(),"No algorithm name given!"); + assrt.assertNotEmpty(name.getAlgorithmName(), "No algorithm name given!"); try { return KeyGenerator.getInstance(name.getAlgorithmName()); } catch (final NoSuchAlgorithmException e) { @@ -89,7 +84,7 @@ public KeyGenerator createKeyGenerator(final AlgorithmNamed name) { @Override public KeyPairGenerator createKeyPairGenerator(AlgorithmNamed alg) { assrt.assertNotNull(alg, "No algorithm object given!"); - assrt.assertNotEmpty(alg.getAlgorithmName(),"No algorithm name given!"); + assrt.assertNotEmpty(alg.getAlgorithmName(), "No algorithm name given!"); try { return KeyPairGenerator.getInstance(alg.getAlgorithmName()); } catch (NoSuchAlgorithmException e) { @@ -105,7 +100,7 @@ public KeyPairGenerator createKeyPairGenerator(AlgorithmNamed alg) { */ @Override public SecretKeyFactory createSecretKeyFactoryInstance(final String string) { - assrt.assertNotEmpty(string,"No algorithm name given!"); + assrt.assertNotEmpty(string, "No algorithm name given!"); try { return SecretKeyFactory.getInstance(string); } catch (final NoSuchAlgorithmException e) { @@ -117,7 +112,7 @@ public SecretKeyFactory createSecretKeyFactoryInstance(final String string) { @Override public KeyAgreement createKeyAgreement(AlgorithmNamed alg) { assrt.assertNotNull(alg, "No algorithm object given!"); - assrt.assertNotEmpty(alg.getAlgorithmName(),"No algorithm name given!"); + assrt.assertNotEmpty(alg.getAlgorithmName(), "No algorithm name given!"); try { KeyAgreement keyAgreement = KeyAgreement.getInstance("ECDH"); return keyAgreement; @@ -130,7 +125,7 @@ public KeyAgreement createKeyAgreement(AlgorithmNamed alg) { @Override public SecureRandom createSecureRandom(AlgorithmNamed alg) { assrt.assertNotNull(alg, "No algorithm object given!"); - assrt.assertNotEmpty(alg.getAlgorithmName(),"No algorithm name given!"); + assrt.assertNotEmpty(alg.getAlgorithmName(), "No algorithm name given!"); try { return SecureRandom.getInstance(alg.getAlgorithmName()); } catch (NoSuchAlgorithmException e) { @@ -163,5 +158,5 @@ public MessageDigest createMessageDigest(AlgorithmNamed alg) { public void onLoad() { LOG.debug("Using JCE default provider."); } - + } diff --git a/crypto/src/main/java/ds2/oss/core/crypto/EllipticCurveSupport.java b/crypto/src/main/java/ds2/oss/core/crypto/EllipticCurveSupport.java index b6874104..e5d61bdd 100644 --- a/crypto/src/main/java/ds2/oss/core/crypto/EllipticCurveSupport.java +++ b/crypto/src/main/java/ds2/oss/core/crypto/EllipticCurveSupport.java @@ -20,8 +20,8 @@ import ds2.oss.core.api.dto.impl.EllipticCurveDataDto; import ds2.oss.core.api.maths.WeierstrassCurveData; import ds2.oss.core.math.EllipticCurveMaths; +import jakarta.enterprise.context.Dependent; -import javax.enterprise.context.Dependent; import java.math.BigInteger; import java.security.spec.*; @@ -30,9 +30,9 @@ */ @Dependent public class EllipticCurveSupport { - public ECParameterSpec createFromData(ECMontgomeryCurveCryptoData data){ - WeierstrassCurveData d=EllipticCurveMaths.toWeierstrass(data); - EllipticCurveDataDto dto=new EllipticCurveDataDto(); + public ECParameterSpec createFromData(ECMontgomeryCurveCryptoData data) { + WeierstrassCurveData d = EllipticCurveMaths.toWeierstrass(data); + EllipticCurveDataDto dto = new EllipticCurveDataDto(); dto.setPrime(data.getPrime()); dto.setB(d.getB()); dto.setA(d.getA()); @@ -41,13 +41,13 @@ public ECParameterSpec createFromData(ECMontgomeryCurveCryptoData data){ return createFromData(dto); } - public ECParameterSpec createFromData(WeierstrassBasedCryptoData d){ - ECField field=new ECFieldFp(d.getPrime()); - BigInteger a=d.getA(); - BigInteger b=d.getB(); - EllipticCurve curve=new EllipticCurve(field, a, b); - ECPoint pointOnCurve=new ECPoint(d.getSuggestedX(), EllipticCurveMaths.findOnCurve(a,b,d.getSuggestedX())); - ECParameterSpec spec=new ECParameterSpec(curve,pointOnCurve, d.getPrimeOrder(), 1); + public ECParameterSpec createFromData(WeierstrassBasedCryptoData d) { + ECField field = new ECFieldFp(d.getPrime()); + BigInteger a = d.getA(); + BigInteger b = d.getB(); + EllipticCurve curve = new EllipticCurve(field, a, b); + ECPoint pointOnCurve = new ECPoint(d.getSuggestedX(), EllipticCurveMaths.findOnCurve(a, b, d.getSuggestedX())); + ECParameterSpec spec = new ECParameterSpec(curve, pointOnCurve, d.getPrimeOrder(), 1); return spec; } } diff --git a/crypto/src/main/java/ds2/oss/core/crypto/EncryptionServiceImpl.java b/crypto/src/main/java/ds2/oss/core/crypto/EncryptionServiceImpl.java index 8ef4502d..901eab36 100644 --- a/crypto/src/main/java/ds2/oss/core/crypto/EncryptionServiceImpl.java +++ b/crypto/src/main/java/ds2/oss/core/crypto/EncryptionServiceImpl.java @@ -20,6 +20,8 @@ import ds2.oss.core.api.crypto.*; import ds2.oss.core.api.dto.impl.EncodedContentDto; import ds2.oss.core.api.dto.impl.IvEncodedContentDto; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,8 +30,6 @@ import javax.crypto.IllegalBlockSizeException; import javax.crypto.SecretKey; import javax.crypto.spec.IvParameterSpec; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; import java.lang.invoke.MethodHandles; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; diff --git a/crypto/src/main/java/ds2/oss/core/crypto/KeyGeneratorServiceImpl.java b/crypto/src/main/java/ds2/oss/core/crypto/KeyGeneratorServiceImpl.java index e01ef41b..1c3d3ba8 100644 --- a/crypto/src/main/java/ds2/oss/core/crypto/KeyGeneratorServiceImpl.java +++ b/crypto/src/main/java/ds2/oss/core/crypto/KeyGeneratorServiceImpl.java @@ -17,6 +17,8 @@ import ds2.oss.core.api.annotations.SecureRandomizer; import ds2.oss.core.api.crypto.*; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,9 +27,6 @@ import javax.crypto.SecretKeyFactory; import javax.crypto.spec.PBEKeySpec; import javax.crypto.spec.SecretKeySpec; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; -import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.security.SecureRandom; import java.security.spec.InvalidKeySpecException; diff --git a/crypto/src/main/java/ds2/oss/core/crypto/KeyPairGeneratorServiceImpl.java b/crypto/src/main/java/ds2/oss/core/crypto/KeyPairGeneratorServiceImpl.java index 3f224130..0b4fb82b 100644 --- a/crypto/src/main/java/ds2/oss/core/crypto/KeyPairGeneratorServiceImpl.java +++ b/crypto/src/main/java/ds2/oss/core/crypto/KeyPairGeneratorServiceImpl.java @@ -21,12 +21,11 @@ import ds2.oss.core.api.Validate; import ds2.oss.core.api.annotations.SecureRandomizer; import ds2.oss.core.api.crypto.*; -import ds2.oss.core.api.maths.WeierstrassCurveData; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; import java.lang.invoke.MethodHandles; import java.math.BigInteger; import java.security.*; @@ -42,12 +41,12 @@ */ @ApplicationScoped public class KeyPairGeneratorServiceImpl implements KeyPairGeneratorService { - private static final Logger LOG= LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); + private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); /** * The map containing the generators. */ - private Map gens=new HashMap<>(); - private static final Lock LOCK=new ReentrantLock(); + private Map gens = new HashMap<>(); + private static final Lock LOCK = new ReentrantLock(); @Inject private Validate val; @Inject @@ -72,30 +71,30 @@ public KeyPair generateRsaKey(int bitSize) throws CoreException { @Override public KeyPair generateEcKey(int bitSize, String curveName) throws CoreException { - ECGenParameterSpec params=new ECGenParameterSpec(curveName); + ECGenParameterSpec params = new ECGenParameterSpec(curveName); return generateKeyPairCommon(bitSize, params, KeyPairGenAlgorithm.EC); } @Override public KeyPair generateEcKey(int bitSize, EllipticCurveCryptoData data) throws CoreException { - ECField field=new ECFieldFp(data.getPrime()); - BigInteger a=data.getA(); - BigInteger b=data.getB(); - EllipticCurve curve=new EllipticCurve(field, a, b); - ECPoint pointOnCurve=new ECPoint(data.getGx(), data.getGy()); - ECParameterSpec spec=new ECParameterSpec(curve,pointOnCurve, data.getQ(), 1); + ECField field = new ECFieldFp(data.getPrime()); + BigInteger a = data.getA(); + BigInteger b = data.getB(); + EllipticCurve curve = new EllipticCurve(field, a, b); + ECPoint pointOnCurve = new ECPoint(data.getGx(), data.getGy()); + ECParameterSpec spec = new ECParameterSpec(curve, pointOnCurve, data.getQ(), 1); return generateKeyPairCommon(bitSize, spec, KeyPairGenAlgorithm.EC); } @Override public KeyPair generateEcKey(int bitSize, WeierstrassBasedCryptoData wscd) throws CoreException { - ECParameterSpec param=ecSupport.createFromData(wscd); + ECParameterSpec param = ecSupport.createFromData(wscd); return generateKeyPairCommon(bitSize, param, KeyPairGenAlgorithm.EC); } @Override public KeyPair generateEcKey(int bitSize, ECMontgomeryCurveCryptoData wscd) throws CoreException { - ECParameterSpec param=ecSupport.createFromData(wscd); + ECParameterSpec param = ecSupport.createFromData(wscd); return generateKeyPairCommon(bitSize, param, KeyPairGenAlgorithm.EC); } @@ -107,7 +106,7 @@ public KeyPair generateEcKey(int bitSize) throws CoreException { private KeyPair generateKeyPairCommon(int bitSize, AlgorithmParameterSpec params, AlgorithmNamed alg) throws CoreException { try { - if(LOCK.tryLock(config.getMethodLockTimeout(), TimeUnit.SECONDS)) { + if (LOCK.tryLock(config.getMethodLockTimeout(), TimeUnit.SECONDS)) { LOG.debug("Preparing keygen with bitSize={}", new Object[]{bitSize}); KeyPair rc = null; KeyPairGenerator gen = gens.get(alg.getAlgorithmName()); @@ -127,8 +126,8 @@ private KeyPair generateKeyPairCommon(int bitSize, AlgorithmParameterSpec params rc = gen.generateKeyPair(); return rc; } - } catch(InvalidParameterException e){ - throw new CoreException(CoreErrors.IllegalArgument, "The bit size "+bitSize+" is wrong!", e); + } catch (InvalidParameterException e) { + throw new CoreException(CoreErrors.IllegalArgument, "The bit size " + bitSize + " is wrong!", e); } catch (InterruptedException e) { throw new CoreException(CoreErrors.LockingFailed, "We could not lock the keygen in time.", e); } catch (InvalidAlgorithmParameterException e) { diff --git a/crypto/src/main/java/ds2/oss/core/crypto/Pbkdf2PasswordServiceImpl.java b/crypto/src/main/java/ds2/oss/core/crypto/Pbkdf2PasswordServiceImpl.java index c6bd50d5..5551113e 100644 --- a/crypto/src/main/java/ds2/oss/core/crypto/Pbkdf2PasswordServiceImpl.java +++ b/crypto/src/main/java/ds2/oss/core/crypto/Pbkdf2PasswordServiceImpl.java @@ -24,14 +24,14 @@ import ds2.oss.core.api.crypto.Pbkdf2; import ds2.oss.core.statics.Converts; import ds2.oss.core.statics.Methods; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Alternative; -import javax.inject.Inject; import java.lang.invoke.MethodHandles; import java.util.Base64; diff --git a/crypto/src/main/java/ds2/oss/core/crypto/SecureBytesProvider.java b/crypto/src/main/java/ds2/oss/core/crypto/SecureBytesProvider.java index 15fd6f46..03997d01 100644 --- a/crypto/src/main/java/ds2/oss/core/crypto/SecureBytesProvider.java +++ b/crypto/src/main/java/ds2/oss/core/crypto/SecureBytesProvider.java @@ -17,11 +17,11 @@ import ds2.oss.core.api.annotations.SecureRandomizer; import ds2.oss.core.api.crypto.BytesProvider; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Inject; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.inject.Inject; import java.util.Random; /** diff --git a/crypto/src/main/java/ds2/oss/core/crypto/SimpleBytesProvider.java b/crypto/src/main/java/ds2/oss/core/crypto/SimpleBytesProvider.java index b9bae840..981552a9 100644 --- a/crypto/src/main/java/ds2/oss/core/crypto/SimpleBytesProvider.java +++ b/crypto/src/main/java/ds2/oss/core/crypto/SimpleBytesProvider.java @@ -15,14 +15,13 @@ */ package ds2.oss.core.crypto; -import java.util.Random; - -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.inject.Inject; - import ds2.oss.core.api.crypto.BytesProvider; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Inject; + +import java.util.Random; /** * A bytes provider, using a simple randomizer. diff --git a/csv/src/main/java/ds2/oss/core/csv/CsvParserImpl.java b/csv/src/main/java/ds2/oss/core/csv/CsvParserImpl.java index d52348e4..b10c16fd 100644 --- a/csv/src/main/java/ds2/oss/core/csv/CsvParserImpl.java +++ b/csv/src/main/java/ds2/oss/core/csv/CsvParserImpl.java @@ -20,8 +20,8 @@ import ds2.oss.core.api.CsvParser; import ds2.oss.core.api.dto.impl.CsvConfiguration; import ds2.oss.core.statics.IoMethods; +import jakarta.enterprise.context.Dependent; -import javax.enterprise.context.Dependent; import java.io.InputStream; import java.io.InputStreamReader; import java.util.ArrayList; @@ -38,11 +38,11 @@ public List> readFromClasspath(CsvConfiguration configuration, Stri throw new CoreException(CoreErrors.IllegalArgument, "The following path was not found: " + pathToCsvFromClasspath); } InputStreamReader inputStreamReader = null; - Scanner lineScanner=null; - List> csvData=new ArrayList<>(10); + Scanner lineScanner = null; + List> csvData = new ArrayList<>(10); try { inputStreamReader = new InputStreamReader(thisInputStream, configuration.getEncoding()); - lineScanner=new Scanner(inputStreamReader); + lineScanner = new Scanner(inputStreamReader); lineScanner.useDelimiter(configuration.getLineSeparator()); } finally { IoMethods.close(thisInputStream); diff --git a/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/MyStateConverter.java b/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/MyStateConverter.java index 5385b862..0e57620f 100644 --- a/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/MyStateConverter.java +++ b/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/MyStateConverter.java @@ -15,12 +15,11 @@ */ package ds2.oss.core.dbtools.it; -import javax.persistence.Converter; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; - import ds2.oss.core.dbtools.converters.AbstractEntryStateConverter; import ds2.oss.core.dbtools.it.entities.StateEntity; +import jakarta.persistence.Converter; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; /** * Created by dstrauss on 19.06.15. @@ -29,7 +28,7 @@ public class MyStateConverter extends AbstractEntryStateConverter { @PersistenceContext(unitName = "octest") private EntityManager em; - + @Override protected StateEntity getStateById(int id) { return em.find(StateEntity.class, id); diff --git a/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/entities/MyEntity.java b/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/entities/MyEntity.java index dbe635f6..dbca5e7f 100644 --- a/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/entities/MyEntity.java +++ b/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/entities/MyEntity.java @@ -15,21 +15,11 @@ */ package ds2.oss.core.dbtools.it.entities; -import java.util.Date; - -import javax.persistence.AssociationOverride; -import javax.persistence.AssociationOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - import ds2.oss.core.api.Persistable; import ds2.oss.core.dbtools.AbstractStateAwareBase; +import jakarta.persistence.*; + +import java.util.Date; /** * Created by dstrauss on 19.06.15. @@ -37,8 +27,8 @@ @Entity(name = "MyE") @Table(name = "oc_my") @AssociationOverrides({ - @AssociationOverride(name = "entryState", joinColumns = @JoinColumn(name = "state_id", nullable = false) ) }) -public class MyEntity extends AbstractStateAwareBaseimplements Persistable { + @AssociationOverride(name = "entryState", joinColumns = @JoinColumn(name = "state_id", nullable = false))}) +public class MyEntity extends AbstractStateAwareBase implements Persistable { /** * The svuid. */ @@ -52,30 +42,30 @@ public class MyEntity extends AbstractStateAwareBaseimplements Pers @Temporal(TemporalType.TIMESTAMP) @Column(name = "date") private Date date; - + @Override public Long getId() { return id; } - + public void setId(long id) { this.id = id; } - + public String getName() { return name; } - + public void setName(String name) { this.name = name; } - + public Date getDate() { return date; } - + public void setDate(Date date) { this.date = date; } - + } diff --git a/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/entities/StateEntity.java b/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/entities/StateEntity.java index 09961e7a..1ec68127 100644 --- a/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/entities/StateEntity.java +++ b/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/entities/StateEntity.java @@ -15,15 +15,9 @@ */ package ds2.oss.core.dbtools.it.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; - import ds2.oss.core.api.EntryState; import ds2.oss.core.api.Persistable; +import jakarta.persistence.*; /** * Created by dstrauss on 19.06.15. @@ -41,29 +35,29 @@ public class StateEntity implements EntryState, Persistable { private long id; @Column(nullable = false) private String name; - + public StateEntity() { } - + public StateEntity(String name) { this.name = name; } - + public StateEntity(int id, String name) { this(name); this.id = id; } - + @Override public String getEntryStateName() { return name; } - + @Override public int getNumericalValue() { return (int) id; } - + /* * (non-Javadoc) * @see ds2.oss.core.api.Persistable#getId() diff --git a/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/impl/MyEntityServiceBean.java b/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/impl/MyEntityServiceBean.java index f3934852..9a5a55e8 100644 --- a/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/impl/MyEntityServiceBean.java +++ b/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/impl/MyEntityServiceBean.java @@ -20,18 +20,18 @@ import ds2.oss.core.dbtools.it.MyEntityService; import ds2.oss.core.dbtools.it.entities.MyEntity; import ds2.oss.core.dbtools.it.entities.StateEntity; +import jakarta.ejb.Stateless; +import jakarta.ejb.TransactionAttribute; +import jakarta.ejb.TransactionManagement; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.Root; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ejb.Stateless; -import javax.ejb.TransactionAttribute; -import javax.ejb.TransactionManagement; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.Root; import java.util.Date; /** diff --git a/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/impl/StateEntityOperations.java b/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/impl/StateEntityOperations.java index 511a7a19..106cd748 100644 --- a/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/impl/StateEntityOperations.java +++ b/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/impl/StateEntityOperations.java @@ -18,12 +18,11 @@ import ds2.oss.core.api.EntryState; import ds2.oss.core.dbtools.AbstractPersistenceSupportImpl; import ds2.oss.core.dbtools.it.entities.StateEntity; - -import javax.ejb.Stateless; -import javax.ejb.TransactionAttribute; -import javax.ejb.TransactionManagement; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.ejb.Stateless; +import jakarta.ejb.TransactionAttribute; +import jakarta.ejb.TransactionManagement; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; /** * @author dstrauss diff --git a/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/impl/StateServiceBean.java b/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/impl/StateServiceBean.java index cde467d9..a839a1f1 100644 --- a/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/impl/StateServiceBean.java +++ b/dbtools-it/src/main/java/ds2/oss/core/dbtools/it/impl/StateServiceBean.java @@ -15,19 +15,17 @@ */ package ds2.oss.core.dbtools.it.impl; -import javax.ejb.Stateless; -import javax.ejb.TransactionAttribute; -import javax.ejb.TransactionManagement; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; - import ds2.oss.core.api.EntryState; import ds2.oss.core.dbtools.it.StateService; import ds2.oss.core.dbtools.it.entities.StateEntity; +import jakarta.ejb.Stateless; +import jakarta.ejb.TransactionAttribute; +import jakarta.ejb.TransactionManagement; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; /** * @author dstrauss - * */ @Stateless @TransactionAttribute @@ -35,12 +33,12 @@ public class StateServiceBean implements StateService { @PersistenceContext(unitName = "octest") private EntityManager em; - + @Override public EntryState createStateByName(String s) { StateEntity se = new StateEntity(s); em.persist(se); return se; } - + } diff --git a/dbtools/build.gradle b/dbtools/build.gradle index b2b315af..701131ed 100644 --- a/dbtools/build.gradle +++ b/dbtools/build.gradle @@ -1,14 +1,12 @@ description = 'DS/2 OSS Core Database Tools' dependencies { - annotationProcessor(group: 'org.hibernate', name: 'hibernate-jpamodelgen', version: '5.+') + annotationProcessor(group: 'org.hibernate', name: 'hibernate-jpamodelgen', version: '5.6.3.Final') + annotationProcessor("org.projectlombok:lombok:1.18.22") + compileOnly("org.projectlombok:lombok:1.18.22") implementation project(':ds2-oss-core-api') implementation project(':ds2-oss-core-statics') testImplementation group: 'org.testng', name: 'testng', version: '7.4.0' compileOnly 'org.slf4j:slf4j-api:1.7.32' - compileOnly(group: 'org.eclipse.persistence', name: 'javax.persistence', version: '2.2.+') { - /* This dependency was originally in the Maven provided scope, but the project was not of type war. - This behavior is not yet supported by Gradle, so this dependency has been converted to a compile dependency. - Please review and delete this closure when resolved. */ - } - compileOnly(group: 'org.hibernate', name: 'hibernate-jpamodelgen', version: '5.+') + compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') + compileOnly(group: 'org.hibernate', name: 'hibernate-jpamodelgen', version: '5.6.3.Final') } diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractCreatedByModifiedByEntity.java b/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractCreatedByModifiedByEntity.java index c14f9691..21eb9fe6 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractCreatedByModifiedByEntity.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractCreatedByModifiedByEntity.java @@ -16,9 +16,8 @@ package ds2.oss.core.dbtools; import ds2.oss.core.api.EditableCreatedByModifiedByAware; - -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; /** * @author dstrauss diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractCreatedEntity.java b/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractCreatedEntity.java index 10f01886..bf202c07 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractCreatedEntity.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractCreatedEntity.java @@ -17,9 +17,9 @@ import ds2.oss.core.api.EditableCreatedAware; import ds2.oss.core.dbtools.modules.CreatedAwareModule; +import jakarta.persistence.Embedded; +import jakarta.persistence.MappedSuperclass; -import javax.persistence.Embedded; -import javax.persistence.MappedSuperclass; import java.time.LocalDateTime; /** diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractCreatedModifiedEntity.java b/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractCreatedModifiedEntity.java index c126d603..0b96fa97 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractCreatedModifiedEntity.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractCreatedModifiedEntity.java @@ -18,9 +18,9 @@ import ds2.oss.core.api.EditableCreatedModifiedAware; import ds2.oss.core.dbtools.modules.CreatedAwareModule; import ds2.oss.core.dbtools.modules.ModifiedAwareModule; +import jakarta.persistence.Embedded; +import jakarta.persistence.MappedSuperclass; -import javax.persistence.Embedded; -import javax.persistence.MappedSuperclass; import java.time.LocalDateTime; /** diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractPersistenceSupportImpl.java b/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractPersistenceSupportImpl.java index 59c86601..289bb7e5 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractPersistenceSupportImpl.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractPersistenceSupportImpl.java @@ -17,10 +17,10 @@ import ds2.oss.core.api.IdAware; import ds2.oss.core.api.PersistenceSupport; +import jakarta.persistence.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.*; import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.List; @@ -56,7 +56,7 @@ public abstract class AbstractPersistenceSupportImpl, * @param entityClass the entity class * @param the entity type * @return the found results, or null if nothing was found - * @deprecated Better use the {@link #getSecureList(javax.persistence.TypedQuery)} method + * @deprecated Better use the {@link #getSecureList(jakarta.persistence.TypedQuery)} method * instead. */ @SuppressWarnings("unchecked") @@ -157,7 +157,7 @@ protected static E getSecureSingle(final TypedQuery q) { * @return the entity, or null if not found */ protected > T getSecureFindByIdInternal(final EntityManager em, final Class c, - final PRIMKEY id) { + final PRIMKEY id) { if (id == null) { LOG.warn("No primary key given to search for. Ignoring request!"); return null; diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractStateAwareBase.java b/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractStateAwareBase.java index 2a2c0dae..d73686b7 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractStateAwareBase.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractStateAwareBase.java @@ -17,8 +17,7 @@ import ds2.oss.core.api.EditableStateAware; import ds2.oss.core.api.EntryState; - -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** * An entity that maps the states to the dto {@link EntryState}. diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractStateAwareEntity.java b/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractStateAwareEntity.java index c1963188..9671c3f1 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractStateAwareEntity.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/AbstractStateAwareEntity.java @@ -15,14 +15,12 @@ */ package ds2.oss.core.dbtools; -import javax.persistence.Embedded; -import javax.persistence.MappedSuperclass; - import ds2.oss.core.api.EditableStateAware; import ds2.oss.core.api.EntryState; import ds2.oss.core.api.EntryStates; -import ds2.oss.core.api.StateAware; import ds2.oss.core.dbtools.modules.EntryStatesAwareModule; +import jakarta.persistence.Embedded; +import jakarta.persistence.MappedSuperclass; /** * An entity that maps the states to the enum {@link EntryStates}. @@ -35,7 +33,7 @@ public abstract class AbstractStateAwareEntity implements EditableStateAware { private static final long serialVersionUID = 4368250604091132964L; @Embedded private EntryStatesAwareModule stateAwareModule = new EntryStatesAwareModule(); - + @Override public EntryState getEntryState() { if (stateAwareModule == null) { @@ -43,7 +41,7 @@ public EntryState getEntryState() { } return stateAwareModule.getEntryState(); } - + public void setEntryState(EntryStates state) { if (stateAwareModule == null) { stateAwareModule = new EntryStatesAwareModule(); diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/DefaultEntityOperations.java b/dbtools/src/main/java/ds2/oss/core/dbtools/DefaultEntityOperations.java index f6685650..3a47db78 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/DefaultEntityOperations.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/DefaultEntityOperations.java @@ -16,14 +16,14 @@ package ds2.oss.core.dbtools; import ds2.oss.core.api.IdAware; +import jakarta.persistence.EntityManager; +import jakarta.persistence.NoResultException; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.EntityManager; -import javax.persistence.NoResultException; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.List; diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/JpaHelper.java b/dbtools/src/main/java/ds2/oss/core/dbtools/JpaHelper.java index 15c6ad44..4a68fc55 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/JpaHelper.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/JpaHelper.java @@ -16,10 +16,10 @@ package ds2.oss.core.dbtools; import ds2.oss.core.statics.Methods; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; import java.util.Set; /** diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/converters/AbstractEntryStateConverter.java b/dbtools/src/main/java/ds2/oss/core/dbtools/converters/AbstractEntryStateConverter.java index f8d3092d..a9935b7e 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/converters/AbstractEntryStateConverter.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/converters/AbstractEntryStateConverter.java @@ -16,9 +16,7 @@ package ds2.oss.core.dbtools.converters; import ds2.oss.core.api.EntryState; -import ds2.oss.core.api.EntryStates; - -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; /** * Created by dstrauss on 19.06.15. diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/converters/ClusterConverter.java b/dbtools/src/main/java/ds2/oss/core/dbtools/converters/ClusterConverter.java index fb60f5fb..47e6b492 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/converters/ClusterConverter.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/converters/ClusterConverter.java @@ -15,18 +15,16 @@ */ package ds2.oss.core.dbtools.converters; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; - import ds2.oss.core.api.environment.Cluster; import ds2.oss.core.api.environment.ClusterDto; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; /** * To convert between cluster contract and db data. * * @author dstrauss * @version 0.3 - * */ @Converter public class ClusterConverter implements AttributeConverter { diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/converters/CryptedContentConverter.java b/dbtools/src/main/java/ds2/oss/core/dbtools/converters/CryptedContentConverter.java index c86b5b77..c9ffd26e 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/converters/CryptedContentConverter.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/converters/CryptedContentConverter.java @@ -19,11 +19,11 @@ import ds2.oss.core.api.dto.impl.HashedResultDto; import ds2.oss.core.statics.Converts; import ds2.oss.core.statics.Methods; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; import java.lang.invoke.MethodHandles; import java.nio.charset.StandardCharsets; import java.util.Base64; diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/converters/EntryStatesConverter.java b/dbtools/src/main/java/ds2/oss/core/dbtools/converters/EntryStatesConverter.java index 2f9af67c..6e21c8cd 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/converters/EntryStatesConverter.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/converters/EntryStatesConverter.java @@ -18,10 +18,9 @@ */ package ds2.oss.core.dbtools.converters; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; - import ds2.oss.core.api.EntryStates; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; /** * @author dstrauss diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/converters/LocalDateTimeJpa21Converter.java b/dbtools/src/main/java/ds2/oss/core/dbtools/converters/LocalDateTimeJpa21Converter.java index 4098bf17..402b31a2 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/converters/LocalDateTimeJpa21Converter.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/converters/LocalDateTimeJpa21Converter.java @@ -15,8 +15,9 @@ */ package ds2.oss.core.dbtools.converters; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; + import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.Date; diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/converters/LocaleConverter.java b/dbtools/src/main/java/ds2/oss/core/dbtools/converters/LocaleConverter.java index 79718d3f..b238fbce 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/converters/LocaleConverter.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/converters/LocaleConverter.java @@ -17,9 +17,9 @@ import ds2.oss.core.statics.Converts; import ds2.oss.core.statics.Methods; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; import java.util.Locale; /** diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/converters/RuntimeConfigurationConverter.java b/dbtools/src/main/java/ds2/oss/core/dbtools/converters/RuntimeConfigurationConverter.java index 0d802a93..d3c08bb9 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/converters/RuntimeConfigurationConverter.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/converters/RuntimeConfigurationConverter.java @@ -15,17 +15,15 @@ */ package ds2.oss.core.dbtools.converters; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; - import ds2.oss.core.api.environment.RuntimeType; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; /** * To convert between runtimeConfig and db data. * * @author dstrauss * @version 0.3 - * */ @Converter public class RuntimeConfigurationConverter implements AttributeConverter { diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/converters/TimeZoneConverter.java b/dbtools/src/main/java/ds2/oss/core/dbtools/converters/TimeZoneConverter.java index 83fdc7ea..3673acf3 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/converters/TimeZoneConverter.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/converters/TimeZoneConverter.java @@ -16,9 +16,9 @@ package ds2.oss.core.dbtools.converters; import ds2.oss.core.statics.Methods; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; import java.util.TimeZone; /** diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/modules/CreatedAwareModule.java b/dbtools/src/main/java/ds2/oss/core/dbtools/modules/CreatedAwareModule.java index 400480dd..9a68ed1d 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/modules/CreatedAwareModule.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/modules/CreatedAwareModule.java @@ -16,26 +16,31 @@ package ds2.oss.core.dbtools.modules; import ds2.oss.core.api.EditableCreatedAware; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; import java.time.LocalDateTime; /** * @author dstrauss */ @Embeddable +@Getter +@Setter +@ToString public class CreatedAwareModule implements EditableCreatedAware { /** * The svuid. */ private static final long serialVersionUID = -6249059771176243495L; + public static final String CREATED = "created"; /** * The creation date. */ - @Column(name = "created", nullable = false, updatable = false) + @Column(name = CREATED, nullable = false, updatable = false) private LocalDateTime created = LocalDateTime.now(); /** @@ -45,34 +50,4 @@ public CreatedAwareModule() { created = LocalDateTime.now(); } - /* - * (non-Javadoc) - * @see ds2.oss.core.api.CreatedAware#getCreated() - */ - @Override - public LocalDateTime getCreated() { - return created; - } - - @Override - public void setCreated(LocalDateTime d) { - created = d; - } - - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("("); - if (created != null) { - builder.append("created="); - builder.append(created); - } - builder.append(")"); - return builder.toString(); - } - } diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/modules/CreatedModifiedAwareModule.java b/dbtools/src/main/java/ds2/oss/core/dbtools/modules/CreatedModifiedAwareModule.java index e8b7f2be..7d5a8f26 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/modules/CreatedModifiedAwareModule.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/modules/CreatedModifiedAwareModule.java @@ -16,9 +16,9 @@ package ds2.oss.core.dbtools.modules; import ds2.oss.core.api.EditableCreatedModifiedAware; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; -import javax.persistence.Column; -import javax.persistence.Embeddable; import java.time.LocalDateTime; /** diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/modules/EntryStatesAwareModule.java b/dbtools/src/main/java/ds2/oss/core/dbtools/modules/EntryStatesAwareModule.java index a666561a..5ef19f48 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/modules/EntryStatesAwareModule.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/modules/EntryStatesAwareModule.java @@ -18,10 +18,9 @@ import ds2.oss.core.api.EditableStateAware; import ds2.oss.core.api.EntryStates; import ds2.oss.core.dbtools.converters.EntryStatesConverter; - -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Embeddable; /** * Module for a state entry using the default enum {@link EntryStates}. Usually, diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/modules/IvEncodedContentModule.java b/dbtools/src/main/java/ds2/oss/core/dbtools/modules/IvEncodedContentModule.java index 2dcd02d1..83269bcc 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/modules/IvEncodedContentModule.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/modules/IvEncodedContentModule.java @@ -15,13 +15,12 @@ */ package ds2.oss.core.dbtools.modules; -import java.util.Arrays; - -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Lob; - import ds2.oss.core.api.crypto.IvEncodedContent; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Lob; + +import java.util.Arrays; /** * A db module for iv encoded content. @@ -70,8 +69,7 @@ public byte[] getInitVector() { /** * Sets the encoded data. * - * @param encoded - * the encoded to set + * @param encoded the encoded to set */ public void setEncoded(final byte[] encoded) { this.encoded = encoded; @@ -80,8 +78,7 @@ public void setEncoded(final byte[] encoded) { /** * Sets the init vector data. * - * @param initVector - * the initVector to set + * @param initVector the initVector to set */ public void setInitVector(final byte[] initVector) { this.initVector = initVector; @@ -94,7 +91,7 @@ public void setInitVector(final byte[] initVector) { @Override public String toString() { return "IvEncodedContentModule [initVector=" + Arrays.toString(initVector) + ", encoded=" - + Arrays.toString(encoded) + "]"; + + Arrays.toString(encoded) + "]"; } } diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/modules/LifeCycleAwareModule.java b/dbtools/src/main/java/ds2/oss/core/dbtools/modules/LifeCycleAwareModule.java index f2704ac3..7d81afb4 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/modules/LifeCycleAwareModule.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/modules/LifeCycleAwareModule.java @@ -16,11 +16,14 @@ package ds2.oss.core.dbtools.modules; import ds2.oss.core.api.EditableLifeCycleAware; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; import java.time.LocalDateTime; /** @@ -30,7 +33,12 @@ * @version 0.3 */ @Embeddable +@NoArgsConstructor +@Getter +@Setter public class LifeCycleAwareModule implements EditableLifeCycleAware { + public static final String COL_VALIDFROM = "valid_from"; + public static final String COL_VALIDTO = "valid_to"; /** * The svuid. @@ -39,49 +47,14 @@ public class LifeCycleAwareModule implements EditableLifeCycleAware { /** * Valid from. */ - @Column(name = "valid_from", nullable = false, updatable = false) + @Column(name = COL_VALIDFROM, nullable = false, updatable = false) @Temporal(TemporalType.TIMESTAMP) private LocalDateTime validFrom; /** * Valid to. */ - @Column(name = "valid_to") + @Column(name = COL_VALIDTO) @Temporal(TemporalType.TIMESTAMP) private LocalDateTime validTo; - /** - * Inits the module. - */ - public LifeCycleAwareModule() { - // TODO Auto-generated constructor stub - } - - /* - * (non-Javadoc) - * @see ds2.oss.core.api.LifeCycleAware#getValidFrom() - */ - @Override - public LocalDateTime getValidFrom() { - return validFrom; - } - - /* - * (non-Javadoc) - * @see ds2.oss.core.api.LifeCycleAware#getValidTo() - */ - @Override - public LocalDateTime getValidTo() { - return validTo; - } - - @Override - public void setValidFrom(final LocalDateTime validFrom) { - this.validFrom = validFrom; - } - - @Override - public void setValidTo(final LocalDateTime validTo) { - this.validTo = validTo; - } - } diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/modules/ModifiedAwareModule.java b/dbtools/src/main/java/ds2/oss/core/dbtools/modules/ModifiedAwareModule.java index 178557e2..5c59ef43 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/modules/ModifiedAwareModule.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/modules/ModifiedAwareModule.java @@ -16,13 +16,12 @@ package ds2.oss.core.dbtools.modules; import ds2.oss.core.api.EditableModifiedAware; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; import java.time.LocalDateTime; -import java.util.Date; /** * @author dstrauss diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/modules/NamedAwareModule.java b/dbtools/src/main/java/ds2/oss/core/dbtools/modules/NamedAwareModule.java index 95396444..5210f7d7 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/modules/NamedAwareModule.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/modules/NamedAwareModule.java @@ -16,12 +16,10 @@ package ds2.oss.core.dbtools.modules; import ds2.oss.core.api.EditableNamedAware; -import ds2.oss.core.api.settable.NamedAware; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /** - * * @author deindesign */ @Embeddable diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/modules/NamedNormalizedDescriptiveModule.java b/dbtools/src/main/java/ds2/oss/core/dbtools/modules/NamedNormalizedDescriptiveModule.java index 83620e57..65f49e5b 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/modules/NamedNormalizedDescriptiveModule.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/modules/NamedNormalizedDescriptiveModule.java @@ -16,12 +16,10 @@ package ds2.oss.core.dbtools.modules; import ds2.oss.core.api.EditableNormalizedNamedDescriptiveAware; -import ds2.oss.core.api.settable.NormalizedNamedDescriptiveAware; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /** - * * @author deindesign */ @Embeddable diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/modules/NamedNormalizedModule.java b/dbtools/src/main/java/ds2/oss/core/dbtools/modules/NamedNormalizedModule.java index 64bdc038..5ed9beb9 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/modules/NamedNormalizedModule.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/modules/NamedNormalizedModule.java @@ -16,12 +16,10 @@ package ds2.oss.core.dbtools.modules; import ds2.oss.core.api.EditableNormalizedNamedAware; -import ds2.oss.core.api.settable.NormalizedNamedAware; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; /** - * * @author deindesign */ @Embeddable diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/modules/NormalizedNameModule.java b/dbtools/src/main/java/ds2/oss/core/dbtools/modules/NormalizedNameModule.java index a181746b..19d8a835 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/modules/NormalizedNameModule.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/modules/NormalizedNameModule.java @@ -16,12 +16,10 @@ package ds2.oss.core.dbtools.modules; import ds2.oss.core.api.EditableNormalizedNameAware; -import ds2.oss.core.api.settable.NormalizedNameAware; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; /** - * * @author deindesign */ @Embeddable diff --git a/dbtools/src/main/java/ds2/oss/core/dbtools/support/CreateSchemaHelper.java b/dbtools/src/main/java/ds2/oss/core/dbtools/support/CreateSchemaHelper.java index 027c780a..b2c6e903 100644 --- a/dbtools/src/main/java/ds2/oss/core/dbtools/support/CreateSchemaHelper.java +++ b/dbtools/src/main/java/ds2/oss/core/dbtools/support/CreateSchemaHelper.java @@ -16,10 +16,10 @@ package ds2.oss.core.dbtools.support; import ds2.oss.core.api.DatabaseType; +import jakarta.persistence.Persistence; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.Persistence; import java.io.IOException; import java.lang.invoke.MethodHandles; import java.nio.file.Files; diff --git a/es-test/build.gradle b/es-test/build.gradle index 370732eb..d8c04383 100644 --- a/es-test/build.gradle +++ b/es-test/build.gradle @@ -4,7 +4,7 @@ dependencies { implementation project(':ds2-oss-core-api') implementation group: 'org.elasticsearch', name: 'elasticsearch', version: '1.3.2' testImplementation group: 'org.testng', name: 'testng', version: '7.4.0' - testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.2.4.Final' + testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '4.0.2.Final' testImplementation project(path: ':ds2-oss-core-testutils') testImplementation group: 'org.slf4j', name: 'slf4j-jdk14', version: '1.7.32' testImplementation group: 'org.jboss', name: 'jandex', version: '2.4.1.Final' diff --git a/es/build.gradle b/es/build.gradle index ca6cb370..39391643 100644 --- a/es/build.gradle +++ b/es/build.gradle @@ -6,7 +6,7 @@ dependencies { implementation project(':ds2-oss-core-api') implementation project(':ds2-oss-core-statics') testImplementation group: 'org.testng', name: 'testng', version: '7.4.0' - testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.+' + testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '4.0.2.Final' testImplementation(group: 'org.apache.logging.log4j', name: 'log4j-core', version: project.ext.log4j2Version) { exclude(module: 'tools') } diff --git a/es/src/main/java/ds2/oss/core/elasticsearch/api/annotations/EsCodec.java b/es/src/main/java/ds2/oss/core/elasticsearch/api/annotations/EsCodec.java index d279009c..1f5bbf23 100644 --- a/es/src/main/java/ds2/oss/core/elasticsearch/api/annotations/EsCodec.java +++ b/es/src/main/java/ds2/oss/core/elasticsearch/api/annotations/EsCodec.java @@ -15,17 +15,11 @@ */ package ds2.oss.core.elasticsearch.api.annotations; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Qualifier; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Stereotype; -import javax.enterprise.util.Nonbinding; -import javax.inject.Qualifier; +import java.lang.annotation.*; /** * Marks a codec. Any implementation having this annotation will be {@link ApplicationScoped}, and @@ -35,7 +29,7 @@ * @version 0.2 */ @Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD }) +@Target({ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD}) @Dependent @Documented @Qualifier diff --git a/es/src/main/java/ds2/oss/core/elasticsearch/api/annotations/UsingTransport.java b/es/src/main/java/ds2/oss/core/elasticsearch/api/annotations/UsingTransport.java index 71956917..d762840c 100644 --- a/es/src/main/java/ds2/oss/core/elasticsearch/api/annotations/UsingTransport.java +++ b/es/src/main/java/ds2/oss/core/elasticsearch/api/annotations/UsingTransport.java @@ -18,19 +18,19 @@ */ package ds2.oss.core.elasticsearch.api.annotations; +import jakarta.inject.Qualifier; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; - /** * @author dstrauss * */ @Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.TYPE }) +@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE}) @Qualifier public @interface UsingTransport { TransportTypes value(); diff --git a/es/src/main/java/ds2/oss/core/elasticsearch/impl/AbstractTypeCodec.java b/es/src/main/java/ds2/oss/core/elasticsearch/impl/AbstractTypeCodec.java index 950728ce..8be46867 100644 --- a/es/src/main/java/ds2/oss/core/elasticsearch/impl/AbstractTypeCodec.java +++ b/es/src/main/java/ds2/oss/core/elasticsearch/impl/AbstractTypeCodec.java @@ -15,23 +15,20 @@ */ package ds2.oss.core.elasticsearch.impl; -import javax.inject.Inject; - import ds2.oss.core.api.CodecException; import ds2.oss.core.api.IoService; import ds2.oss.core.api.JsonCodec; import ds2.oss.core.api.JsonCodecException; import ds2.oss.core.api.es.TypeMapping; import ds2.oss.core.elasticsearch.api.TypeCodec; +import jakarta.inject.Inject; /** * An abstract class defining some common methods for type codecs. * + * @param the type of the dto * @author dstrauss * @version 0.2 - * @param - * the type of the dto - * */ public abstract class AbstractTypeCodec extends AbstractCodecBase implements TypeCodec { /** @@ -59,8 +56,7 @@ protected AbstractTypeCodec() { /** * Inits the codec with a given dto base class. * - * @param base - * the dto base class to use. + * @param base the dto base class to use. */ protected AbstractTypeCodec(final Class base) { this(); @@ -91,8 +87,7 @@ public String getMapping() { /** * Performs a load operation for the given type to return the known mapping. * - * @param c - * the class of the type + * @param c the class of the type * @return the mapping, usually as json, or null if an error occurred */ protected String loadMappingFromJson(final Class c) { diff --git a/es/src/main/java/ds2/oss/core/elasticsearch/impl/CodecProviderImpl.java b/es/src/main/java/ds2/oss/core/elasticsearch/impl/CodecProviderImpl.java index 25278b0a..338e801d 100644 --- a/es/src/main/java/ds2/oss/core/elasticsearch/impl/CodecProviderImpl.java +++ b/es/src/main/java/ds2/oss/core/elasticsearch/impl/CodecProviderImpl.java @@ -15,20 +15,18 @@ */ package ds2.oss.core.elasticsearch.impl; -import java.lang.annotation.Annotation; - -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import ds2.oss.core.elasticsearch.api.CodecProvider; import ds2.oss.core.elasticsearch.api.TypeCodec; import ds2.oss.core.elasticsearch.impl.literals.EsCodecAnnotationLiteral; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.PostConstruct; +import java.lang.annotation.Annotation; /** * A provider for any found ES codec. diff --git a/es/src/main/java/ds2/oss/core/elasticsearch/impl/ElasticSearchServiceImpl.java b/es/src/main/java/ds2/oss/core/elasticsearch/impl/ElasticSearchServiceImpl.java index d0c2f613..cef7323e 100644 --- a/es/src/main/java/ds2/oss/core/elasticsearch/impl/ElasticSearchServiceImpl.java +++ b/es/src/main/java/ds2/oss/core/elasticsearch/impl/ElasticSearchServiceImpl.java @@ -15,16 +15,15 @@ */ package ds2.oss.core.elasticsearch.impl; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - +import com.google.common.collect.ImmutableSet; +import com.google.common.reflect.ClassPath; +import com.google.common.reflect.ClassPath.ResourceInfo; +import ds2.oss.core.api.CodecException; +import ds2.oss.core.api.IoService; +import ds2.oss.core.api.JsonCodecException; +import ds2.oss.core.elasticsearch.api.*; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.WriteConsistencyLevel; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; @@ -52,19 +51,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.ImmutableSet; -import com.google.common.reflect.ClassPath; -import com.google.common.reflect.ClassPath.ResourceInfo; - -import ds2.oss.core.api.CodecException; -import ds2.oss.core.api.IoService; -import ds2.oss.core.api.JsonCodecException; -import ds2.oss.core.elasticsearch.api.CodecProvider; -import ds2.oss.core.elasticsearch.api.ElasticSearchErrors; -import ds2.oss.core.elasticsearch.api.ElasticSearchException; -import ds2.oss.core.elasticsearch.api.ElasticSearchNode; -import ds2.oss.core.elasticsearch.api.ElasticSearchService; -import ds2.oss.core.elasticsearch.api.TypeCodec; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * The implementation for the ES service. @@ -78,18 +70,16 @@ public class ElasticSearchServiceImpl implements ElasticSearchService { * A logger. */ private static final Logger LOG = LoggerFactory.getLogger(ElasticSearchServiceImpl.class); - + /** * Filters some resources. * - * @param name - * the start of the resource name - * @param resources - * the resources to scan for + * @param name the start of the resource name + * @param resources the resources to scan for * @return the found resources that being with the name */ private static List filterResources(final String name, - final List resources) { + final List resources) { LOG.debug("Trying to find resources in {}", name); final List rc = new ArrayList<>(); for (ClassPath.ResourceInfo ri : resources) { @@ -100,13 +90,12 @@ private static List filterResources(final String name, } return rc; } - + /** * This method tries to find the id of the json document. Usually, this is the first sequence * before the .json ending. * - * @param resourceName - * the json resource name + * @param resourceName the json resource name * @return the id, or null if no id has been found */ private static String findIdFromResource(final String resourceName) { @@ -119,50 +108,50 @@ private static String findIdFromResource(final String resourceName) { if (cutIndex > 0) { rc = foundPattern.substring(1, cutIndex); } - + } return rc; } - + /** * Any known codecs. */ @Inject private CodecProvider codecProvider; - + /** * The ES client to use. */ @Inject private ElasticSearchNode esNode; - + /** * The io service. */ @Inject private IoService io; - + @Override public void deleteIndexes(final String... indexes) { - LOG.debug("Prepare to delete indices {}", new Object[] { indexes }); + LOG.debug("Prepare to delete indices {}", new Object[]{indexes}); try { final DeleteIndexRequestBuilder deleteIndexRequestBuilder = - esNode.get().admin().indices().prepareDelete(indexes); + esNode.get().admin().indices().prepareDelete(indexes); final DeleteIndexResponse resp = deleteIndexRequestBuilder.get(); if (!resp.isAcknowledged()) { LOG.warn("Delete is not acknowledged!"); } else { - LOG.debug("Deleting indexes {} done.", new Object[] { indexes }); + LOG.debug("Deleting indexes {} done.", new Object[]{indexes}); } } catch (IndexMissingException e) { LOG.debug("Given index did not exist!", e); - LOG.info("The index(es) {} were not existing! Ignoring delete request.", new Object[] { indexes }); + LOG.info("The index(es) {} were not existing! Ignoring delete request.", new Object[]{indexes}); } } - + @Override public T get(final String index, final Class c, final String id) { - LOG.debug("Entering get request for index {}, type {} and id {}", new Object[] { index, c, id }); + LOG.debug("Entering get request for index {}, type {} and id {}", new Object[]{index, c, id}); final TypeCodec codec = codecProvider.findFor(c); if (codec == null) { LOG.warn("No codec found for type {}! Cannot convert back into a dto therefore.", c); @@ -184,18 +173,18 @@ public T get(final String index, final Class c, final String id) { rc = codec.toDto(result.getSource()); } } else { - LOG.debug("Could not find document with id {} in {}", new Object[] { id, index }); + LOG.debug("Could not find document with id {} in {}", new Object[]{id, index}); } } catch (ElasticsearchException e) { LOG.warn("Error when performing the query!", e); } catch (JsonCodecException e) { LOG.warn("Error when decoding the result source!", e); } - + LOG.debug("Result is {}", rc); return rc; } - + @Override public List getDefaultData(final Class c) throws JsonCodecException { if (c == null) { @@ -213,9 +202,9 @@ public List getDefaultData(final Class c) throws JsonCodecException { final List rc = new ArrayList<>(); try { final ImmutableSet resources = - ClassPath.from(getClass().getClassLoader()).getResources(); + ClassPath.from(getClass().getClassLoader()).getResources(); final List foundInserts = - filterResources(packageNameFilter.toString(), resources.asList()); + filterResources(packageNameFilter.toString(), resources.asList()); if (!foundInserts.isEmpty()) { for (ClassPath.ResourceInfo ri : foundInserts) { final String res = ri.getResourceName(); @@ -233,7 +222,7 @@ public List getDefaultData(final Class c) throws JsonCodecException { } return rc; } - + @Override public boolean insertDefaultData(final String index, final Class c) { // load all JSON files and its content @@ -254,7 +243,7 @@ public boolean insertDefaultData(final String index, final Class c) { try { resources = ClassPath.from(getClass().getClassLoader()).getResources(); final List foundInserts = - filterResources(packageNameFilter.toString(), resources.asList()); + filterResources(packageNameFilter.toString(), resources.asList()); final BulkRequestBuilder brb = esNode.get().prepareBulk(); for (ResourceInfo ri : foundInserts) { final String resourceName = ri.getResourceName(); @@ -272,7 +261,7 @@ public boolean insertDefaultData(final String index, final Class c) { brb.add(irb); } final BulkResponse bulkResult = brb.get(); - LOG.debug("Results: {}", new Object[] { bulkResult.getItems() }); + LOG.debug("Results: {}", new Object[]{bulkResult.getItems()}); if (bulkResult.hasFailures()) { LOG.warn("Some errors occurred on insert!"); rc = false; @@ -284,12 +273,12 @@ public boolean insertDefaultData(final String index, final Class c) { } return rc; } - + @Override public boolean installOrUpdateIndex(final String indexName, final Class... dtoClasses) { final boolean rc = true; final boolean indexExists = - esNode.get().admin().indices().prepareExists(indexName).execute().actionGet().isExists(); + esNode.get().admin().indices().prepareExists(indexName).execute().actionGet().isExists(); if (!indexExists) { esNode.get().admin().indices().prepareCreate(indexName).execute().actionGet(); esNode.waitForClusterYellowState(); @@ -298,9 +287,9 @@ public boolean installOrUpdateIndex(final String indexName, final Class... dt } LOG.info("Checking mappings"); final ClusterStateResponse resp = - esNode.get().admin().cluster().prepareState().setIndices(indexName).execute().actionGet(); + esNode.get().admin().cluster().prepareState().setIndices(indexName).execute().actionGet(); final ImmutableOpenMap mappings = - resp.getState().getMetaData().index(indexName).mappings(); + resp.getState().getMetaData().index(indexName).mappings(); for (Class dtoClass : dtoClasses) { final TypeCodec codec = codecProvider.findFor(dtoClass); if (codec == null) { @@ -311,16 +300,16 @@ public boolean installOrUpdateIndex(final String indexName, final Class... dt if (mappings.containsKey(indexType)) { LOG.debug("Deleting mapping for type {}", indexType); final DeleteMappingRequestBuilder prepDelMapping = - esNode.get().admin().indices().prepareDeleteMapping(indexName); + esNode.get().admin().indices().prepareDeleteMapping(indexName); prepDelMapping.setType(indexType); prepDelMapping.execute().actionGet(); } final PutMappingResponse result = - esNode.get().admin().indices().preparePutMapping(indexName).setType(indexType) - .setSource(codec.getMapping()).get(); + esNode.get().admin().indices().preparePutMapping(indexName).setType(indexType) + .setSource(codec.getMapping()).get(); if (!result.isAcknowledged()) { - LOG.warn("Mapping for type {} on index {} has not been acknowlegded. Expect problems!", new Object[] { - indexType, indexName, }); + LOG.warn("Mapping for type {} on index {} has not been acknowlegded. Expect problems!", new Object[]{ + indexType, indexName,}); } else { LOG.debug("Installing mapping for type {} seems to be ok", indexType); } @@ -329,14 +318,12 @@ public boolean installOrUpdateIndex(final String indexName, final Class... dt esNode.waitForClusterYellowState(); return rc; } - + /** * Prepares an index operation. * - * @param index - * the index to use - * @param typeCodec - * the type codec to use + * @param index the index to use + * @param typeCodec the type codec to use * @return the index request builder */ private IndexRequestBuilder prepareIndexing(final String index, final TypeCodec typeCodec) { @@ -349,10 +336,10 @@ private IndexRequestBuilder prepareIndexing(final String index, final TypeCodec< } return rc; } - + @Override public String put(final String index, final T t, final TypeCodec codec) throws CodecException, - ElasticSearchException { + ElasticSearchException { if (t == null) { throw new IllegalArgumentException("You must give a dto to put into the index!"); } @@ -376,16 +363,16 @@ public String put(final String index, final T t, final TypeCodec codec) t } else { LOG.debug("No creation done!"); } - LOG.debug("Response is {}, id will be {}", new Object[] { response, id }); + LOG.debug("Response is {}, id will be {}", new Object[]{response, id}); } catch (ElasticsearchException e) { throw new ElasticSearchException(ElasticSearchErrors.PutFailed, e); } return id; } - + @Override public boolean refreshIndexes(final String... indexes) { - LOG.debug("Performing refresh on indexes {}", new Object[] { indexes }); + LOG.debug("Performing refresh on indexes {}", new Object[]{indexes}); boolean rc = false; final RefreshRequestBuilder cmd = esNode.get().admin().indices().prepareRefresh(indexes); final RefreshResponse result = cmd.get(); @@ -397,7 +384,7 @@ public boolean refreshIndexes(final String... indexes) { } return rc; } - + @Override public List searchAny(final String indexname, final Class dtoClass) { final TypeCodec codec = codecProvider.findFor(dtoClass); diff --git a/es/src/main/java/ds2/oss/core/elasticsearch/impl/UseCases.java b/es/src/main/java/ds2/oss/core/elasticsearch/impl/UseCases.java index 52282921..c8bf606e 100644 --- a/es/src/main/java/ds2/oss/core/elasticsearch/impl/UseCases.java +++ b/es/src/main/java/ds2/oss/core/elasticsearch/impl/UseCases.java @@ -15,9 +15,9 @@ */ package ds2.oss.core.elasticsearch.impl; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - +import ds2.oss.core.elasticsearch.api.ElasticSearchNode; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.action.deletebyquery.DeleteByQueryResponse; import org.elasticsearch.cluster.metadata.MappingMetaData; @@ -26,13 +26,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ds2.oss.core.elasticsearch.api.ElasticSearchNode; - /** * Some common usecases. * - * @version 0.2 * @author dstrauss + * @version 0.2 */ @ApplicationScoped public class UseCases { @@ -50,22 +48,19 @@ public class UseCases { /** * Adds a mapping for a given type. * - * @param indexName - * the index name - * @param typeName - * the type name - * @param json - * the json containing the mapping data + * @param indexName the index name + * @param typeName the type name + * @param json the json containing the mapping data */ public void addMapping(final String indexName, final String typeName, final String json) { LOG.info("Checking mappings"); final ClusterStateResponse resp = - esNode.get().admin().cluster().prepareState().setIndices(indexName).execute().actionGet(); + esNode.get().admin().cluster().prepareState().setIndices(indexName).execute().actionGet(); final ImmutableOpenMap mappings = - resp.getState().getMetaData().index(indexName).mappings(); + resp.getState().getMetaData().index(indexName).mappings(); if (!mappings.containsKey(typeName)) { esNode.get().admin().indices().preparePutMapping(indexName).setType(typeName).setSource(json).execute() - .actionGet(); + .actionGet(); } esNode.waitForClusterYellowState(); } @@ -73,14 +68,12 @@ public void addMapping(final String indexName, final String typeName, final Stri /** * Creates an index. * - * @param indexName - * the index name - * + * @param indexName the index name * @return TRUE if index has been created, otherwise FALSE */ public boolean createIndex(final String indexName) { final boolean indexExists = - esNode.get().admin().indices().prepareExists(indexName).execute().actionGet().isExists(); + esNode.get().admin().indices().prepareExists(indexName).execute().actionGet().isExists(); if (!indexExists) { esNode.get().admin().indices().prepareCreate(indexName).execute().actionGet(); esNode.waitForClusterYellowState(); @@ -93,15 +86,13 @@ public boolean createIndex(final String indexName) { /** * Deletes a type from the index. * - * @param index - * the index name - * @param type - * the type name + * @param index the index name + * @param type the type name */ public void deleteEntriesOfType(final String index, final String type) { final DeleteByQueryResponse response = - esNode.get().prepareDeleteByQuery(index).setQuery(QueryBuilders.termQuery("_type", type)).execute() - .actionGet(); + esNode.get().prepareDeleteByQuery(index).setQuery(QueryBuilders.termQuery("_type", type)).execute() + .actionGet(); LOG.info("Result: {}", response); esNode.waitForClusterYellowState(); } diff --git a/es/src/main/java/ds2/oss/core/elasticsearch/impl/literals/EsCodecAnnotationLiteral.java b/es/src/main/java/ds2/oss/core/elasticsearch/impl/literals/EsCodecAnnotationLiteral.java index 2774593e..9b5e6050 100644 --- a/es/src/main/java/ds2/oss/core/elasticsearch/impl/literals/EsCodecAnnotationLiteral.java +++ b/es/src/main/java/ds2/oss/core/elasticsearch/impl/literals/EsCodecAnnotationLiteral.java @@ -15,15 +15,14 @@ */ package ds2.oss.core.elasticsearch.impl.literals; -import javax.enterprise.util.AnnotationLiteral; - import ds2.oss.core.elasticsearch.api.annotations.EsCodec; +import jakarta.enterprise.util.AnnotationLiteral; /** * The ES Codec literal. * - * @version 0.2 * @author dstrauss + * @version 0.2 */ public class EsCodecAnnotationLiteral extends AnnotationLiteral implements EsCodec { /** @@ -38,8 +37,7 @@ public class EsCodecAnnotationLiteral extends AnnotationLiteral impleme /** * Inits the literal. * - * @param c - * the class to wrap. Usually a dto. + * @param c the class to wrap. Usually a dto. */ public EsCodecAnnotationLiteral(final Class c) { this.c = c; diff --git a/es/src/main/java/ds2/oss/core/elasticsearch/impl/literals/TransportLiteral.java b/es/src/main/java/ds2/oss/core/elasticsearch/impl/literals/TransportLiteral.java index e2c0f205..71efd766 100644 --- a/es/src/main/java/ds2/oss/core/elasticsearch/impl/literals/TransportLiteral.java +++ b/es/src/main/java/ds2/oss/core/elasticsearch/impl/literals/TransportLiteral.java @@ -18,10 +18,9 @@ */ package ds2.oss.core.elasticsearch.impl.literals; -import javax.enterprise.util.AnnotationLiteral; - import ds2.oss.core.elasticsearch.api.annotations.TransportTypes; import ds2.oss.core.elasticsearch.api.annotations.UsingTransport; +import jakarta.enterprise.util.AnnotationLiteral; /** * @author dstrauss diff --git a/es/src/main/java/ds2/oss/core/elasticsearch/impl/node/ext/TransportClientNode.java b/es/src/main/java/ds2/oss/core/elasticsearch/impl/node/ext/TransportClientNode.java index 0683a432..78f81537 100644 --- a/es/src/main/java/ds2/oss/core/elasticsearch/impl/node/ext/TransportClientNode.java +++ b/es/src/main/java/ds2/oss/core/elasticsearch/impl/node/ext/TransportClientNode.java @@ -15,25 +15,23 @@ */ package ds2.oss.core.elasticsearch.impl.node.ext; -import java.net.InetSocketAddress; -import java.util.HashSet; -import java.util.Set; - -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.inject.Inject; -import javax.interceptor.Interceptor; - +import ds2.oss.core.elasticsearch.api.EsConfig; +import ds2.oss.core.elasticsearch.impl.AbstractNodeImpl; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Inject; +import jakarta.interceptor.Interceptor; import org.elasticsearch.client.transport.TransportClient; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.InetSocketTransportAddress; import org.elasticsearch.common.transport.TransportAddress; -import ds2.oss.core.elasticsearch.api.EsConfig; -import ds2.oss.core.elasticsearch.impl.AbstractNodeImpl; +import javax.annotation.PostConstruct; +import java.net.InetSocketAddress; +import java.util.HashSet; +import java.util.Set; /** * A transport client impl. @@ -50,7 +48,7 @@ public class TransportClientNode extends AbstractNodeImpl { */ @Inject private EsConfig config; - + @Override public void addTransport(final InetSocketAddress... isa) { needsLock = true; @@ -65,7 +63,7 @@ public void addTransport(final InetSocketAddress... isa) { needsLock = false; } } - + /** * Actions to perform on init. */ @@ -75,7 +73,7 @@ public void onInit() { lock.lock(); try { final ImmutableSettings.Builder sb = - ImmutableSettings.settingsBuilder().loadFromClasspath("/transportClientNode.yml"); + ImmutableSettings.settingsBuilder().loadFromClasspath("/transportClientNode.yml"); sb.put("cluster.name", config.getClusterName()); sb.put("client", true); if (config.getProperties() != null) { @@ -90,13 +88,13 @@ public void onInit() { serverAddresses.add(new InetSocketTransportAddress("localhost", 9300)); } client = - new TransportClient(setts).addTransportAddresses(serverAddresses - .toArray(new TransportAddress[serverAddresses.size()])); + new TransportClient(setts).addTransportAddresses(serverAddresses + .toArray(new TransportAddress[serverAddresses.size()])); } finally { lock.unlock(); } } - + @Override public void removeTransport(final InetSocketAddress... isa) { lock.lock(); @@ -109,5 +107,5 @@ public void removeTransport(final InetSocketAddress... isa) { lock.unlock(); } } - + } diff --git a/es/src/main/java/ds2/oss/core/elasticsearch/impl/node/local/LocalNodeImpl.java b/es/src/main/java/ds2/oss/core/elasticsearch/impl/node/local/LocalNodeImpl.java index 012a2d67..15bb8b52 100644 --- a/es/src/main/java/ds2/oss/core/elasticsearch/impl/node/local/LocalNodeImpl.java +++ b/es/src/main/java/ds2/oss/core/elasticsearch/impl/node/local/LocalNodeImpl.java @@ -15,12 +15,11 @@ */ package ds2.oss.core.elasticsearch.impl.node.local; -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.interceptor.Interceptor; - +import ds2.oss.core.elasticsearch.impl.AbstractNodeImpl; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.interceptor.Interceptor; import org.elasticsearch.client.Client; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; @@ -29,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ds2.oss.core.elasticsearch.impl.AbstractNodeImpl; +import javax.annotation.PostConstruct; /** * A local node generator. @@ -45,7 +44,7 @@ public class LocalNodeImpl extends AbstractNodeImpl { * A logger. */ private static final Logger LOG = LoggerFactory.getLogger(LocalNodeImpl.class); - + /** * Actions to perform at start. */ @@ -61,11 +60,11 @@ public void onInit() { client = n.client(); client.admin().cluster().prepareHealth().setWaitForYellowStatus().get(); LOG.debug("Local index node is up"); - } catch(RuntimeException e){ - LOG.error("Error when starting the local nodes..",e); + } catch (RuntimeException e) { + LOG.error("Error when starting the local nodes..", e); throw e; } } - + } diff --git a/interceptors/src/main/java/ds2/oss/core/interceptors/InfoLogInterceptor.java b/interceptors/src/main/java/ds2/oss/core/interceptors/InfoLogInterceptor.java index 83f29118..a45807e5 100644 --- a/interceptors/src/main/java/ds2/oss/core/interceptors/InfoLogInterceptor.java +++ b/interceptors/src/main/java/ds2/oss/core/interceptors/InfoLogInterceptor.java @@ -15,16 +15,15 @@ */ package ds2.oss.core.interceptors; -import java.util.HashMap; -import java.util.Map; - -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; - +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.HashMap; +import java.util.Map; + /** * An interceptor for any info logging. * @@ -47,10 +46,8 @@ public class InfoLogInterceptor { /** * Creates an exit message. * - * @param ic - * the invocation context - * @param rc - * the result object + * @param ic the invocation context + * @param rc the result object * @return an exit message */ private static String createExitHeader(final InvocationContext ic, final Object rc) { @@ -67,8 +64,7 @@ private static String createExitHeader(final InvocationContext ic, final Object /** * Returns the header string containing the ic target, method name and parameter values. * - * @param ic - * the invocation context + * @param ic the invocation context * @return a header string */ private static String createMethodHeader(final InvocationContext ic) { @@ -105,8 +101,7 @@ private static String createMethodHeader(final InvocationContext ic) { /** * Returns the logger for the given target class. * - * @param ic - * the invocation contex to get the target from + * @param ic the invocation contex to get the target from * @return a logger. */ private static Logger getLoggerForTarget(final InvocationContext ic) { @@ -125,11 +120,9 @@ private static Logger getLoggerForTarget(final InvocationContext ic) { /** * Logs a given call to/from a method. * - * @param ic - * the invocation context. + * @param ic the invocation context. * @return the result of the invocation context. - * @throws Exception - * the exception that is possibly thrown by the invocation context. + * @throws Exception the exception that is possibly thrown by the invocation context. */ @SuppressWarnings("static-method") @AroundInvoke diff --git a/interceptors/src/main/java/ds2/oss/core/interceptors/LogCallings.java b/interceptors/src/main/java/ds2/oss/core/interceptors/LogCallings.java index 7c861deb..0db47229 100644 --- a/interceptors/src/main/java/ds2/oss/core/interceptors/LogCallings.java +++ b/interceptors/src/main/java/ds2/oss/core/interceptors/LogCallings.java @@ -15,14 +15,10 @@ */ package ds2.oss.core.interceptors; -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; +import java.lang.annotation.*; /** * The interceptor binding annotation to log any calls to this method or bean. @@ -32,7 +28,7 @@ */ @Inherited @InterceptorBinding -@Target({ ElementType.TYPE, ElementType.METHOD }) +@Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) public @interface LogCallings { /** diff --git a/options/build.gradle b/options/build.gradle index 908bc1cc..4fd92510 100644 --- a/options/build.gradle +++ b/options/build.gradle @@ -1,7 +1,11 @@ +plugins { + id "org.hibernate.orm" version "6.0.0.Alpha9" +} + description = 'DS/2 OSS Core Options' dependencies { annotationProcessor 'org.projectlombok:lombok:1.18.22' - annotationProcessor(group: 'org.hibernate', name: 'hibernate-jpamodelgen', version: '5.6.3.Final') + //annotationProcessor(group: 'org.hibernate', name: 'hibernate-jpamodelgen', version: '5.6.3.Final') implementation project(':ds2-oss-core-api') implementation project(':ds2-oss-core-base') implementation project(':ds2-oss-core-crypto') @@ -17,26 +21,8 @@ dependencies { testImplementation project(path: ':ds2-oss-core-testutils') testImplementation project(':ds2-oss-core-crypto-bouncycastle') testImplementation group: 'org.jboss', name: 'jandex', version: '2.4.1.Final' - implementation(group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32') { - /* This dependency was originally in the Maven provided scope, but the project was not of type war. - This behavior is not yet supported by Gradle, so this dependency has been converted to a compile dependency. - Please review and delete this closure when resolved. */ - } - compileOnly(group: 'javax.enterprise', name: 'cdi-api', version: '2.0') { - /* This dependency was originally in the Maven provided scope, but the project was not of type war. - This behavior is not yet supported by Gradle, so this dependency has been converted to a compile dependency. - Please review and delete this closure when resolved. */ - } - compileOnly(group: 'javax.validation', name: 'validation-api', version: '2.0.1.Final') { - /* This dependency was originally in the Maven provided scope, but the project was not of type war. - This behavior is not yet supported by Gradle, so this dependency has been converted to a compile dependency. - Please review and delete this closure when resolved. */ - } - compileOnly(group: 'org.eclipse.persistence', name: 'javax.persistence', version: '2.2.1') { - /* This dependency was originally in the Maven provided scope, but the project was not of type war. - This behavior is not yet supported by Gradle, so this dependency has been converted to a compile dependency. - Please review and delete this closure when resolved. */ - } + implementation(group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32') + //compileOnly(group: 'org.eclipse.persistence', name: 'javax.persistence', version: '2.2.1') compileOnly(group: 'org.hibernate', name: 'hibernate-jpamodelgen', version: '5.6.3.Final') compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') compileOnly 'org.projectlombok:lombok:1.18.22' @@ -66,3 +52,12 @@ processTestResources.dependsOn copyTestResources, copyResources test.dependsOn copyTestStuffToResources test.useTestNG() +hibernate { + // EnhancementSpec + enhancement { + // available options - all default to false + lazyInitialization(true) + enableDirtyTracking(true) + enableAssociationManagement(true) + } +} diff --git a/options/src/main/java/ds2/oss/core/options/api/ValueCodecMarker.java b/options/src/main/java/ds2/oss/core/options/api/ValueCodecMarker.java index 43d04595..327621db 100644 --- a/options/src/main/java/ds2/oss/core/options/api/ValueCodecMarker.java +++ b/options/src/main/java/ds2/oss/core/options/api/ValueCodecMarker.java @@ -15,19 +15,18 @@ */ package ds2.oss.core.options.api; +import ds2.oss.core.api.options.ValueType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Qualifier; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Qualifier; - -import ds2.oss.core.api.options.ValueType; - /** * Marker annotation for a value codec. - * + * * @author dstrauss * @version 0.3 */ diff --git a/options/src/main/java/ds2/oss/core/options/impl/NumberedOptionStorageServiceImpl.java b/options/src/main/java/ds2/oss/core/options/impl/NumberedOptionStorageServiceImpl.java index f512ab77..424c613d 100644 --- a/options/src/main/java/ds2/oss/core/options/impl/NumberedOptionStorageServiceImpl.java +++ b/options/src/main/java/ds2/oss/core/options/impl/NumberedOptionStorageServiceImpl.java @@ -22,12 +22,12 @@ import ds2.oss.core.api.dto.impl.OptionValueDto; import ds2.oss.core.api.options.*; import ds2.oss.core.options.api.*; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.inject.Inject; import java.lang.invoke.MethodHandles; import java.time.LocalDateTime; import java.util.Date; diff --git a/options/src/main/java/ds2/oss/core/options/impl/OptionDtoFactoryImpl.java b/options/src/main/java/ds2/oss/core/options/impl/OptionDtoFactoryImpl.java index 8e192fce..01bda51b 100644 --- a/options/src/main/java/ds2/oss/core/options/impl/OptionDtoFactoryImpl.java +++ b/options/src/main/java/ds2/oss/core/options/impl/OptionDtoFactoryImpl.java @@ -15,22 +15,21 @@ */ package ds2.oss.core.options.impl; -import javax.enterprise.context.ApplicationScoped; - import ds2.oss.core.api.dto.impl.OptionDto; import ds2.oss.core.api.options.OptionIdentifier; import ds2.oss.core.api.options.OptionStage; import ds2.oss.core.options.api.OptionFactory; +import jakarta.enterprise.context.ApplicationScoped; /** * The factory to create some option dtos. - * + * * @author dstrauss * @version 0.3 */ @ApplicationScoped public class OptionDtoFactoryImpl implements OptionFactory { - + @Override public OptionDto createOptionDto(final OptionIdentifier ident, final K primKey, final V defaultVal) { final OptionDto rc = new OptionDto<>(primKey); @@ -42,5 +41,5 @@ public OptionDto createOptionDto(final OptionIdentifier ident, f rc.setStage(OptionStage.Online); return rc; } - + } diff --git a/options/src/main/java/ds2/oss/core/options/impl/OptionValueDtoFactory.java b/options/src/main/java/ds2/oss/core/options/impl/OptionValueDtoFactory.java index f49fa728..66088fc3 100644 --- a/options/src/main/java/ds2/oss/core/options/impl/OptionValueDtoFactory.java +++ b/options/src/main/java/ds2/oss/core/options/impl/OptionValueDtoFactory.java @@ -20,8 +20,8 @@ import ds2.oss.core.api.options.OptionValueContext; import ds2.oss.core.api.options.OptionValueStage; import ds2.oss.core.options.api.OptionValueFactory; +import jakarta.enterprise.context.ApplicationScoped; -import javax.enterprise.context.ApplicationScoped; import java.time.LocalDateTime; /** diff --git a/options/src/main/java/ds2/oss/core/options/impl/OptionValueEncrypterProviderImpl.java b/options/src/main/java/ds2/oss/core/options/impl/OptionValueEncrypterProviderImpl.java index 491f10d7..2ab59018 100644 --- a/options/src/main/java/ds2/oss/core/options/impl/OptionValueEncrypterProviderImpl.java +++ b/options/src/main/java/ds2/oss/core/options/impl/OptionValueEncrypterProviderImpl.java @@ -15,53 +15,51 @@ */ package ds2.oss.core.options.impl; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import ds2.oss.core.api.options.ForValueType; import ds2.oss.core.api.options.ValueType; import ds2.oss.core.options.api.OptionValueEncrypter; import ds2.oss.core.options.api.OptionValueEncrypterProvider; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; /** * The enc provider. - * + * * @author dstrauss * @version 0.3 - * */ @ApplicationScoped public class OptionValueEncrypterProviderImpl implements - OptionValueEncrypterProvider { - /** - * The string encrypter. - */ - @Inject - @ForValueType(ValueType.STRING) - private OptionValueEncrypter stringEnc; + OptionValueEncrypterProvider { + /** + * The string encrypter. + */ + @Inject + @ForValueType(ValueType.STRING) + private OptionValueEncrypter stringEnc; - /* - * (non-Javadoc) - * - * @see - * ds2.oss.core.options.api.OptionValueEncrypterProvider#getForValueType - * (ds2.oss.core.api.options .ValueType, java.lang.Class) - */ - @SuppressWarnings("unchecked") - @Override - public OptionValueEncrypter getForValueType(ValueType t) { - OptionValueEncrypter rc = null; - if (t != null) { - switch (t) { - case STRING: - rc = (OptionValueEncrypter) stringEnc; - break; - default: - // nothing special to do - break; - } - } - return rc; - } + /* + * (non-Javadoc) + * + * @see + * ds2.oss.core.options.api.OptionValueEncrypterProvider#getForValueType + * (ds2.oss.core.api.options .ValueType, java.lang.Class) + */ + @SuppressWarnings("unchecked") + @Override + public OptionValueEncrypter getForValueType(ValueType t) { + OptionValueEncrypter rc = null; + if (t != null) { + switch (t) { + case STRING: + rc = (OptionValueEncrypter) stringEnc; + break; + default: + // nothing special to do + break; + } + } + return rc; + } } diff --git a/options/src/main/java/ds2/oss/core/options/impl/ValueCodecMarkerLiteral.java b/options/src/main/java/ds2/oss/core/options/impl/ValueCodecMarkerLiteral.java index a4df788f..2ed3c7e7 100644 --- a/options/src/main/java/ds2/oss/core/options/impl/ValueCodecMarkerLiteral.java +++ b/options/src/main/java/ds2/oss/core/options/impl/ValueCodecMarkerLiteral.java @@ -15,19 +15,18 @@ */ package ds2.oss.core.options.impl; -import javax.enterprise.util.AnnotationLiteral; - import ds2.oss.core.api.options.ValueType; import ds2.oss.core.options.api.ValueCodecMarker; +import jakarta.enterprise.util.AnnotationLiteral; /** * The value codec marker literal. - * + * * @author dstrauss * @version 0.3 */ public class ValueCodecMarkerLiteral extends AnnotationLiteral implements ValueCodecMarker { - + /** * The svuid. */ @@ -36,20 +35,19 @@ public class ValueCodecMarkerLiteral extends AnnotationLiteral * The value type. */ private ValueType value; - + /** * Inits the marker. - * - * @param t - * the value type to scan for + * + * @param t the value type to scan for */ public ValueCodecMarkerLiteral(final ValueType t) { value = t; } - + @Override public ValueType value() { return value; } - + } diff --git a/options/src/main/java/ds2/oss/core/options/impl/ValueTypeParserImpl.java b/options/src/main/java/ds2/oss/core/options/impl/ValueTypeParserImpl.java index fe7c84f9..1ca69cbc 100644 --- a/options/src/main/java/ds2/oss/core/options/impl/ValueTypeParserImpl.java +++ b/options/src/main/java/ds2/oss/core/options/impl/ValueTypeParserImpl.java @@ -15,17 +15,6 @@ */ package ds2.oss.core.options.impl; -import java.lang.annotation.Annotation; -import java.lang.invoke.MethodHandles; - -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import ds2.oss.core.api.dto.impl.OptionDto; import ds2.oss.core.api.dto.impl.OptionValueDto; import ds2.oss.core.api.options.OptionIdentifier; @@ -36,10 +25,19 @@ import ds2.oss.core.options.api.ValueTypeParser; import ds2.oss.core.options.impl.entities.OptionEntity; import ds2.oss.core.options.impl.entities.OptionValueEntity; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.lang.annotation.Annotation; +import java.lang.invoke.MethodHandles; /** * The value type parser impl. - * + * * @author dstrauss * @version 0.3 */ @@ -60,7 +58,7 @@ public class ValueTypeParserImpl implements ValueTypeParser { */ @Inject private OptionValueEncrypterProvider encProvider; - + @Override public V parseValue(final ValueType t, final Object thisVal, final V onNull) { if (thisVal == null) { @@ -68,22 +66,20 @@ public V parseValue(final ValueType t, final Object thisVal, final V onNull) } V rc = null; final Annotation a = new ValueCodecMarkerLiteral(t); - @SuppressWarnings("unchecked") - final ValueCodec codec = (ValueCodec) codecs.select(a).get(); + @SuppressWarnings("unchecked") final ValueCodec codec = (ValueCodec) codecs.select(a).get(); rc = codec.toValue((String) thisVal); return rc; } - + @Override public String toString(final ValueType valueType, final Object val) { String rc = null; final Annotation a = new ValueCodecMarkerLiteral(valueType); - @SuppressWarnings("unchecked") - final ValueCodec codec = (ValueCodec) codecs.select(a).get(); + @SuppressWarnings("unchecked") final ValueCodec codec = (ValueCodec) codecs.select(a).get(); rc = codec.toString(val); return rc; } - + @Override public OptionDto toDto(final OptionEntity e, final OptionIdentifier ident) { if (e == null) { @@ -103,12 +99,11 @@ public OptionDto toDto(final OptionEntity e, final OptionIdentifier rc.setEncoded(e.getEncoded()); rc.setInitVector(e.getInitVector()); final Annotation a = new ValueCodecMarkerLiteral(ident.getValueType()); - @SuppressWarnings("unchecked") - final ValueCodec codec = (ValueCodec) codecs.select(a).get(); + @SuppressWarnings("unchecked") final ValueCodec codec = (ValueCodec) codecs.select(a).get(); rc.setDefaultValue(codec.toValue((String) e.getDefaultValue())); return rc; } - + @Override public OptionValueDto toDto(final OptionValueEntity e) { if (e == null) { diff --git a/options/src/main/java/ds2/oss/core/options/impl/ejb/AbstractOptionValuePersistenceSupportBean.java b/options/src/main/java/ds2/oss/core/options/impl/ejb/AbstractOptionValuePersistenceSupportBean.java index e6dccc68..483b0293 100644 --- a/options/src/main/java/ds2/oss/core/options/impl/ejb/AbstractOptionValuePersistenceSupportBean.java +++ b/options/src/main/java/ds2/oss/core/options/impl/ejb/AbstractOptionValuePersistenceSupportBean.java @@ -15,39 +15,12 @@ */ package ds2.oss.core.options.impl.ejb; -import java.lang.invoke.MethodHandles; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Set; - -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Order; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Subquery; -import javax.validation.Validator; - -import ds2.oss.core.api.environment.RuntimeType; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import ds2.oss.core.api.dto.impl.OptionValueContextDto; import ds2.oss.core.api.dto.impl.OptionValueDto; import ds2.oss.core.api.environment.Cluster; +import ds2.oss.core.api.environment.RuntimeType; import ds2.oss.core.api.environment.ServerIdentifier; -import ds2.oss.core.api.options.Option; -import ds2.oss.core.api.options.OptionIdentifier; -import ds2.oss.core.api.options.OptionStage; -import ds2.oss.core.api.options.OptionValue; -import ds2.oss.core.api.options.OptionValueContext; -import ds2.oss.core.api.options.OptionValueStage; +import ds2.oss.core.api.options.*; import ds2.oss.core.dbtools.AbstractPersistenceSupportImpl; import ds2.oss.core.dbtools.modules.LifeCycleAwareModule; import ds2.oss.core.dbtools.modules.LifeCycleAwareModule_; @@ -59,6 +32,19 @@ import ds2.oss.core.options.impl.entities.OptionValueEntity_; import ds2.oss.core.options.internal.OptionValueContextModule; import ds2.oss.core.options.internal.OptionValueContextModule_; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.*; +import jakarta.validation.Validator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.lang.invoke.MethodHandles; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; /** * A base class to support some common operations for dealing with option value persistence. @@ -84,41 +70,41 @@ private static void getContextPredicate(List predicates, CriteriaBuil ctx = new OptionValueContextDto(); } if (ctx.getCluster() != null) { - predicates.add(getIsNullOrValue(qb, path.get(OptionValueContextModule_.cluster), Cluster.class, CLUSTER)); + predicates.add(getIsNullOrValue(qb, path.get(OptionValueContextModule.COL_CLUSTER), Cluster.class, CLUSTER)); } else { - predicates.add(qb.isNull(path.get(OptionValueContextModule_.cluster))); + predicates.add(qb.isNull(path.get(OptionValueContextModule.COL_CLUSTER))); } if (ctx.getConfiguration() != null) { - predicates.add(getIsNullOrValue(qb, path.get(OptionValueContextModule_.configuration), + predicates.add(getIsNullOrValue(qb, path.get(OptionValueContextModule.COL_RTCONFIG), RuntimeType.class, RT_CONFIG)); } else { - predicates.add(qb.isNull(path.get(OptionValueContextModule_.configuration))); + predicates.add(qb.isNull(path.get(OptionValueContextModule.COL_RTCONFIG))); } if (ctx.getRequestedDomain() != null) { predicates.add( - getIsNullOrValue(qb, path.get(OptionValueContextModule_.requestedDomain), String.class, REQ_DOMAIN)); + getIsNullOrValue(qb, path.get(OptionValueContextModule.COL_REQDOMAIN), String.class, REQ_DOMAIN)); } else { - predicates.add(qb.isNull(path.get(OptionValueContextModule_.requestedDomain))); + predicates.add(qb.isNull(path.get(OptionValueContextModule.COL_REQDOMAIN))); } if (ctx.getServer() != null) { ServerIdentifier si = ctx.getServer(); if (si.getDomain() != null) { - predicates.add(getIsNullOrValue(qb, path.get(OptionValueContextModule_.serverDomain), String.class, + predicates.add(getIsNullOrValue(qb, path.get(OptionValueContextModule.COL_SERVERDOMAIN), String.class, SERVER_DOMAIN)); } if (si.getHostName() != null) { - predicates.add(getIsNullOrValue(qb, path.get(OptionValueContextModule_.serverHostname), String.class, + predicates.add(getIsNullOrValue(qb, path.get(OptionValueContextModule.COL_SERVERHOSTNAME), String.class, SERVER_HOSTNAME)); } if (si.getIpAddress() != null) { predicates - .add(getIsNullOrValue(qb, path.get(OptionValueContextModule_.serverIp), String.class, SERVER_IP)); + .add(getIsNullOrValue(qb, path.get(OptionValueContextModule.COL_SERVERADDR), String.class, SERVER_IP)); } } else { - predicates.add(qb.isNull(path.get(OptionValueContextModule_.serverDomain))); - predicates.add(qb.isNull(path.get(OptionValueContextModule_.serverHostname))); - predicates.add(qb.isNull(path.get(OptionValueContextModule_.serverIp))); + predicates.add(qb.isNull(path.get(OptionValueContextModule.COL_SERVERDOMAIN))); + predicates.add(qb.isNull(path.get(OptionValueContextModule.COL_SERVERHOSTNAME))); + predicates.add(qb.isNull(path.get(OptionValueContextModule.COL_SERVERADDR))); } } @@ -148,11 +134,11 @@ private static Predicate getIsNullOrValue(CriteriaBuilder cb, Path p, Cla private static Predicate getLcaPredicate(CriteriaBuilder cb, Path p, String value) { Predicate rc = null; Predicate lessThan = - cb.lessThanOrEqualTo(p.get(LifeCycleAwareModule_.validFrom), cb.parameter(LocalDateTime.class, value)); + cb.lessThanOrEqualTo(p.get(LifeCycleAwareModule.COL_VALIDFROM), cb.parameter(LocalDateTime.class, value)); // and - Predicate isNull = cb.isNull(p.get(LifeCycleAwareModule_.validTo)); + Predicate isNull = cb.isNull(p.get(LifeCycleAwareModule.COL_VALIDTO)); Predicate greaterThan = - cb.greaterThanOrEqualTo(p.get(LifeCycleAwareModule_.validTo), cb.parameter(LocalDateTime.class, value)); + cb.greaterThanOrEqualTo(p.get(LifeCycleAwareModule.COL_VALIDTO), cb.parameter(LocalDateTime.class, value)); Predicate endDate = cb.or(isNull, greaterThan); rc = cb.and(lessThan, endDate); // lessThan and (isNull or greaterThan) @@ -234,10 +220,10 @@ public OptionValue findBestOptionValue(EntityManager em, OptionIden List optionPredicates = new ArrayList(); optionPredicates.add( - cb.equal(optionRoot.get(OptionEntity_.applicationName), cb.parameter(String.class, "applicationName"))); + cb.equal(optionRoot.get(OptionEntity.APP_NAME), cb.parameter(String.class, "applicationName"))); optionPredicates - .add(cb.equal(optionRoot.get(OptionEntity_.optionName), cb.parameter(String.class, "optionName"))); - optionPredicates.add(cb.equal(optionRoot.get(OptionEntity_.stage), OptionStage.Online)); + .add(cb.equal(optionRoot.get(OptionEntity.NAME), cb.parameter(String.class, "optionName"))); + optionPredicates.add(cb.equal(optionRoot.get(OptionEntity.STAGE), OptionStage.Online)); optionQuery.where(optionPredicates.toArray(new Predicate[optionPredicates.size()])); /* * restrictions.add(qb.equal(optionValueRoot.get(OptionValueEntity_.refOption).get( @@ -247,19 +233,19 @@ public OptionValue findBestOptionValue(EntityManager em, OptionIden * restrictions.add(qb.equal(optionValueRoot.get(OptionValueEntity_.refOption).get("id"), * qb.parameter(Long.class, "optionId"))); */ - restrictions.add(cb.equal(optionValueRoot.get(OptionValueEntity_.refOption), optionQuery)); - restrictions.add(cb.equal(optionValueRoot.get("stage"), OptionValueStage.Live)); + restrictions.add(cb.equal(optionValueRoot.get(OptionValueEntity.REF_OPTION), optionQuery)); + restrictions.add(cb.equal(optionValueRoot.get(OptionValueEntity.STAGE), OptionValueStage.Live)); restrictions.add(getLcaPredicate(cb, optionValueRoot.get(OptionValueEntity_.lca), "date")); getContextPredicate(restrictions, cb, optionValueRoot.get(OptionValueEntity_.ctx), ctx); cq.where(restrictions.toArray(new Predicate[restrictions.size()])); List orderByList = new ArrayList(4); - orderByList.add(cb.desc(optionValueRoot.get(OptionValueEntity_.ctx).get(OptionValueContextModule_.cluster))); + orderByList.add(cb.desc(optionValueRoot.get(OptionValueEntity_.ctx).get(OptionValueContextModule.COL_CLUSTER))); orderByList - .add(cb.desc(optionValueRoot.get(OptionValueEntity_.ctx).get(OptionValueContextModule_.configuration))); + .add(cb.desc(optionValueRoot.get(OptionValueEntity_.ctx).get(OptionValueContextModule.COL_RTCONFIG))); orderByList - .add(cb.desc(optionValueRoot.get(OptionValueEntity_.ctx).get(OptionValueContextModule_.requestedDomain))); + .add(cb.desc(optionValueRoot.get(OptionValueEntity_.ctx).get(OptionValueContextModule.COL_REQDOMAIN))); orderByList - .add(cb.desc(optionValueRoot.get(OptionValueEntity_.ctx).get(OptionValueContextModule_.serverHostname))); + .add(cb.desc(optionValueRoot.get(OptionValueEntity_.ctx).get(OptionValueContextModule.COL_SERVERHOSTNAME))); cq.orderBy(orderByList.toArray(new Order[orderByList.size()])); // perform query to database TypedQuery query = em.createQuery(cq); diff --git a/options/src/main/java/ds2/oss/core/options/impl/ejb/AbstractOptionsPersistenceSupportBean.java b/options/src/main/java/ds2/oss/core/options/impl/ejb/AbstractOptionsPersistenceSupportBean.java index 638bc5f4..33942268 100644 --- a/options/src/main/java/ds2/oss/core/options/impl/ejb/AbstractOptionsPersistenceSupportBean.java +++ b/options/src/main/java/ds2/oss/core/options/impl/ejb/AbstractOptionsPersistenceSupportBean.java @@ -22,13 +22,13 @@ import ds2.oss.core.options.api.NumberedOptionsPersistenceSupport; import ds2.oss.core.options.api.ValueTypeParser; import ds2.oss.core.options.impl.entities.OptionEntity; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; +import jakarta.validation.Validator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import javax.validation.Validator; import java.lang.invoke.MethodHandles; import java.time.LocalDateTime; import java.util.Set; diff --git a/options/src/main/java/ds2/oss/core/options/impl/encryption/StringOptionValueEncrypter.java b/options/src/main/java/ds2/oss/core/options/impl/encryption/StringOptionValueEncrypter.java index a11a5408..c0cef2e3 100644 --- a/options/src/main/java/ds2/oss/core/options/impl/encryption/StringOptionValueEncrypter.java +++ b/options/src/main/java/ds2/oss/core/options/impl/encryption/StringOptionValueEncrypter.java @@ -15,13 +15,6 @@ */ package ds2.oss.core.options.impl.encryption; -import java.nio.charset.Charset; - -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.inject.Inject; - import ds2.oss.core.api.AppServerSecurityBaseDataService; import ds2.oss.core.api.crypto.Ciphers; import ds2.oss.core.api.crypto.EncodedContent; @@ -29,13 +22,19 @@ import ds2.oss.core.api.options.ForValueType; import ds2.oss.core.api.options.ValueType; import ds2.oss.core.options.api.OptionValueEncrypter; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Inject; + +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; /** * The string option value encrypter. - * + * * @author dstrauss * @version 0.3 - * */ @ForValueType(ValueType.STRING) @ApplicationScoped @@ -45,7 +44,7 @@ public class StringOptionValueEncrypter implements OptionValueEncrypter /** * The utf8 charset. */ - private static final Charset UTF8 = Charset.forName("utf-8"); + private static final Charset UTF8 = StandardCharsets.UTF_8; /** * The encryption service. */ @@ -56,17 +55,17 @@ public class StringOptionValueEncrypter implements OptionValueEncrypter */ @Inject private AppServerSecurityBaseDataService secSvc; - + @Override public EncodedContent encrypt(final String s) { return encSvc.encode(secSvc.getAppserverSecretKey(), Ciphers.AES, s.getBytes(UTF8)); } - + @Override public String decrypt(final EncodedContent s) { final byte[] bytes = encSvc.decode(secSvc.getAppserverSecretKey(), Ciphers.AES, s); final String rc = new String(bytes, UTF8); return rc; } - + } diff --git a/options/src/main/java/ds2/oss/core/options/impl/entities/OptionEntity.java b/options/src/main/java/ds2/oss/core/options/impl/entities/OptionEntity.java index e5a1cf2f..f0078ea2 100644 --- a/options/src/main/java/ds2/oss/core/options/impl/entities/OptionEntity.java +++ b/options/src/main/java/ds2/oss/core/options/impl/entities/OptionEntity.java @@ -15,61 +15,47 @@ */ package ds2.oss.core.options.impl.entities; -import java.util.Date; - -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.UniqueConstraint; - import ds2.oss.core.api.options.Option; import ds2.oss.core.api.options.OptionStage; import ds2.oss.core.api.options.ValueType; import ds2.oss.core.dbtools.AbstractCreatedByModifiedByEntity; -import ds2.oss.core.dbtools.modules.CreatedModifiedAwareModule; import ds2.oss.core.dbtools.modules.IvEncodedContentModule; import ds2.oss.core.options.api.NumberedOptionsPersistenceSupport; import ds2.oss.core.options.internal.OptionStageConverter; import ds2.oss.core.options.internal.ValueTypeConverter; +import jakarta.persistence.*; /** * A database option. - * + * * @author dstrauss * @version 0.3 */ @Entity(name = "coreOption") -@Table(name = "core_options", uniqueConstraints = { @UniqueConstraint(columnNames = { "app_name", "name" }) }) +@Table(name = "core_options", uniqueConstraints = {@UniqueConstraint(columnNames = {"app_name", "name"})}) @TableGenerator( - name = "tableGen1", - initialValue = 1, - pkColumnName = "table_name", - pkColumnValue = "core_options", - table = "core_id", - valueColumnName = "next_id", - allocationSize = 1) + name = "tableGen1", + initialValue = 1, + pkColumnName = "table_name", + pkColumnValue = "core_options", + table = "core_id", + valueColumnName = "next_id", + allocationSize = 1) @SequenceGenerator(initialValue = 1, name = "seqGen1", sequenceName = "SEQ_CORE_OPTIONS", allocationSize = 1) -@NamedQueries({ @NamedQuery( - name = NumberedOptionsPersistenceSupport.QUERY_FINDOPTIONBYIDENTIFIER, - query = "select o from coreOption o where o.optionName = :optionName and o.applicationName = :appName") }) +@NamedQueries({@NamedQuery( + name = NumberedOptionsPersistenceSupport.QUERY_FINDOPTIONBYIDENTIFIER, + query = "select o from coreOption o where o.optionName = :optionName and o.applicationName = :appName")}) @Access(AccessType.FIELD) public class OptionEntity extends AbstractCreatedByModifiedByEntity implements Option { - + /** * The svuid. */ private static final long serialVersionUID = 8598846864284031760L; + public static final String APP_NAME = "app_name"; + public static final String NAME = "name"; + public static final String VALUE_TYPE = "value_type"; + public static final String STAGE = "stage"; /** * The id of the entry. */ @@ -79,7 +65,7 @@ public class OptionEntity extends AbstractCreatedByModifiedByEntity implements O /** * The application name. */ - @Column(name = "app_name", nullable = false) + @Column(name = APP_NAME, nullable = false) private String applicationName; /** * The EC module. @@ -89,12 +75,12 @@ public class OptionEntity extends AbstractCreatedByModifiedByEntity implements O /** * The option name. */ - @Column(name = "name", nullable = false) + @Column(name = NAME, nullable = false) private String optionName; /** * The value type. */ - @Column(name = "value_type", nullable = false) + @Column(name = VALUE_TYPE, nullable = false) @Convert(converter = ValueTypeConverter.class) private ValueType valueType; /** @@ -110,7 +96,7 @@ public class OptionEntity extends AbstractCreatedByModifiedByEntity implements O /** * The stage value. */ - @Column(name = "stage", nullable = false) + @Column(name = STAGE, nullable = false) @Convert(converter = OptionStageConverter.class) private OptionStage stage; /** @@ -118,34 +104,34 @@ public class OptionEntity extends AbstractCreatedByModifiedByEntity implements O */ @Column(name = "description") private String description; - + /** * Inits the entity. */ public OptionEntity() { ecm = new IvEncodedContentModule(); } - + @Override public String getApplicationName() { return applicationName; } - + @Override public Object getDecryptedValue() { return null; } - + @Override public Object getDefaultValue() { return defaultValue; } - + @Override public String getDescription() { return description; } - + @Override public byte[] getEncoded() { if (ecm == null) { @@ -153,12 +139,12 @@ public byte[] getEncoded() { } return ecm.getEncoded(); } - + @Override public Long getId() { return id; } - + @Override public byte[] getInitVector() { if (ecm == null) { @@ -171,27 +157,26 @@ public byte[] getInitVector() { public String getOptionName() { return optionName; } - + @Override public OptionStage getStage() { return stage; } - + @Override public ValueType getValueType() { return valueType; } - + @Override public boolean isEncrypted() { return encrypted; } - + /** * Sets the application name. - * - * @param applicationName - * the applicationName to set + * + * @param applicationName the applicationName to set */ public void setApplicationName(final String applicationName) { this.applicationName = applicationName; @@ -199,49 +184,44 @@ public void setApplicationName(final String applicationName) { /** * Sets the default value. - * - * @param defaultValue - * the defaultValue to set + * + * @param defaultValue the defaultValue to set */ public void setDefaultValue(final String defaultValue) { this.defaultValue = defaultValue; } - + /** * Sets a description. - * - * @param description - * a description. + * + * @param description a description. */ public void setDescription(final String description) { this.description = description; } - + /** * Sets the encoded bytes. - * - * @param b - * the encoded content + * + * @param b the encoded content */ public void setEncoded(byte[] b) { ecm.setEncoded(b); } - + /** * Sets the encrypted flag. - * - * @param encrypted1 - * the encrypted to set + * + * @param encrypted1 the encrypted to set */ public void setEncrypted(final boolean encrypted1) { encrypted = encrypted1; } - + /** * Sets the init vector that was used to encrypt the data. - * - * @param b - * the init vector + * + * @param b the init vector */ public void setInitVector(byte[] b) { ecm.setInitVector(b); @@ -249,34 +229,31 @@ public void setInitVector(byte[] b) { /** * Sets the option name. - * - * @param optionName1 - * the optionName to set + * + * @param optionName1 the optionName to set */ public void setOptionName(final String optionName1) { optionName = optionName1; } - + /** * Sets the stage value. - * - * @param s - * the stage value + * + * @param s the stage value */ public void setStage(final OptionStage s) { stage = s; } - + /** * Sets the value type. - * - * @param valueType1 - * the valueType to set + * + * @param valueType1 the valueType to set */ public void setValueType(final ValueType valueType1) { valueType = valueType1; } - + /* * (non-Javadoc) * @see java.lang.Object#toString() diff --git a/options/src/main/java/ds2/oss/core/options/impl/entities/OptionValueContextEntity.java b/options/src/main/java/ds2/oss/core/options/impl/entities/OptionValueContextEntity.java index a4fc9c3b..baea8d36 100644 --- a/options/src/main/java/ds2/oss/core/options/impl/entities/OptionValueContextEntity.java +++ b/options/src/main/java/ds2/oss/core/options/impl/entities/OptionValueContextEntity.java @@ -15,27 +15,21 @@ */ package ds2.oss.core.options.impl.entities; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - import ds2.oss.core.api.environment.Cluster; import ds2.oss.core.api.environment.RuntimeType; import ds2.oss.core.api.environment.ServerIdentifier; import ds2.oss.core.api.options.OptionValueContext; import ds2.oss.core.options.internal.OptionValueContextModule; +import jakarta.persistence.*; /** * A table with all known option value contexts. - * + * * @author dstrauss * @version 0.3 - * */ -@Table(name = "core_ctx", uniqueConstraints = { @UniqueConstraint(columnNames = { "ctx_cluster", "ctx_runtime_config", - "ctx_req_domain", "ctx_server_hostname" }) }) +@Table(name = "core_ctx", uniqueConstraints = {@UniqueConstraint(columnNames = {"ctx_cluster", "ctx_runtime_config", + "ctx_req_domain", "ctx_server_hostname"})}) @Entity(name = "coreOptionValueContext") public class OptionValueContextEntity implements OptionValueContext { /** @@ -52,7 +46,7 @@ public class OptionValueContextEntity implements OptionValueContext { */ @Embedded private OptionValueContextModule mod = new OptionValueContextModule(); - + /* * (non-Javadoc) * @see ds2.oss.core.api.options.OptionValueContext#getCluster() @@ -61,7 +55,7 @@ public class OptionValueContextEntity implements OptionValueContext { public Cluster getCluster() { return mod.getCluster(); } - + /* * (non-Javadoc) * @see ds2.oss.core.api.options.OptionValueContext#getConfiguration() @@ -70,7 +64,7 @@ public Cluster getCluster() { public RuntimeType getConfiguration() { return mod.getConfiguration(); } - + /* * (non-Javadoc) * @see ds2.oss.core.api.options.OptionValueContext#getServer() @@ -79,7 +73,7 @@ public RuntimeType getConfiguration() { public ServerIdentifier getServer() { return mod.getServer(); } - + /* * (non-Javadoc) * @see ds2.oss.core.api.options.OptionValueContext#getRequestedDomain() @@ -88,5 +82,5 @@ public ServerIdentifier getServer() { public String getRequestedDomain() { return mod.getRequestedDomain(); } - + } diff --git a/options/src/main/java/ds2/oss/core/options/impl/entities/OptionValueEntity.java b/options/src/main/java/ds2/oss/core/options/impl/entities/OptionValueEntity.java index b5803acc..43b2d453 100644 --- a/options/src/main/java/ds2/oss/core/options/impl/entities/OptionValueEntity.java +++ b/options/src/main/java/ds2/oss/core/options/impl/entities/OptionValueEntity.java @@ -28,8 +28,8 @@ import ds2.oss.core.options.internal.OptionValueContextModule; import ds2.oss.core.options.internal.OptionValueStageConverter; import ds2.oss.core.options.internal.ValueTypeConverter; +import jakarta.persistence.*; -import javax.persistence.*; import java.time.LocalDateTime; /** @@ -57,6 +57,8 @@ public class OptionValueEntity extends AbstractCreatedByModifiedByEntity impleme * The svuid. */ private static final long serialVersionUID = 8443176889297017343L; + public static final String REF_OPTION = "ref_option"; + public static final String STAGE = "stage"; /** * The approver. @@ -98,13 +100,13 @@ public class OptionValueEntity extends AbstractCreatedByModifiedByEntity impleme /** * The ref option. */ - @JoinColumn(name = "ref_option", nullable = false) + @JoinColumn(name = REF_OPTION, nullable = false) @ManyToOne(targetEntity = OptionEntity.class) private Option refOption; /** * The option value stage. */ - @Column(name = "stage", nullable = false) + @Column(name = STAGE, nullable = false) @Convert(converter = OptionValueStageConverter.class) private OptionValueStage stage; /** diff --git a/options/src/main/java/ds2/oss/core/options/impl/identifiers/AbstractOptionIdentifier.java b/options/src/main/java/ds2/oss/core/options/impl/identifiers/AbstractOptionIdentifier.java index 52d0bbc8..f4f605d9 100644 --- a/options/src/main/java/ds2/oss/core/options/impl/identifiers/AbstractOptionIdentifier.java +++ b/options/src/main/java/ds2/oss/core/options/impl/identifiers/AbstractOptionIdentifier.java @@ -15,18 +15,16 @@ */ package ds2.oss.core.options.impl.identifiers; -import javax.validation.constraints.NotNull; - import ds2.oss.core.api.options.OptionIdentifier; import ds2.oss.core.api.options.ValueType; +import jakarta.validation.constraints.NotNull; /** * An abstract option identifier. - * + * + * @param the type of the option * @author dstrauss * @version 0.3 - * @param - * the type of the option */ public abstract class AbstractOptionIdentifier implements OptionIdentifier { /** @@ -52,85 +50,76 @@ public abstract class AbstractOptionIdentifier implements OptionIdentifier * A description of the option. */ private String description; - + /** * Inits the option identifier. - * - * @param appName - * the application name - * - * @param optName - * the option name - * @param typeClass - * the class type - * + * + * @param appName the application name + * @param optName the option name + * @param typeClass the class type */ public AbstractOptionIdentifier(final String appName, final String optName, final ValueType typeClass) { applicationName = appName; optionName = optName; valueType = typeClass; } - + /** * Sets the option name. - * - * @param optionName - * the optionName to set + * + * @param optionName the optionName to set */ public void setOptionName(String optionName) { this.optionName = optionName; } - + /** * Sets the application name. - * - * @param applicationName - * the applicationName to set + * + * @param applicationName the applicationName to set */ public void setApplicationName(String applicationName) { this.applicationName = applicationName; } - + /** * Sets the value type. - * - * @param valueType - * the valueType to set + * + * @param valueType the valueType to set */ public void setValueType(ValueType valueType) { this.valueType = valueType; } - + /** * Sets a description for this option identifier. - * - * @param description - * the description to set + * + * @param description the description to set */ public void setDescription(String description) { this.description = description; } - + @Override public String getApplicationName() { return applicationName; } - + @Override public String getOptionName() { return optionName; } - + @Override public ValueType getValueType() { return valueType; } - + @Override public boolean isEncrypted() { return false; } - + @Override public String getDescription() { return description; diff --git a/options/src/main/java/ds2/oss/core/options/impl/noop/LoggingOptionJournalImpl.java b/options/src/main/java/ds2/oss/core/options/impl/noop/LoggingOptionJournalImpl.java index d24488d5..dd93a289 100644 --- a/options/src/main/java/ds2/oss/core/options/impl/noop/LoggingOptionJournalImpl.java +++ b/options/src/main/java/ds2/oss/core/options/impl/noop/LoggingOptionJournalImpl.java @@ -15,24 +15,22 @@ */ package ds2.oss.core.options.impl.noop; -import java.lang.invoke.MethodHandles; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; - -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import ds2.oss.core.api.options.JournalAction; import ds2.oss.core.api.options.Option; import ds2.oss.core.api.options.OptionServiceJournal; +import jakarta.enterprise.context.ApplicationScoped; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import java.lang.invoke.MethodHandles; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; /** * A simple logging journal service. - * + * * @author dstrauss * @version 0.3 */ @@ -46,7 +44,7 @@ public class LoggingOptionJournalImpl implements OptionServiceJournal { * The scheduler. */ private ScheduledExecutorService scheduler; - + /** * Actions to perform at start. */ @@ -55,7 +53,7 @@ public void onLoad() { LOG.debug("Creating new scheduler"); scheduler = Executors.newScheduledThreadPool(10); } - + /** * Actions to perform before end. */ @@ -64,7 +62,7 @@ public void onExit() { LOG.debug("Shutting down scheduler"); scheduler.shutdown(); } - + /* * (non-Javadoc) * @see ds2.oss.core.api.options.OptionServiceJournal#addEntry(java.lang.String, @@ -72,26 +70,26 @@ public void onExit() { */ @Override public void addEntry(final String invoker, final JournalAction action, final K affectedId, - final D oldVal, final D newVal) { + final D oldVal, final D newVal) { scheduler.execute(new Runnable() { - + @Override public void run() { - LOG.info("{} has taken action {} on id {}, changing {} to {}", new Object[] { invoker, action, - affectedId, oldVal, newVal }); + LOG.info("{} has taken action {} on id {}, changing {} to {}", new Object[]{invoker, action, + affectedId, oldVal, newVal}); } }); } - + @Override public void createdOption(final Option option) { scheduler.execute(new Runnable() { - + @Override public void run() { - LOG.info("{} created new option {}", new Object[] { option.getModifiedBy(), option }); + LOG.info("{} created new option {}", new Object[]{option.getModifiedBy(), option}); } }); } - + } diff --git a/options/src/main/java/ds2/oss/core/options/impl/noop/NoopKeyedOptionStorageServiceImpl.java b/options/src/main/java/ds2/oss/core/options/impl/noop/NoopKeyedOptionStorageServiceImpl.java index 75800b65..d4edb6f0 100644 --- a/options/src/main/java/ds2/oss/core/options/impl/noop/NoopKeyedOptionStorageServiceImpl.java +++ b/options/src/main/java/ds2/oss/core/options/impl/noop/NoopKeyedOptionStorageServiceImpl.java @@ -15,42 +15,32 @@ */ package ds2.oss.core.options.impl.noop; -import java.lang.invoke.MethodHandles; -import java.util.Date; -import java.util.List; - -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; - +import ds2.oss.core.api.options.*; +import ds2.oss.core.options.impl.AbstractOptionStorageServiceImpl; +import jakarta.enterprise.context.ApplicationScoped; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ds2.oss.core.api.options.KeyedOptionStorageService; -import ds2.oss.core.api.options.Option; -import ds2.oss.core.api.options.OptionException; -import ds2.oss.core.api.options.OptionIdentifier; -import ds2.oss.core.api.options.OptionStage; -import ds2.oss.core.api.options.OptionValue; -import ds2.oss.core.api.options.OptionValueContext; -import ds2.oss.core.api.options.OptionValueStage; -import ds2.oss.core.options.impl.AbstractOptionStorageServiceImpl; +import javax.annotation.PostConstruct; +import java.lang.invoke.MethodHandles; +import java.util.Date; +import java.util.List; /** * The default keyed option storage service which will not work by default. - * + * * @author dstrauss * @version 0.3 - * */ @ApplicationScoped public class NoopKeyedOptionStorageServiceImpl extends AbstractOptionStorageServiceImpl - implements - KeyedOptionStorageService { + implements + KeyedOptionStorageService { /** * A logger. */ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - + /** * Actions to perform at startup. */ @@ -58,7 +48,7 @@ public class NoopKeyedOptionStorageServiceImpl extends AbstractOptionStorageServ public void onClass() { LOG.info("Using the non-operational KeyedOptionStorageService. Please reconfigure an alternative!"); } - + /* * (non-Javadoc) * @see @@ -70,7 +60,7 @@ public Option getOptionByIdentifier(final OptionIdentifier ide LOG.info("Using non-operational method. Returning dummy value!"); return null; } - + /* * (non-Javadoc) * @see @@ -80,12 +70,12 @@ public Option getOptionByIdentifier(final OptionIdentifier ide */ @Override public OptionValue createOptionValue(final OptionIdentifier optionIdent, - final OptionValueContext ctx, - final Date scheduleDate, final V value) { + final OptionValueContext ctx, + final Date scheduleDate, final V value) { LOG.info("Using non-operational method. Returning dummy value!"); return null; } - + /* * (non-Javadoc) * @see ds2.oss.core.api.options.OptionStorageService#createOption(ds2.oss.core.api.options. @@ -96,7 +86,7 @@ public Option createOption(final OptionIdentifier ident, final LOG.info("Using non-operational method. Returning dummy value!"); return null; } - + /* * (non-Javadoc) * @see @@ -105,11 +95,11 @@ public Option createOption(final OptionIdentifier ident, final */ @Override public OptionValue findBestOptionValueByContext(final OptionIdentifier ident, - final OptionValueContext ctx) { + final OptionValueContext ctx) { LOG.info("Using non-operational method. Returning dummy value!"); return null; } - + /* * (non-Javadoc) * @see ds2.oss.core.api.options.OptionStorageService#getAllOptions(java.lang.String) @@ -119,7 +109,7 @@ public OptionValue findBestOptionValueByContext(final OptionIdent LOG.info("Using non-operational method. Returning dummy value!"); return null; } - + /* * (non-Javadoc) * @see ds2.oss.core.api.options.OptionStorageService#setOptionStage(ds2.oss.core.api.options. @@ -146,5 +136,5 @@ public void setOptionValueStage(String id, OptionValueStage newStage) { public void approveOptionValue(String id) { LOG.info("Using non-operational method."); } - + } diff --git a/options/src/main/java/ds2/oss/core/options/impl/noop/NoopNumberedOptionStorageServiceImpl.java b/options/src/main/java/ds2/oss/core/options/impl/noop/NoopNumberedOptionStorageServiceImpl.java index f6c32454..317fef2c 100644 --- a/options/src/main/java/ds2/oss/core/options/impl/noop/NoopNumberedOptionStorageServiceImpl.java +++ b/options/src/main/java/ds2/oss/core/options/impl/noop/NoopNumberedOptionStorageServiceImpl.java @@ -15,31 +15,21 @@ */ package ds2.oss.core.options.impl.noop; -import java.lang.invoke.MethodHandles; -import java.util.Date; -import java.util.List; - -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; - +import ds2.oss.core.api.options.*; +import jakarta.enterprise.context.ApplicationScoped; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ds2.oss.core.api.options.NumberedOptionStorageService; -import ds2.oss.core.api.options.Option; -import ds2.oss.core.api.options.OptionException; -import ds2.oss.core.api.options.OptionIdentifier; -import ds2.oss.core.api.options.OptionStage; -import ds2.oss.core.api.options.OptionValue; -import ds2.oss.core.api.options.OptionValueContext; -import ds2.oss.core.api.options.OptionValueStage; +import javax.annotation.PostConstruct; +import java.lang.invoke.MethodHandles; +import java.util.Date; +import java.util.List; /** * A default noop storage service. - * + * * @author dstrauss * @version 0.3 - * */ @ApplicationScoped public class NoopNumberedOptionStorageServiceImpl implements NumberedOptionStorageService { @@ -47,7 +37,7 @@ public class NoopNumberedOptionStorageServiceImpl implements NumberedOptionStora * A logger. */ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - + /** * Actions to perform at startup. */ @@ -55,7 +45,7 @@ public class NoopNumberedOptionStorageServiceImpl implements NumberedOptionStora public void onClass() { LOG.info("Using the non-operational NumberedOptionStorageService! Please choose an alternative."); } - + /* * (non-Javadoc) * @see ds2.oss.core.api.options.OptionStorageService#getOptionByIdentifier(ds2.oss.core.api.options @@ -66,7 +56,7 @@ public Option getOptionByIdentifier(OptionIdentifier ident) { LOG.info("Using noop operation. Returning dummy value!"); return null; } - + /* * (non-Javadoc) * @see ds2.oss.core.api.options.OptionStorageService#createOptionValue(ds2.oss.core.api.options. OptionIdentifier, @@ -74,11 +64,11 @@ public Option getOptionByIdentifier(OptionIdentifier ident) { */ @Override public OptionValue createOptionValue(OptionIdentifier optionIdent, OptionValueContext ctx, - Date scheduleDate, V value) { + Date scheduleDate, V value) { LOG.info("Using noop operation. Returning dummy value!"); return null; } - + /* * (non-Javadoc) * @see ds2.oss.core.api.options.OptionStorageService#createOption(ds2.oss.core.api.options. OptionIdentifier, @@ -89,7 +79,7 @@ public Option createOption(OptionIdentifier ident, V val) { LOG.info("Using noop operation. Returning dummy value!"); return null; } - + /* * (non-Javadoc) * @see ds2.oss.core.api.options.OptionStorageService#findBestOptionValueByContext(ds2.oss.core.api @@ -100,7 +90,7 @@ public OptionValue findBestOptionValueByContext(OptionIdentifier LOG.info("Using noop operation. Returning dummy value!"); return null; } - + /* * (non-Javadoc) * @see ds2.oss.core.api.options.OptionStorageService#getAllOptions(java.lang.String) @@ -110,7 +100,7 @@ public OptionValue findBestOptionValueByContext(OptionIdentifier LOG.info("Using noop operation. Returning dummy value!"); return null; } - + /* * (non-Javadoc) * @see ds2.oss.core.api.options.OptionStorageService#setOptionStage(ds2.oss.core.api.options. OptionIdentifier, @@ -121,23 +111,23 @@ public Option setOptionStage(OptionIdentifier endpoint, OptionSt LOG.info("Using noop operation. Returning dummy value!"); return null; } - + @Override public OptionValue getOptionValueById(Long id) throws OptionException { throw new UnsupportedOperationException("Not supported yet."); // To change body of generated methods, choose - // Tools | Templates. + // Tools | Templates. } - + @Override public void setOptionValueStage(Long id, OptionValueStage newStage) { throw new UnsupportedOperationException("Not supported yet."); // To change body of generated methods, choose - // Tools | Templates. + // Tools | Templates. } - + @Override public void approveOptionValue(Long id) { throw new UnsupportedOperationException("Not supported yet."); // To change body of generated methods, choose - // Tools | Templates. + // Tools | Templates. } - + } diff --git a/options/src/main/java/ds2/oss/core/options/impl/noop/NoopNumberedOptionsPersistenceSupportImpl.java b/options/src/main/java/ds2/oss/core/options/impl/noop/NoopNumberedOptionsPersistenceSupportImpl.java index 5b0114ee..de7283de 100644 --- a/options/src/main/java/ds2/oss/core/options/impl/noop/NoopNumberedOptionsPersistenceSupportImpl.java +++ b/options/src/main/java/ds2/oss/core/options/impl/noop/NoopNumberedOptionsPersistenceSupportImpl.java @@ -19,11 +19,11 @@ import ds2.oss.core.api.options.OptionIdentifier; import ds2.oss.core.api.options.OptionStage; import ds2.oss.core.options.api.NumberedOptionsPersistenceSupport; +import jakarta.enterprise.context.ApplicationScoped; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; import java.lang.invoke.MethodHandles; /** diff --git a/options/src/main/java/ds2/oss/core/options/impl/noop/NoopOptionValuePersistenceSupportImpl.java b/options/src/main/java/ds2/oss/core/options/impl/noop/NoopOptionValuePersistenceSupportImpl.java index 80f76dcb..85ca3106 100644 --- a/options/src/main/java/ds2/oss/core/options/impl/noop/NoopOptionValuePersistenceSupportImpl.java +++ b/options/src/main/java/ds2/oss/core/options/impl/noop/NoopOptionValuePersistenceSupportImpl.java @@ -20,12 +20,11 @@ import ds2.oss.core.api.options.OptionValue; import ds2.oss.core.api.options.OptionValueContext; import ds2.oss.core.api.options.OptionValueStage; -import ds2.oss.core.api.persistence.OperationalContext; import ds2.oss.core.options.api.NumberedOptionValuePersistenceSupport; +import jakarta.enterprise.context.ApplicationScoped; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.context.ApplicationScoped; import java.lang.invoke.MethodHandles; /** diff --git a/options/src/main/java/ds2/oss/core/options/internal/OptionStageConverter.java b/options/src/main/java/ds2/oss/core/options/internal/OptionStageConverter.java index 758261db..d0cc54ef 100644 --- a/options/src/main/java/ds2/oss/core/options/internal/OptionStageConverter.java +++ b/options/src/main/java/ds2/oss/core/options/internal/OptionStageConverter.java @@ -15,25 +15,24 @@ */ package ds2.oss.core.options.internal; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; - import ds2.oss.core.api.options.OptionStage; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; /** * An option stage converter. - * + * * @author dstrauss * @version 0.3 */ @Converter public class OptionStageConverter implements AttributeConverter { - + @Override public Integer convertToDatabaseColumn(final OptionStage attribute) { return Integer.valueOf(attribute.getNumericalValue()); } - + @Override public OptionStage convertToEntityAttribute(final Integer dbData) { if (dbData == null) { @@ -41,5 +40,5 @@ public OptionStage convertToEntityAttribute(final Integer dbData) { } return OptionStage.getById(dbData.intValue()); } - + } diff --git a/options/src/main/java/ds2/oss/core/options/internal/OptionValueContextModule.java b/options/src/main/java/ds2/oss/core/options/internal/OptionValueContextModule.java index 2b8e1c28..730a2ef6 100644 --- a/options/src/main/java/ds2/oss/core/options/internal/OptionValueContextModule.java +++ b/options/src/main/java/ds2/oss/core/options/internal/OptionValueContextModule.java @@ -15,11 +15,6 @@ */ package ds2.oss.core.options.internal; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Embeddable; -import javax.persistence.Transient; - import ds2.oss.core.api.environment.Cluster; import ds2.oss.core.api.environment.RuntimeType; import ds2.oss.core.api.environment.ServerIdentifier; @@ -27,17 +22,26 @@ import ds2.oss.core.api.options.OptionValueContext; import ds2.oss.core.dbtools.converters.ClusterConverter; import ds2.oss.core.dbtools.converters.RuntimeConfigurationConverter; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Transient; /** * A module to support the context of an option value. - * + * * @author dstrauss * @version 0.3 - * */ @Embeddable public class OptionValueContextModule implements OptionValueContext { - + public static final String COL_REQDOMAIN = "ctx_req_domain"; + public static final String COL_SERVERHOSTNAME = "ctx_server_hostname"; + public static final String COL_SERVERDOMAIN = "ctx_server_domain"; + public static final String COL_SERVERADDR = "ctx_server_address"; + public static final String COL_RTCONFIG = "ctx_runtime_config"; + public static final String COL_CLUSTER = "ctx_cluster"; + /** * The svuid. */ @@ -45,7 +49,7 @@ public class OptionValueContextModule implements OptionValueContext { /** * The requested domain. */ - @Column(name = "ctx_req_domain") + @Column(name = COL_REQDOMAIN) private String requestedDomain; /** * The server identifier. @@ -55,86 +59,82 @@ public class OptionValueContextModule implements OptionValueContext { /** * the server hostname. */ - @Column(name = "ctx_server_hostname") + @Column(name = COL_SERVERHOSTNAME) private String serverHostname; /** * The server domain. */ - @Column(name = "ctx_server_domain") + @Column(name = COL_SERVERDOMAIN) private String serverDomain; /** * The server domain. */ - @Column(name = "ctx_server_address") + @Column(name = COL_SERVERADDR) private String serverIp; /** * The runtime config. */ - @Column(name = "ctx_runtime_config") + @Column(name = COL_RTCONFIG) @Convert(converter = RuntimeConfigurationConverter.class) private RuntimeType configuration; /** * The cluster. */ - @Column(name = "ctx_cluster") + @Column(name = COL_CLUSTER) @Convert(converter = ClusterConverter.class) private Cluster cluster; - + @Override public Cluster getCluster() { return cluster; } - + @Override public RuntimeType getConfiguration() { return configuration; } - + @Override public String getRequestedDomain() { return requestedDomain; } - + @Override public ServerIdentifier getServer() { return toServerIdentifier(); } - + /** * Sets the cluster. - * - * @param cluster - * the cluster to set + * + * @param cluster the cluster to set */ public void setCluster(Cluster cluster) { this.cluster = cluster; } - + /** * Sets the runtime config. - * - * @param configuration - * the configuration to set + * + * @param configuration the configuration to set */ public void setConfiguration(RuntimeType configuration) { this.configuration = configuration; } - + /** * Sets the requested domain. - * - * @param requestedDomain - * the requestedDomain to set + * + * @param requestedDomain the requestedDomain to set */ public void setRequestedDomain(String requestedDomain) { this.requestedDomain = requestedDomain; } - + /** * Sets the server identifier. - * - * @param server - * the server to set + * + * @param server the server to set */ public void setServer(ServerIdentifier server) { this.server = server; @@ -144,10 +144,10 @@ public void setServer(ServerIdentifier server) { serverIp = server.getIpAddress(); } } - + /** * Returns the server identifier based on this given context. - * + * * @return the server identifier */ private ServerIdentifier toServerIdentifier() { @@ -158,7 +158,7 @@ private ServerIdentifier toServerIdentifier() { if (rc.isEmpty()) { return null; } - return null; + return rc; } - + } diff --git a/options/src/main/java/ds2/oss/core/options/internal/OptionValueStageConverter.java b/options/src/main/java/ds2/oss/core/options/internal/OptionValueStageConverter.java index d2676c27..b83b7dd7 100644 --- a/options/src/main/java/ds2/oss/core/options/internal/OptionValueStageConverter.java +++ b/options/src/main/java/ds2/oss/core/options/internal/OptionValueStageConverter.java @@ -15,29 +15,27 @@ */ package ds2.oss.core.options.internal; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; - import ds2.oss.core.api.options.OptionValueStage; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; /** * The option value stage converter. - * + * * @author dstrauss * @version 0.3 - * */ @Converter public class OptionValueStageConverter implements AttributeConverter { - + @Override public Integer convertToDatabaseColumn(OptionValueStage attribute) { return attribute.getStageId(); } - + @Override public OptionValueStage convertToEntityAttribute(Integer dbData) { return OptionValueStage.getById(dbData.intValue()); } - + } diff --git a/options/src/main/java/ds2/oss/core/options/internal/ValueTypeConverter.java b/options/src/main/java/ds2/oss/core/options/internal/ValueTypeConverter.java index 0beb55da..5d28186b 100644 --- a/options/src/main/java/ds2/oss/core/options/internal/ValueTypeConverter.java +++ b/options/src/main/java/ds2/oss/core/options/internal/ValueTypeConverter.java @@ -15,36 +15,35 @@ */ package ds2.oss.core.options.internal; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; - import ds2.oss.core.api.options.ValueType; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; /** * A value type converter. - * + * * @author dstrauss * @version 0.3 */ @Converter public class ValueTypeConverter implements AttributeConverter { - + /* * (non-Javadoc) * @see javax.persistence.AttributeConverter#convertToDatabaseColumn(java.lang.Object) */ @Override public Integer convertToDatabaseColumn(final ValueType attribute) { - return Integer.valueOf(attribute.getNumericalValue()); + return attribute.getNumericalValue(); } - + /* * (non-Javadoc) * @see javax.persistence.AttributeConverter#convertToEntityAttribute(java.lang.Object) */ @Override public ValueType convertToEntityAttribute(final Integer dbData) { - return ValueType.getById(dbData.intValue()); + return ValueType.getById(dbData); } - + } diff --git a/settings.gradle.kts b/settings.gradle.kts index 65ea5087..3d965b42 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -14,9 +14,9 @@ include("interceptors") include("base-it") include("es") include("es-test") -include("options") +//include("options") include("infinispan") -include("options-it") +//include("options-it") include("crypto") include("codec-boon") include("codec-gson") @@ -37,7 +37,7 @@ include("abstracts") include("hazelcast") include("codec-genson") include("owbtest") -include("shiro-jee") +//include("shiro-jee") include("finance") include(":jee:jwt") @@ -47,9 +47,9 @@ project(":interceptors").name = "ds2-oss-core-interceptors" project(":base-it").name = "ds2-oss-core-base-it" project(":es").name = "ds2-oss-core-elasticsearch" project(":es-test").name = "ds2-oss-core-elasticsearch-test" -project(":options").name = "ds2-oss-core-options" +//project(":options").name = "ds2-oss-core-options" project(":infinispan").name = "ds2-oss-core-infinispan" -project(":options-it").name = "ds2-oss-core-options-it" +//project(":options-it").name = "ds2-oss-core-options-it" project(":crypto").name = "ds2-oss-core-crypto" project(":codec-boon").name = "ds2-oss-core-codec-boon" project(":codec-gson").name = "ds2-oss-core-codec-gson" @@ -71,7 +71,7 @@ project(":abstracts").name = "ds2-oss-core-abstracts" project(":hazelcast").name = "ds2-oss-core-grid-hazelcast" project(":codec-genson").name = "ds2-oss-core-codec-genson" project(":owbtest").name = "ds2-oss-core-owb-test" -project(":shiro-jee").name = "ds2-oss-core-shiro-jee" +//project(":shiro-jee").name = "ds2-oss-core-shiro-jee" project(":finance").name = "ds2-oss-core-finance" //enableFeaturePreview("STABLE_PUBLISHING") diff --git a/shiro-jee/src/main/java/ds2/oss/core/crypto/shirojee/impl/CdiEnvCreator.java b/shiro-jee/src/main/java/ds2/oss/core/crypto/shirojee/impl/CdiEnvCreator.java index 63364c1e..a7c25b2b 100644 --- a/shiro-jee/src/main/java/ds2/oss/core/crypto/shirojee/impl/CdiEnvCreator.java +++ b/shiro-jee/src/main/java/ds2/oss/core/crypto/shirojee/impl/CdiEnvCreator.java @@ -21,8 +21,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.inject.Inject; -import javax.servlet.ServletContext; +import jakarta.inject.Inject; +import jakarta.servlet.ServletContext; import java.lang.invoke.MethodHandles; public class CdiEnvCreator extends EnvironmentLoaderListener { diff --git a/testutils/build.gradle b/testutils/build.gradle index 23402a45..c01bbc45 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -1,35 +1,10 @@ description = 'DS/2 OSS Core Test Utils' -//configurations { -// testOutput.extendsFrom(testCompile) -//} - dependencies { implementation project(':ds2-oss-core-api') compileOnly(group: 'jakarta.platform', name: 'jakarta.jakartaee-api', version: '9.1.0') - compileOnly group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.2.4.Final' + compileOnly group: 'org.jboss.weld.se', name: 'weld-se-core', version: '4.0.2.Final' compileOnly group: 'org.testng', name: 'testng', version: '7.4.0' compileOnly(group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32') testImplementation(group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32') } -//test.useTestNG() - -//task packageTests(type: Jar, dependsOn: classes) { -// from sourceSets.main.output -//} -//artifacts.archives packageTests - -//artifacts { -// testOutput packageTests -// archives packageTests -//} -// -//model { -// publishing { -// publications { -// core { -// artifact packageTests -// } -// } -// } -//} diff --git a/testutils/src/main/java/ds2/core/testonly/utils/AbstractInjectionEnvironment.java b/testutils/src/main/java/ds2/core/testonly/utils/AbstractInjectionEnvironment.java index b4aa005d..910f0e5e 100644 --- a/testutils/src/main/java/ds2/core/testonly/utils/AbstractInjectionEnvironment.java +++ b/testutils/src/main/java/ds2/core/testonly/utils/AbstractInjectionEnvironment.java @@ -15,6 +15,7 @@ */ package ds2.core.testonly.utils; +import jakarta.enterprise.util.TypeLiteral; import org.jboss.weld.environment.se.Weld; import org.jboss.weld.environment.se.WeldContainer; import org.slf4j.Logger; @@ -22,11 +23,8 @@ import org.testng.annotations.AfterSuite; import org.testng.annotations.BeforeSuite; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.util.TypeLiteral; import java.lang.annotation.Annotation; import java.lang.invoke.MethodHandles; -import java.util.Set; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @@ -72,7 +70,7 @@ protected T getInstance(final Class c) { LOG.warn("As the weld container is null, no CDI lookup will be done, and I will return null here for {}.", c); return null; } - return wc.instance().select(c).get(); + return wc.select(c).get(); } finally { LOCK.unlock(); } @@ -85,7 +83,7 @@ protected T getInstance(final TypeLiteral c) { LOG.warn("As the weld container is null, no CDI lookup will be done, and I will return null here for {}.", c); return null; } - return wc.instance().select(c).get(); + return wc.select(c).get(); } finally { LOCK.unlock(); } @@ -115,13 +113,7 @@ protected T getInstance(final Class c, final Annotation... annotations) { LOG.warn("As the weld container is null, no CDI lookup will be done, and I will return null here for {}.", c); return null; } - Set> beans = wc.getBeanManager().getBeans(c, annotations); - if (beans != null && !beans.isEmpty()) { - beans.forEach((b) -> { - LOG.debug("Bean is {}", b); - }); - } - return wc.instance().select(c, annotations).get(); + return wc.select(c, annotations).get(); } finally { LOCK.unlock(); } diff --git a/testutils/src/main/java/ds2/core/testonly/utils/TestPathLocationProvider.java b/testutils/src/main/java/ds2/core/testonly/utils/TestPathLocationProvider.java index 95fdcad0..1e3ab4a6 100644 --- a/testutils/src/main/java/ds2/core/testonly/utils/TestPathLocationProvider.java +++ b/testutils/src/main/java/ds2/core/testonly/utils/TestPathLocationProvider.java @@ -15,16 +15,15 @@ */ package ds2.core.testonly.utils; +import ds2.oss.core.api.annotations.PathLocation; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Produces; + import java.nio.file.Path; import java.nio.file.Paths; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Produces; - -import ds2.oss.core.api.annotations.PathLocation; - /** * Dummy provider for the sec path test. * diff --git a/testutils/src/main/java/ds2/core/testonly/utils/TestUtilsProvider.java b/testutils/src/main/java/ds2/core/testonly/utils/TestUtilsProvider.java index 5c99ef94..86b4886f 100644 --- a/testutils/src/main/java/ds2/core/testonly/utils/TestUtilsProvider.java +++ b/testutils/src/main/java/ds2/core/testonly/utils/TestUtilsProvider.java @@ -15,13 +15,13 @@ */ package ds2.core.testonly.utils; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Produces; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Produces; import java.lang.invoke.MethodHandles; import java.util.Random; diff --git a/testutils/src/main/java/ds2/core/testonly/utils/ValueGeneratorImpl.java b/testutils/src/main/java/ds2/core/testonly/utils/ValueGeneratorImpl.java index 7eba245f..56518f0d 100644 --- a/testutils/src/main/java/ds2/core/testonly/utils/ValueGeneratorImpl.java +++ b/testutils/src/main/java/ds2/core/testonly/utils/ValueGeneratorImpl.java @@ -16,11 +16,11 @@ package ds2.core.testonly.utils; import ds2.oss.core.api.ValueGenerator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; import java.lang.invoke.MethodHandles; import java.util.Random; diff --git a/thymeleaf/build.gradle.kts b/thymeleaf/build.gradle.kts index 50547990..297e1f8d 100644 --- a/thymeleaf/build.gradle.kts +++ b/thymeleaf/build.gradle.kts @@ -11,8 +11,8 @@ dependencies { compileOnly("jakarta.platform:jakarta.jakartaee-web-api:8.0.0") testImplementation("org.testng:testng:6.14.3") testImplementation(project(":ds2-oss-core-testutils")) - testCompileOnly("jakarta.platform:jakarta.jakartaee-web-api:8.0.0") - testRuntimeOnly("org.jboss.weld.se", "weld-se-core", "2.4.8.Final") + testCompileOnly("jakarta.platform:jakarta.jakartaee-web-api:9.1.0") + testRuntimeOnly("org.jboss.weld.se", "weld-se-core", "4.0.2.Final") testRuntimeOnly("org.jboss", "jandex", "1.2.0.Beta1") testRuntimeOnly("ch.qos.logback", "logback-classic", logbackVersion) testImplementation(project(":ds2-oss-core-statics")) diff --git a/webtools/src/main/java/ds2/oss/core/webtools/LogbackConfigListener.java b/webtools/src/main/java/ds2/oss/core/webtools/LogbackConfigListener.java index 84e3d9b0..56a978ec 100644 --- a/webtools/src/main/java/ds2/oss/core/webtools/LogbackConfigListener.java +++ b/webtools/src/main/java/ds2/oss/core/webtools/LogbackConfigListener.java @@ -18,8 +18,8 @@ import java.io.IOException; import java.io.InputStream; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +31,7 @@ /** * A listener for logback configs. - * + * * @author dstrauss * @version 0.3 */ @@ -40,7 +40,7 @@ public class LogbackConfigListener implements ServletContextListener { * A logger. */ private static final Logger LOG = LoggerFactory.getLogger(LogbackConfigListener.class); - + /* * (non-Javadoc) * @see @@ -64,7 +64,7 @@ public void contextInitialized(final ServletContextEvent sce) { StatusPrinter.printInCaseOfErrorsOrWarnings(ctx); } } - + /* * (non-Javadoc) * @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent) @@ -73,5 +73,5 @@ public void contextInitialized(final ServletContextEvent sce) { public void contextDestroyed(final ServletContextEvent sce) { // ignored } - + } diff --git a/webtools/src/main/java/ds2/oss/core/webtools/LoggingHttpServletRequestWrapper.java b/webtools/src/main/java/ds2/oss/core/webtools/LoggingHttpServletRequestWrapper.java index 65500909..f9302d53 100644 --- a/webtools/src/main/java/ds2/oss/core/webtools/LoggingHttpServletRequestWrapper.java +++ b/webtools/src/main/java/ds2/oss/core/webtools/LoggingHttpServletRequestWrapper.java @@ -18,16 +18,16 @@ import java.io.BufferedReader; import java.io.IOException; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import ds2.oss.core.webtools.io.LoggingBufferedReader; import ds2.oss.core.webtools.io.LoggingServletInputStream; /** * A wrapper for servlet requets. - * + * * @author dstrauss * @version 0.3 */ @@ -40,10 +40,10 @@ public class LoggingHttpServletRequestWrapper extends HttpServletRequestWrapper * The servlet inputstream to log. */ private LoggingServletInputStream lsis; - + /** * Inits the wrapper. - * + * * @param arg0 * the original servlet request * @throws IOException @@ -52,7 +52,7 @@ public class LoggingHttpServletRequestWrapper extends HttpServletRequestWrapper public LoggingHttpServletRequestWrapper(final HttpServletRequest arg0) throws IOException { super(arg0); } - + @Override public final ServletInputStream getInputStream() throws IOException { if (lsis == null) { @@ -60,13 +60,13 @@ public final ServletInputStream getInputStream() throws IOException { } return lsis; } - + /** * Returns the currently downloaded bytes. The bytes can be in UTF-8, or in any other charset. * It depends on the wrappers being used: if inputstream has been used by the calling entity, we * don't know. If getReader has been used, the returned bytes are UTF-8 bytes. - * - * + * + * * @return the utf-8 bytes, or any other bytes translated so far. */ public final byte[] getLoggedBytes() { @@ -79,7 +79,7 @@ public final byte[] getLoggedBytes() { } return rc; } - + @Override public final BufferedReader getReader() throws IOException { if (lbr == null) { @@ -87,5 +87,5 @@ public final BufferedReader getReader() throws IOException { } return lbr; } - + } diff --git a/webtools/src/main/java/ds2/oss/core/webtools/LoggingHttpServletResponseWrapper.java b/webtools/src/main/java/ds2/oss/core/webtools/LoggingHttpServletResponseWrapper.java index b57849f4..c3de2a49 100644 --- a/webtools/src/main/java/ds2/oss/core/webtools/LoggingHttpServletResponseWrapper.java +++ b/webtools/src/main/java/ds2/oss/core/webtools/LoggingHttpServletResponseWrapper.java @@ -15,21 +15,20 @@ */ package ds2.oss.core.webtools; +import ds2.oss.core.webtools.io.LoggingPrintWriter; +import ds2.oss.core.webtools.io.LoggingServletOutputStream; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; + import java.io.IOException; import java.io.PrintWriter; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; - -import ds2.oss.core.webtools.io.LoggingPrintWriter; -import ds2.oss.core.webtools.io.LoggingServletOutputStream; - /** * A logging response wrapper. - * + * * @author dstrauss * @version 0.3 */ @@ -50,35 +49,34 @@ public class LoggingHttpServletResponseWrapper extends HttpServletResponseWrappe * The http response code. */ private int status = HttpServletResponse.SC_OK; - + /** * Inits the response wrapper. - * - * @param arg0 - * the response object to wrap + * + * @param arg0 the response object to wrap */ public LoggingHttpServletResponseWrapper(final HttpServletResponse arg0) { super(arg0); } - + /** * Returns the logging print writer instance. - * + * * @return the logging print writer, */ public final LoggingPrintWriter getLoggingPrintWriter() { return pw; } - + /** * Returns the null header content. - * + * * @return the null header */ public final String getNullHeader() { return getHeader(null); } - + @Override public final ServletOutputStream getOutputStream() throws IOException { if (lo == null) { @@ -86,30 +84,30 @@ public final ServletOutputStream getOutputStream() throws IOException { } return lo; } - + /** * Returns the buffering servlet output stream. - * + * * @return the sos, or null if not available */ public final LoggingServletOutputStream getSos() { return lo; } - + /** * Returns the status of the http response. - * + * * @return the http status, or 0 if not set */ @Override public final int getStatus() { return status; } - + /** * Calculates the response status from the null header, and returns it. The original status * value will be overridden. - * + * * @return the http response status code */ public final int getStatusViaHeaders() { @@ -123,7 +121,7 @@ public final int getStatusViaHeaders() { } return status; } - + @Override public final PrintWriter getWriter() throws IOException { if (pw == null) { @@ -131,23 +129,23 @@ public final PrintWriter getWriter() throws IOException { } return pw; } - + @Override public final void sendError(final int arg0) throws IOException { super.sendError(arg0); status = arg0; } - + @Override public final void sendError(final int arg0, final String arg1) throws IOException { super.sendError(arg0, arg1); status = arg0; } - + @Override public final void setStatus(final int arg0) { super.setStatus(arg0); status = arg0; } - + } diff --git a/webtools/src/main/java/ds2/oss/core/webtools/Slf4jRequestFilter.java b/webtools/src/main/java/ds2/oss/core/webtools/Slf4jRequestFilter.java index bd8cd971..1a6f75c9 100644 --- a/webtools/src/main/java/ds2/oss/core/webtools/Slf4jRequestFilter.java +++ b/webtools/src/main/java/ds2/oss/core/webtools/Slf4jRequestFilter.java @@ -15,10 +15,10 @@ */ package ds2.oss.core.webtools; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.MDC; -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.security.Principal; diff --git a/webtools/src/main/java/ds2/oss/core/webtools/WrappingServletResponse.java b/webtools/src/main/java/ds2/oss/core/webtools/WrappingServletResponse.java index 430b965d..0e9c1a8b 100644 --- a/webtools/src/main/java/ds2/oss/core/webtools/WrappingServletResponse.java +++ b/webtools/src/main/java/ds2/oss/core/webtools/WrappingServletResponse.java @@ -16,11 +16,11 @@ package ds2.oss.core.webtools; import ds2.oss.core.webtools.io.WrappingServletOutputStream; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; @@ -31,7 +31,7 @@ /** * A wrapping servlet response. - * + * * @author dstrauss * @version 0.4 */ @@ -96,7 +96,7 @@ public class WrappingServletResponse implements HttpServletResponse { * The content length, as long. */ private long contentLengthLong; - + /** * Inits the wrapper. */ @@ -105,40 +105,38 @@ public WrappingServletResponse() { internalOutputStream = new ByteArrayOutputStream(bufferSize); headers = new HashMap<>(); } - + /** * Inits the response wrapper. - * - * @param response - * the httpServletResponse to copy values from + * + * @param response the httpServletResponse to copy values from */ public WrappingServletResponse(final HttpServletResponse response) { this(); fill(response); } - + /** * Inits the response wrapper. - * - * @param response - * the servletResponse to copy values from + * + * @param response the servletResponse to copy values from */ public WrappingServletResponse(final ServletResponse response) { this(); fill(response); } - + @Override public final void addCookie(final Cookie cookie) { cookies.add(cookie); } - + @Override public void addDateHeader(final String name, final long date) { // TODO Auto-generated method stub - + } - + @Override public final void addHeader(final String name, final String value) { if (headers.get(name) == null) { @@ -147,36 +145,31 @@ public final void addHeader(final String name, final String value) { // comma list } } - + @Override public void addIntHeader(final String name, final int value) { // TODO Auto-generated method stub - + } - + @Override public final boolean containsHeader(final String name) { return headers.get(name) != null; } - + /** * Copies all known content types, headers etc. to the given servlet response. Be aware that no * content will be sent (no body). - * - * @param e - * the target response to copy this object data into - * @param allowSendError - * flag to indicate that sendError can be performed - * @param allowSendRedirect - * flag to indicate that sendRedirect can be performed + * + * @param e the target response to copy this object data into + * @param allowSendError flag to indicate that sendError can be performed + * @param allowSendRedirect flag to indicate that sendRedirect can be performed * @return TRUE if content can be sent, otherwise FALSE if the current state is an error or - * redirect state. - * - * @throws IOException - * if an error occurred. + * redirect state. + * @throws IOException if an error occurred. */ public final boolean copyHeadersInto(final HttpServletResponse e, final boolean allowSendError, - final boolean allowSendRedirect) throws IOException { + final boolean allowSendRedirect) throws IOException { if (e.isCommitted()) { LOG.warning("Response already sent, cannot add new values."); return false; @@ -209,10 +202,10 @@ public final boolean copyHeadersInto(final HttpServletResponse e, final boolean } return true; } - + /** * {@inheritDoc} - * + * * @deprecated deprecated */ @SuppressWarnings("deprecation") @@ -221,15 +214,15 @@ public final boolean copyHeadersInto(final HttpServletResponse e, final boolean public final String encodeRedirectUrl(final String url) { return url; } - + @Override public final String encodeRedirectURL(final String url) { return url; } - + /** * {@inheritDoc} - * + * * @deprecated deprecated */ @SuppressWarnings("deprecation") @@ -238,17 +231,16 @@ public final String encodeRedirectURL(final String url) { public final String encodeUrl(final String url) { return url; } - + @Override public final String encodeURL(final String url) { return url; } - + /** * Fills this object with some data from the origin servlet response. - * - * @param origin - * the origin response + * + * @param origin the origin response */ private final void fill(final HttpServletResponse origin) { fill((ServletResponse) origin); @@ -259,12 +251,11 @@ private final void fill(final HttpServletResponse origin) { } } } - + /** * Fills this object with some data. - * - * @param origin - * the origin + * + * @param origin the origin */ private void fill(final ServletResponse origin) { setBufferSize(origin.getBufferSize()); @@ -272,7 +263,7 @@ private void fill(final ServletResponse origin) { setContentType(origin.getContentType()); setCharacterEncoding(origin.getCharacterEncoding()); } - + /** * Finishes the servlet response. Usually called on end of the filter chain. */ @@ -287,9 +278,9 @@ public final void finish() { } catch (final IOException e) { LOG.log(Level.WARNING, "Error when finishing.", e); } - + } - + @Override public final void flushBuffer() throws IOException { LOG.finer("Flushing stream..."); @@ -299,12 +290,12 @@ public final void flushBuffer() throws IOException { internalOutputStream.flush(); } } - + @Override public final int getBufferSize() { return bufferSize; } - + @Override public final String getCharacterEncoding() { if (characterEncoding == null) { @@ -312,66 +303,66 @@ public final String getCharacterEncoding() { } return characterEncoding; } - + /** * Returns the content length, set by the calling entity. - * + * * @return the contentLength */ public final synchronized int getContentLength() { return contentLength; } - + @Override public final String getContentType() { return contentType; } - + /** * Returns all known cookies. - * + * * @return the cookies */ public final synchronized Set getCookies() { return cookies; } - + /** * Returns the error message. - * + * * @return the errorMsg */ public final synchronized String getErrorMsg() { return errorMsg; } - + @Override public final String getHeader(final String arg0) { return headers.get(arg0); } - + @Override public final Collection getHeaderNames() { return headers.keySet(); } - + /** * Returns the current headers. - * + * * @return the headers */ public final synchronized Map getHeaders() { return headers; } - + @Override public final Collection getHeaders(final String arg0) { return null; } - + /** * Returns the bytes. - * + * * @return the written bytes */ public final byte[] getInternalOutputBytes() { @@ -384,21 +375,21 @@ public final byte[] getInternalOutputBytes() { } return null; } - + /** * Returns the internal output stream. - * + * * @return the internalOutputStream */ public final synchronized ByteArrayOutputStream getInternalOutputStream() { return internalOutputStream; } - + @Override public final Locale getLocale() { return locale; } - + @Override public final ServletOutputStream getOutputStream() throws IOException { if (writer != null) { @@ -409,21 +400,21 @@ public final ServletOutputStream getOutputStream() throws IOException { } return outputStream; } - + /** * Returns the sendRedirect location. - * + * * @return the redirectTo location */ public final synchronized String getRedirectTo() { return redirectTo; } - + @Override public final int getStatus() { return status; } - + @Override public final PrintWriter getWriter() throws IOException { if (outputStream != null) { @@ -435,40 +426,40 @@ public final PrintWriter getWriter() throws IOException { } return writer; } - + @Override public final boolean isCommitted() { return false; } - + @Override public final void reset() { resetBuffer(); headers.clear(); cookies.clear(); } - + @Override public final void resetBuffer() { internalOutputStream.reset(); } - + @Override public final void sendError(final int sc) throws IOException { status = sc; } - + @Override public final void sendError(final int sc, final String msg) throws IOException { status = sc; errorMsg = msg; } - + @Override public final void sendRedirect(final String location) throws IOException { redirectTo = location; } - + @Override public final void setBufferSize(final int size) { if ((writer != null) || (outputStream != null)) { @@ -480,7 +471,7 @@ public final void setBufferSize(final int size) { bufferSize = size; internalOutputStream = new ByteArrayOutputStream(bufferSize); } - + @Override public final void setCharacterEncoding(final String charset) { if ((writer != null) || (charset == null)) { @@ -491,47 +482,47 @@ public final void setCharacterEncoding(final String charset) { // add ;charset= sequence } } - + @Override public final void setContentLength(final int len) { contentLength = len; } - + @Override public final void setContentType(final String type) { contentType = type; } - + @Override public void setDateHeader(final String name, final long date) { // TODO Auto-generated method stub - + } - + @Override public final void setHeader(final String name, final String value) { headers.put(name, value); } - + @Override public final void setIntHeader(final String name, final int value) { headers.put(name, "" + value); } - + @Override public final void setLocale(final Locale loc) { locale = loc; // get charset from locale } - + @Override public final void setStatus(final int sc) { status = sc; } - + /** * {@inheritDoc} - * + * * @deprecated deprecated */ @SuppressWarnings("deprecation") @@ -541,7 +532,7 @@ public final void setStatus(final int sc, final String sm) { status = sc; errorMsg = sm; } - + @Override public final String toString() { final StringBuilder builder = new StringBuilder(); @@ -571,14 +562,12 @@ public final String toString() { builder.append("status=").append(status).append(")"); return builder.toString(); } - + /** * Writes the current state of this response object into a given response object. - * - * @param response - * the response to copy values to - * @throws IOException - * if an error occurred + * + * @param response the response to copy values to + * @throws IOException if an error occurred */ public final void writeResponse(final HttpServletResponse response) throws IOException { copyHeadersInto(response, true, true); @@ -587,7 +576,7 @@ public final void writeResponse(final HttpServletResponse response) throws IOExc response.getOutputStream().write(bytes); } } - + @Override public void setContentLengthLong(final long len) { contentLengthLong = len; diff --git a/webtools/src/main/java/ds2/oss/core/webtools/io/LoggingServletInputStream.java b/webtools/src/main/java/ds2/oss/core/webtools/io/LoggingServletInputStream.java index 34ae8bbe..ad675c13 100644 --- a/webtools/src/main/java/ds2/oss/core/webtools/io/LoggingServletInputStream.java +++ b/webtools/src/main/java/ds2/oss/core/webtools/io/LoggingServletInputStream.java @@ -15,14 +15,14 @@ */ package ds2.oss.core.webtools.io; -import java.io.IOException; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletInputStream; -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; +import java.io.IOException; /** * A logging servlet input stream. - * + * * @author dstrauss * @version 0.3 */ @@ -31,62 +31,61 @@ public class LoggingServletInputStream extends ServletInputStream { * The lIS. */ private LoggingInputStream lis; - + /** * inits the LSIS. - * - * @param orig - * the SIS + * + * @param orig the SIS */ public LoggingServletInputStream(final ServletInputStream orig) { lis = new LoggingInputStream<>(orig); } - + @Override public final int available() throws IOException { return lis.available(); } - + @Override public final void close() throws IOException { lis.close(); } - + /** * Returns the currently logged bytes. - * + * * @return the logged bytes. */ public final byte[] getBufferedBytes() { return lis.getLoggedBytes(); } - + @Override public final synchronized void mark(final int readlimit) { lis.mark(readlimit); } - + @Override public final boolean markSupported() { return lis.markSupported(); } - + @Override public final int read() throws IOException { final int rc = lis.read(); return rc; } - + @Override public final int read(final byte[] b) throws IOException { return lis.read(b); } - + @Override public final int read(final byte[] b, final int off, final int len) throws IOException { return lis.read(b, off, len); } - + @Override public final int readLine(final byte[] arg0, final int arg1, final int arg2) throws IOException { final int rc = lis.getOriginal().readLine(arg0, arg1, arg2); @@ -95,30 +94,30 @@ public final int readLine(final byte[] arg0, final int arg1, final int arg2) thr } return rc; } - + @Override public final synchronized void reset() throws IOException { lis.reset(); } - + @Override public final long skip(final long n) throws IOException { return lis.skip(n); } - + @Override public boolean isFinished() { return lis.getOriginal().isFinished(); } - + @Override public boolean isReady() { return lis.getOriginal().isReady(); } - + @Override public void setReadListener(final ReadListener readListener) { lis.getOriginal().setReadListener(readListener); } - + } diff --git a/webtools/src/main/java/ds2/oss/core/webtools/io/LoggingServletOutputStream.java b/webtools/src/main/java/ds2/oss/core/webtools/io/LoggingServletOutputStream.java index 4934886d..710e0dc2 100644 --- a/webtools/src/main/java/ds2/oss/core/webtools/io/LoggingServletOutputStream.java +++ b/webtools/src/main/java/ds2/oss/core/webtools/io/LoggingServletOutputStream.java @@ -15,14 +15,14 @@ */ package ds2.oss.core.webtools.io; -import java.io.IOException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.WriteListener; -import javax.servlet.ServletOutputStream; -import javax.servlet.WriteListener; +import java.io.IOException; /** * A logger for a servlet output stream. - * + * * @author dstrauss * @version 0.3 */ @@ -31,42 +31,41 @@ public class LoggingServletOutputStream extends ServletOutputStream { * The logging OS. */ private LoggingOutputStream lsos; - + /** * Inits the logging SOS. - * - * @param e - * the original SOS to wrap + * + * @param e the original SOS to wrap */ public LoggingServletOutputStream(final ServletOutputStream e) { super(); lsos = new LoggingOutputStream<>(e); } - + @Override public final void write(final int b) throws IOException { lsos.write(b); } - + @Override public final void close() throws IOException { lsos.close(); } - + /** * Returns the buffering output stream that is used by this SOS. - * + * * @return the buffered OS */ public final LoggingOutputStream getBufferedOutputStream() { return lsos; } - + @Override public boolean isReady() { return lsos.getOriginal().isReady(); } - + @Override public void setWriteListener(final WriteListener writeListener) { lsos.getOriginal().setWriteListener(writeListener); diff --git a/webtools/src/main/java/ds2/oss/core/webtools/io/WrappingServletOutputStream.java b/webtools/src/main/java/ds2/oss/core/webtools/io/WrappingServletOutputStream.java index bf783d92..a838026b 100644 --- a/webtools/src/main/java/ds2/oss/core/webtools/io/WrappingServletOutputStream.java +++ b/webtools/src/main/java/ds2/oss/core/webtools/io/WrappingServletOutputStream.java @@ -15,16 +15,16 @@ */ package ds2.oss.core.webtools.io; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.WriteListener; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; -import javax.servlet.ServletOutputStream; -import javax.servlet.WriteListener; - /** * A wrapping SOS. - * + * * @author dstrauss * @version 0.3 */ @@ -33,33 +33,32 @@ public class WrappingServletOutputStream extends ServletOutputStream { * The output stream to use. */ private OutputStream os; - + /** * Inits the wsos. */ public WrappingServletOutputStream() { this(new ByteArrayOutputStream()); } - + /** * Inits the wsos. - * - * @param o - * the output stream to use + * + * @param o the output stream to use */ public WrappingServletOutputStream(final OutputStream o) { os = o; } - + /** * Returns the output stream that was used on construction. - * + * * @return the output stream */ public final OutputStream getOutputStream() { return os; } - + /** * {@inheritDoc} */ @@ -67,15 +66,15 @@ public final OutputStream getOutputStream() { public final void write(final int b) throws IOException { os.write(b); } - + @Override public boolean isReady() { return true; } - + @Override public void setWriteListener(final WriteListener writeListener) { // ignored } - + } diff --git a/xmpp/build.gradle b/xmpp/build.gradle index f86aafcb..c9042025 100644 --- a/xmpp/build.gradle +++ b/xmpp/build.gradle @@ -6,7 +6,7 @@ dependencies { testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: project.ext.logbackVersion //testImplementation group: 'ch.qos.logback', name: 'logback-core', version: project.ext.logback testImplementation group: 'org.testng', name: 'testng', version: '7.4.0' - testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.2.4.Final' + testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '4.0.2.Final' testImplementation project(':ds2-oss-core-xmpp-gcm') testImplementation project(path: ':ds2-oss-core-testutils') compileOnly 'org.slf4j:slf4j-api:1.7.32' From 659157f5e1e32ef8f676b64c14bc376f540a14a8 Mon Sep 17 00:00:00 2001 From: Dirk <472167-dstrauss@users.noreply.gitlab.com> Date: Mon, 14 Feb 2022 10:46:38 +0100 Subject: [PATCH 4/4] CORE-000: add repo --- settings.gradle.kts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/settings.gradle.kts b/settings.gradle.kts index 3d965b42..23886c98 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,6 +4,9 @@ pluginManagement { mavenLocal() gradlePluginPortal() mavenCentral() + maven { + url=uri("https://ds2.jfrog.io/artifactory/oss-releases") + } } }