From c48577544a7da16718e611423680eaaf8597aa73 Mon Sep 17 00:00:00 2001 From: siujamo Date: Tue, 17 Jun 2025 17:40:21 +0800 Subject: [PATCH] refactor: rename modules Closes #75 --- .../utils => common/util}/AesUtil.java | 2 +- .../utils => common/util}/Base64Util.java | 4 ++-- .../utils => common/util}/BoolUtil.java | 2 +- .../utils => common/util}/BranchUtil.java | 2 +- .../utils => common/util}/CollectionUtil.java | 2 +- .../utils => common/util}/HashUtil.java | 2 +- .../utils => common/util}/MapUtil.java | 2 +- .../util}/ObjectMapAdapter.java | 2 +- .../utils => common/util}/RangeUtil.java | 2 +- .../utils => common/util}/AesUtilTest.java | 2 +- .../utils => common/util}/Base64UtilTest.java | 5 +---- .../utils => common/util}/BoolUtilTest.java | 2 +- .../utils => common/util}/BranchUtilTest.java | 2 +- .../util}/CollectionUtilTest.java | 2 +- .../utils => common/util}/HashUtilTest.java | 2 +- .../utils => common/util}/RangeUtilTest.java | 2 +- identity-generator/build.gradle.kts | 10 ++++----- jwt-toolbox-auth0/README.md | 2 +- jwt-toolbox-auth0/build.gradle.kts | 10 ++++----- .../auth0}/AuthzeroTokenResolver.java | 22 +++++++++---------- .../test/TestAuthzeroTokenResolver.java | 8 +------ jwt-toolbox-facade/build.gradle.kts | 10 ++++----- .../{simplejwt => jwt}/SecretCreator.java | 4 ++-- .../{simplejwt => jwt}/TokenPayload.java | 2 +- .../{simplejwt => jwt}/TokenResolver.java | 2 +- .../annotations/ExcludeFromPayload.java | 2 +- .../annotations/TokenEnum.java | 4 ++-- .../constants/PredefinedKeys.java | 2 +- .../constants/TokenAlgorithm.java | 2 +- .../constants/TokenDataType.java | 2 +- .../exceptions/IllegalKeyPairException.java | 2 +- .../exceptions/IllegalSecretException.java | 2 +- .../UnsupportedAlgorithmException.java | 4 ++-- .../exceptions/WeakSecretException.java | 2 +- .../build.gradle.kts | 10 ++++----- ...uthzeroTokenResolverAutoConfiguration.java | 10 ++++----- .../GuidAutoConfiguration.java | 4 ++-- .../conditions/GuidCreatorCondition.java | 2 +- .../properties/SimpleJwtProperties.java | 8 +++---- ...ot.autoconfigure.AutoConfiguration.imports | 4 ++-- math-toolbox/build.gradle.kts | 10 ++++----- .../{nums => math}/ChainedCalcUtil.java | 2 +- .../{nums => math}/PercentileCalculator.java | 4 ++-- .../{nums => math}/model/QuartileBounds.java | 2 +- version-catalogue/build.gradle.kts | 6 ++--- 45 files changed, 91 insertions(+), 100 deletions(-) rename common-toolbox/src/main/java/com/onixbyte/{devkit/utils => common/util}/AesUtil.java (99%) rename common-toolbox/src/main/java/com/onixbyte/{devkit/utils => common/util}/Base64Util.java (99%) rename common-toolbox/src/main/java/com/onixbyte/{devkit/utils => common/util}/BoolUtil.java (98%) rename common-toolbox/src/main/java/com/onixbyte/{devkit/utils => common/util}/BranchUtil.java (99%) rename common-toolbox/src/main/java/com/onixbyte/{devkit/utils => common/util}/CollectionUtil.java (99%) rename common-toolbox/src/main/java/com/onixbyte/{devkit/utils => common/util}/HashUtil.java (99%) rename common-toolbox/src/main/java/com/onixbyte/{devkit/utils => common/util}/MapUtil.java (99%) rename common-toolbox/src/main/java/com/onixbyte/{devkit/utils => common/util}/ObjectMapAdapter.java (98%) rename common-toolbox/src/main/java/com/onixbyte/{devkit/utils => common/util}/RangeUtil.java (99%) rename common-toolbox/src/test/java/com/onixbyte/{devkit/utils => common/util}/AesUtilTest.java (98%) rename common-toolbox/src/test/java/com/onixbyte/{devkit/utils => common/util}/Base64UtilTest.java (96%) rename common-toolbox/src/test/java/com/onixbyte/{devkit/utils => common/util}/BoolUtilTest.java (99%) rename common-toolbox/src/test/java/com/onixbyte/{devkit/utils => common/util}/BranchUtilTest.java (99%) rename common-toolbox/src/test/java/com/onixbyte/{devkit/utils => common/util}/CollectionUtilTest.java (99%) rename common-toolbox/src/test/java/com/onixbyte/{devkit/utils => common/util}/HashUtilTest.java (99%) rename common-toolbox/src/test/java/com/onixbyte/{devkit/utils => common/util}/RangeUtilTest.java (99%) rename jwt-toolbox-auth0/src/main/java/com/onixbyte/{simplejwt/authzero => jwt/auth0}/AuthzeroTokenResolver.java (97%) rename jwt-toolbox-auth0/src/test/java/com/onixbyte/{simplejwt/authzero => jwt/auth0}/test/TestAuthzeroTokenResolver.java (75%) rename jwt-toolbox-facade/src/main/java/com/onixbyte/{simplejwt => jwt}/SecretCreator.java (98%) rename jwt-toolbox-facade/src/main/java/com/onixbyte/{simplejwt => jwt}/TokenPayload.java (97%) rename jwt-toolbox-facade/src/main/java/com/onixbyte/{simplejwt => jwt}/TokenResolver.java (99%) rename jwt-toolbox-facade/src/main/java/com/onixbyte/{simplejwt => jwt}/annotations/ExcludeFromPayload.java (97%) rename jwt-toolbox-facade/src/main/java/com/onixbyte/{simplejwt => jwt}/annotations/TokenEnum.java (93%) rename jwt-toolbox-facade/src/main/java/com/onixbyte/{simplejwt => jwt}/constants/PredefinedKeys.java (98%) rename jwt-toolbox-facade/src/main/java/com/onixbyte/{simplejwt => jwt}/constants/TokenAlgorithm.java (98%) rename jwt-toolbox-facade/src/main/java/com/onixbyte/{simplejwt => jwt}/constants/TokenDataType.java (97%) rename jwt-toolbox-facade/src/main/java/com/onixbyte/{simplejwt => jwt}/exceptions/IllegalKeyPairException.java (97%) rename jwt-toolbox-facade/src/main/java/com/onixbyte/{simplejwt => jwt}/exceptions/IllegalSecretException.java (97%) rename jwt-toolbox-facade/src/main/java/com/onixbyte/{simplejwt => jwt}/exceptions/UnsupportedAlgorithmException.java (97%) rename jwt-toolbox-facade/src/main/java/com/onixbyte/{simplejwt => jwt}/exceptions/WeakSecretException.java (98%) rename jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/{simplejwt => jwt}/autoconfiguration/AuthzeroTokenResolverAutoConfiguration.java (94%) rename jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/{simplejwt => jwt}/autoconfiguration/GuidAutoConfiguration.java (92%) rename jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/{simplejwt => jwt}/autoconfiguration/conditions/GuidCreatorCondition.java (97%) rename jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/{simplejwt => jwt}/autoconfiguration/properties/SimpleJwtProperties.java (94%) rename math-toolbox/src/main/java/com/onixbyte/{nums => math}/ChainedCalcUtil.java (99%) rename math-toolbox/src/main/java/com/onixbyte/{nums => math}/PercentileCalculator.java (98%) rename math-toolbox/src/main/java/com/onixbyte/{nums => math}/model/QuartileBounds.java (99%) diff --git a/common-toolbox/src/main/java/com/onixbyte/devkit/utils/AesUtil.java b/common-toolbox/src/main/java/com/onixbyte/common/util/AesUtil.java similarity index 99% rename from common-toolbox/src/main/java/com/onixbyte/devkit/utils/AesUtil.java rename to common-toolbox/src/main/java/com/onixbyte/common/util/AesUtil.java index 00619a3..65b02a9 100644 --- a/common-toolbox/src/main/java/com/onixbyte/devkit/utils/AesUtil.java +++ b/common-toolbox/src/main/java/com/onixbyte/common/util/AesUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.devkit.utils; +package com.onixbyte.common.util; import javax.crypto.Cipher; import javax.crypto.spec.IvParameterSpec; diff --git a/common-toolbox/src/main/java/com/onixbyte/devkit/utils/Base64Util.java b/common-toolbox/src/main/java/com/onixbyte/common/util/Base64Util.java similarity index 99% rename from common-toolbox/src/main/java/com/onixbyte/devkit/utils/Base64Util.java rename to common-toolbox/src/main/java/com/onixbyte/common/util/Base64Util.java index 93d0347..51084d9 100644 --- a/common-toolbox/src/main/java/com/onixbyte/devkit/utils/Base64Util.java +++ b/common-toolbox/src/main/java/com/onixbyte/common/util/Base64Util.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.devkit.utils; +package com.onixbyte.common.util; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; @@ -209,4 +209,4 @@ public final class Base64Util { private static Base64.Decoder urlDecoder; -} \ No newline at end of file +} diff --git a/common-toolbox/src/main/java/com/onixbyte/devkit/utils/BoolUtil.java b/common-toolbox/src/main/java/com/onixbyte/common/util/BoolUtil.java similarity index 98% rename from common-toolbox/src/main/java/com/onixbyte/devkit/utils/BoolUtil.java rename to common-toolbox/src/main/java/com/onixbyte/common/util/BoolUtil.java index 4bf81da..858b750 100644 --- a/common-toolbox/src/main/java/com/onixbyte/devkit/utils/BoolUtil.java +++ b/common-toolbox/src/main/java/com/onixbyte/common/util/BoolUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.devkit.utils; +package com.onixbyte.common.util; import java.util.Arrays; import java.util.Objects; diff --git a/common-toolbox/src/main/java/com/onixbyte/devkit/utils/BranchUtil.java b/common-toolbox/src/main/java/com/onixbyte/common/util/BranchUtil.java similarity index 99% rename from common-toolbox/src/main/java/com/onixbyte/devkit/utils/BranchUtil.java rename to common-toolbox/src/main/java/com/onixbyte/common/util/BranchUtil.java index f493a70..a2c9ca8 100644 --- a/common-toolbox/src/main/java/com/onixbyte/devkit/utils/BranchUtil.java +++ b/common-toolbox/src/main/java/com/onixbyte/common/util/BranchUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.devkit.utils; +package com.onixbyte.common.util; import java.util.Objects; import java.util.function.BooleanSupplier; diff --git a/common-toolbox/src/main/java/com/onixbyte/devkit/utils/CollectionUtil.java b/common-toolbox/src/main/java/com/onixbyte/common/util/CollectionUtil.java similarity index 99% rename from common-toolbox/src/main/java/com/onixbyte/devkit/utils/CollectionUtil.java rename to common-toolbox/src/main/java/com/onixbyte/common/util/CollectionUtil.java index fd4534a..3a72dd9 100644 --- a/common-toolbox/src/main/java/com/onixbyte/devkit/utils/CollectionUtil.java +++ b/common-toolbox/src/main/java/com/onixbyte/common/util/CollectionUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.devkit.utils; +package com.onixbyte.common.util; import java.util.ArrayList; import java.util.Collection; diff --git a/common-toolbox/src/main/java/com/onixbyte/devkit/utils/HashUtil.java b/common-toolbox/src/main/java/com/onixbyte/common/util/HashUtil.java similarity index 99% rename from common-toolbox/src/main/java/com/onixbyte/devkit/utils/HashUtil.java rename to common-toolbox/src/main/java/com/onixbyte/common/util/HashUtil.java index 8fa7156..168729a 100644 --- a/common-toolbox/src/main/java/com/onixbyte/devkit/utils/HashUtil.java +++ b/common-toolbox/src/main/java/com/onixbyte/common/util/HashUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.devkit.utils; +package com.onixbyte.common.util; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; diff --git a/common-toolbox/src/main/java/com/onixbyte/devkit/utils/MapUtil.java b/common-toolbox/src/main/java/com/onixbyte/common/util/MapUtil.java similarity index 99% rename from common-toolbox/src/main/java/com/onixbyte/devkit/utils/MapUtil.java rename to common-toolbox/src/main/java/com/onixbyte/common/util/MapUtil.java index 4fa5d78..80dec76 100644 --- a/common-toolbox/src/main/java/com/onixbyte/devkit/utils/MapUtil.java +++ b/common-toolbox/src/main/java/com/onixbyte/common/util/MapUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.devkit.utils; +package com.onixbyte.common.util; import java.util.Map; diff --git a/common-toolbox/src/main/java/com/onixbyte/devkit/utils/ObjectMapAdapter.java b/common-toolbox/src/main/java/com/onixbyte/common/util/ObjectMapAdapter.java similarity index 98% rename from common-toolbox/src/main/java/com/onixbyte/devkit/utils/ObjectMapAdapter.java rename to common-toolbox/src/main/java/com/onixbyte/common/util/ObjectMapAdapter.java index 9dde1ff..5e7314a 100644 --- a/common-toolbox/src/main/java/com/onixbyte/devkit/utils/ObjectMapAdapter.java +++ b/common-toolbox/src/main/java/com/onixbyte/common/util/ObjectMapAdapter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.devkit.utils; +package com.onixbyte.common.util; import java.util.Map; diff --git a/common-toolbox/src/main/java/com/onixbyte/devkit/utils/RangeUtil.java b/common-toolbox/src/main/java/com/onixbyte/common/util/RangeUtil.java similarity index 99% rename from common-toolbox/src/main/java/com/onixbyte/devkit/utils/RangeUtil.java rename to common-toolbox/src/main/java/com/onixbyte/common/util/RangeUtil.java index 2437e8b..d7ca49c 100644 --- a/common-toolbox/src/main/java/com/onixbyte/devkit/utils/RangeUtil.java +++ b/common-toolbox/src/main/java/com/onixbyte/common/util/RangeUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.devkit.utils; +package com.onixbyte.common.util; import java.util.stream.IntStream; diff --git a/common-toolbox/src/test/java/com/onixbyte/devkit/utils/AesUtilTest.java b/common-toolbox/src/test/java/com/onixbyte/common/util/AesUtilTest.java similarity index 98% rename from common-toolbox/src/test/java/com/onixbyte/devkit/utils/AesUtilTest.java rename to common-toolbox/src/test/java/com/onixbyte/common/util/AesUtilTest.java index c8390d1..2e69401 100644 --- a/common-toolbox/src/test/java/com/onixbyte/devkit/utils/AesUtilTest.java +++ b/common-toolbox/src/test/java/com/onixbyte/common/util/AesUtilTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.devkit.utils; +package com.onixbyte.common.util; import org.junit.jupiter.api.Test; diff --git a/common-toolbox/src/test/java/com/onixbyte/devkit/utils/Base64UtilTest.java b/common-toolbox/src/test/java/com/onixbyte/common/util/Base64UtilTest.java similarity index 96% rename from common-toolbox/src/test/java/com/onixbyte/devkit/utils/Base64UtilTest.java rename to common-toolbox/src/test/java/com/onixbyte/common/util/Base64UtilTest.java index aec54fb..732b4c1 100644 --- a/common-toolbox/src/test/java/com/onixbyte/devkit/utils/Base64UtilTest.java +++ b/common-toolbox/src/test/java/com/onixbyte/common/util/Base64UtilTest.java @@ -15,12 +15,9 @@ * limitations under the License. */ -package com.onixbyte.devkit.utils; +package com.onixbyte.common.util; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.nio.charset.StandardCharsets; diff --git a/common-toolbox/src/test/java/com/onixbyte/devkit/utils/BoolUtilTest.java b/common-toolbox/src/test/java/com/onixbyte/common/util/BoolUtilTest.java similarity index 99% rename from common-toolbox/src/test/java/com/onixbyte/devkit/utils/BoolUtilTest.java rename to common-toolbox/src/test/java/com/onixbyte/common/util/BoolUtilTest.java index 23d38de..f6302b5 100644 --- a/common-toolbox/src/test/java/com/onixbyte/devkit/utils/BoolUtilTest.java +++ b/common-toolbox/src/test/java/com/onixbyte/common/util/BoolUtilTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.devkit.utils; +package com.onixbyte.common.util; import org.junit.jupiter.api.Test; diff --git a/common-toolbox/src/test/java/com/onixbyte/devkit/utils/BranchUtilTest.java b/common-toolbox/src/test/java/com/onixbyte/common/util/BranchUtilTest.java similarity index 99% rename from common-toolbox/src/test/java/com/onixbyte/devkit/utils/BranchUtilTest.java rename to common-toolbox/src/test/java/com/onixbyte/common/util/BranchUtilTest.java index 05a2f14..f90f058 100644 --- a/common-toolbox/src/test/java/com/onixbyte/devkit/utils/BranchUtilTest.java +++ b/common-toolbox/src/test/java/com/onixbyte/common/util/BranchUtilTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.devkit.utils; +package com.onixbyte.common.util; import org.junit.jupiter.api.Test; diff --git a/common-toolbox/src/test/java/com/onixbyte/devkit/utils/CollectionUtilTest.java b/common-toolbox/src/test/java/com/onixbyte/common/util/CollectionUtilTest.java similarity index 99% rename from common-toolbox/src/test/java/com/onixbyte/devkit/utils/CollectionUtilTest.java rename to common-toolbox/src/test/java/com/onixbyte/common/util/CollectionUtilTest.java index 4c7f197..7807753 100644 --- a/common-toolbox/src/test/java/com/onixbyte/devkit/utils/CollectionUtilTest.java +++ b/common-toolbox/src/test/java/com/onixbyte/common/util/CollectionUtilTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.devkit.utils; +package com.onixbyte.common.util; import org.junit.jupiter.api.Test; diff --git a/common-toolbox/src/test/java/com/onixbyte/devkit/utils/HashUtilTest.java b/common-toolbox/src/test/java/com/onixbyte/common/util/HashUtilTest.java similarity index 99% rename from common-toolbox/src/test/java/com/onixbyte/devkit/utils/HashUtilTest.java rename to common-toolbox/src/test/java/com/onixbyte/common/util/HashUtilTest.java index 6b9cb6b..9bb1fef 100644 --- a/common-toolbox/src/test/java/com/onixbyte/devkit/utils/HashUtilTest.java +++ b/common-toolbox/src/test/java/com/onixbyte/common/util/HashUtilTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.devkit.utils; +package com.onixbyte.common.util; import org.junit.jupiter.api.Test; diff --git a/common-toolbox/src/test/java/com/onixbyte/devkit/utils/RangeUtilTest.java b/common-toolbox/src/test/java/com/onixbyte/common/util/RangeUtilTest.java similarity index 99% rename from common-toolbox/src/test/java/com/onixbyte/devkit/utils/RangeUtilTest.java rename to common-toolbox/src/test/java/com/onixbyte/common/util/RangeUtilTest.java index 13db7fb..a53ed6d 100644 --- a/common-toolbox/src/test/java/com/onixbyte/devkit/utils/RangeUtilTest.java +++ b/common-toolbox/src/test/java/com/onixbyte/common/util/RangeUtilTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.devkit.utils; +package com.onixbyte.common.util; import org.junit.jupiter.api.Test; diff --git a/identity-generator/build.gradle.kts b/identity-generator/build.gradle.kts index 83f970b..8821412 100644 --- a/identity-generator/build.gradle.kts +++ b/identity-generator/build.gradle.kts @@ -64,13 +64,13 @@ tasks.test { publishing { publications { - create("guid") { + create("identityGenerator") { groupId = group.toString() - artifactId = "guid" + artifactId = "identity-generator" version = artefactVersion pom { - name = "DevKit - GUID" + name = "OnixByte Identity Generator" description = "The module for generating GUIDs of JDevKit." url = projectUrl @@ -107,7 +107,7 @@ publishing { from(components["java"]) signing { - sign(publishing.publications["guid"]) + sign(publishing.publications["identityGenerator"]) } } @@ -122,4 +122,4 @@ publishing { } } } -} \ No newline at end of file +} diff --git a/jwt-toolbox-auth0/README.md b/jwt-toolbox-auth0/README.md index fbebcda..ee055b3 100644 --- a/jwt-toolbox-auth0/README.md +++ b/jwt-toolbox-auth0/README.md @@ -50,7 +50,7 @@ implementation 'cn.org.codecrafters:simple-jwt-authzero:${simple-jwt-authzero.ve ## Use the `AuthzeroTokenResolver` -We have implemented `TokenResolver` to make sure you can add JWT to your Java application as soon as possible. All you need to do is to create an instance of `com.onixbyte.simplejwt.authzero.AuthzeroTokenResolver` and other operations to JWT could follow our instruction in [`simple-jwt-facade`](../simple-jwt-facade/README.md). +We have implemented `TokenResolver` to make sure you can add JWT to your Java application as soon as possible. All you need to do is to create an instance of `com.onixbyte.jwt.auth0.AuthzeroTokenResolver` and other operations to JWT could follow our instruction in [`simple-jwt-facade`](../simple-jwt-facade/README.md). ## Contact diff --git a/jwt-toolbox-auth0/build.gradle.kts b/jwt-toolbox-auth0/build.gradle.kts index fc4d453..91c2151 100644 --- a/jwt-toolbox-auth0/build.gradle.kts +++ b/jwt-toolbox-auth0/build.gradle.kts @@ -72,13 +72,13 @@ tasks.test { publishing { publications { - create("simpleJwtAuthzero") { + create("jwtToolboxAuth0") { groupId = group.toString() - artifactId = "simple-jwt-authzero" + artifactId = "jwt-toolbox-auth0" version = artefactVersion pom { - name = "Simple JWT :: Auth0" + name = "OnixByte JWT Toolbox :: Auth0" description = "Simple JWT implemented with com.auth0:java-jwt." url = projectUrl @@ -115,7 +115,7 @@ publishing { from(components["java"]) signing { - sign(publishing.publications["simpleJwtAuthzero"]) + sign(publishing.publications["jwtToolboxAuth0"]) } } @@ -130,4 +130,4 @@ publishing { } } } -} \ No newline at end of file +} diff --git a/jwt-toolbox-auth0/src/main/java/com/onixbyte/simplejwt/authzero/AuthzeroTokenResolver.java b/jwt-toolbox-auth0/src/main/java/com/onixbyte/jwt/auth0/AuthzeroTokenResolver.java similarity index 97% rename from jwt-toolbox-auth0/src/main/java/com/onixbyte/simplejwt/authzero/AuthzeroTokenResolver.java rename to jwt-toolbox-auth0/src/main/java/com/onixbyte/jwt/auth0/AuthzeroTokenResolver.java index 5afd00c..b6e6206 100644 --- a/jwt-toolbox-auth0/src/main/java/com/onixbyte/simplejwt/authzero/AuthzeroTokenResolver.java +++ b/jwt-toolbox-auth0/src/main/java/com/onixbyte/jwt/auth0/AuthzeroTokenResolver.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.onixbyte.simplejwt.authzero; +package com.onixbyte.jwt.auth0; +import com.onixbyte.common.util.Base64Util; import com.onixbyte.crypto.algorithm.ecdsa.ECPrivateKeyLoader; -import com.onixbyte.devkit.utils.Base64Util; import com.onixbyte.identitygenerator.IdentityGenerator; -import com.onixbyte.simplejwt.TokenPayload; -import com.onixbyte.simplejwt.TokenResolver; -import com.onixbyte.simplejwt.annotations.ExcludeFromPayload; -import com.onixbyte.simplejwt.annotations.TokenEnum; -import com.onixbyte.simplejwt.constants.PredefinedKeys; -import com.onixbyte.simplejwt.constants.TokenAlgorithm; +import com.onixbyte.jwt.TokenPayload; +import com.onixbyte.jwt.TokenResolver; +import com.onixbyte.jwt.annotations.ExcludeFromPayload; +import com.onixbyte.jwt.annotations.TokenEnum; +import com.onixbyte.jwt.constants.PredefinedKeys; +import com.onixbyte.jwt.constants.TokenAlgorithm; import com.auth0.jwt.JWT; import com.auth0.jwt.JWTCreator; import com.auth0.jwt.algorithms.Algorithm; @@ -35,9 +35,9 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.onixbyte.simplejwt.exceptions.IllegalKeyPairException; -import com.onixbyte.simplejwt.exceptions.IllegalSecretException; -import com.onixbyte.simplejwt.exceptions.UnsupportedAlgorithmException; +import com.onixbyte.jwt.exceptions.IllegalKeyPairException; +import com.onixbyte.jwt.exceptions.IllegalSecretException; +import com.onixbyte.jwt.exceptions.UnsupportedAlgorithmException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jwt-toolbox-auth0/src/test/java/com/onixbyte/simplejwt/authzero/test/TestAuthzeroTokenResolver.java b/jwt-toolbox-auth0/src/test/java/com/onixbyte/jwt/auth0/test/TestAuthzeroTokenResolver.java similarity index 75% rename from jwt-toolbox-auth0/src/test/java/com/onixbyte/simplejwt/authzero/test/TestAuthzeroTokenResolver.java rename to jwt-toolbox-auth0/src/test/java/com/onixbyte/jwt/auth0/test/TestAuthzeroTokenResolver.java index be09ef3..68ecf82 100644 --- a/jwt-toolbox-auth0/src/test/java/com/onixbyte/simplejwt/authzero/test/TestAuthzeroTokenResolver.java +++ b/jwt-toolbox-auth0/src/test/java/com/onixbyte/jwt/auth0/test/TestAuthzeroTokenResolver.java @@ -15,13 +15,7 @@ * limitations under the License. */ -package com.onixbyte.simplejwt.authzero.test; - -import com.onixbyte.simplejwt.authzero.AuthzeroTokenResolver; -import com.onixbyte.simplejwt.constants.TokenAlgorithm; -import org.junit.jupiter.api.Test; - -import java.time.Duration; +package com.onixbyte.jwt.auth0.test; /** * TestAuthzeroTokenResolver diff --git a/jwt-toolbox-facade/build.gradle.kts b/jwt-toolbox-facade/build.gradle.kts index e114e39..6f3dddd 100644 --- a/jwt-toolbox-facade/build.gradle.kts +++ b/jwt-toolbox-facade/build.gradle.kts @@ -68,13 +68,13 @@ tasks.test { publishing { publications { - create("simpleJwtFacade") { + create("jwtToolboxFacade") { groupId = group.toString() - artifactId = "simple-jwt-facade" + artifactId = "jwt-toolbox-facade" version = artefactVersion pom { - name = "Simple JWT :: Facade" + name = "OnixByte JWT Toolbox :: Facade" description = "Declaration of simple JWT module." url = projectUrl @@ -111,7 +111,7 @@ publishing { from(components["java"]) signing { - sign(publishing.publications["simpleJwtFacade"]) + sign(publishing.publications["jwtToolboxFacade"]) } } @@ -126,4 +126,4 @@ publishing { } } } -} \ No newline at end of file +} diff --git a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/SecretCreator.java b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/SecretCreator.java similarity index 98% rename from jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/SecretCreator.java rename to jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/SecretCreator.java index 0b24439..0e8ba02 100644 --- a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/SecretCreator.java +++ b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/SecretCreator.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.onixbyte.simplejwt; +package com.onixbyte.jwt; -import com.onixbyte.simplejwt.exceptions.WeakSecretException; +import com.onixbyte.jwt.exceptions.WeakSecretException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/TokenPayload.java b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/TokenPayload.java similarity index 97% rename from jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/TokenPayload.java rename to jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/TokenPayload.java index 1234c6c..a8f5b0d 100644 --- a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/TokenPayload.java +++ b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/TokenPayload.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.simplejwt; +package com.onixbyte.jwt; /** * {@code TokenPayload} interface is used to mark a data class as suitable diff --git a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/TokenResolver.java b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/TokenResolver.java similarity index 99% rename from jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/TokenResolver.java rename to jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/TokenResolver.java index c2ea124..09b6ab1 100644 --- a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/TokenResolver.java +++ b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/TokenResolver.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.simplejwt; +package com.onixbyte.jwt; import java.time.Duration; import java.util.Map; diff --git a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/annotations/ExcludeFromPayload.java b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/annotations/ExcludeFromPayload.java similarity index 97% rename from jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/annotations/ExcludeFromPayload.java rename to jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/annotations/ExcludeFromPayload.java index 0253755..d9432f3 100644 --- a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/annotations/ExcludeFromPayload.java +++ b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/annotations/ExcludeFromPayload.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.simplejwt.annotations; +package com.onixbyte.jwt.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/annotations/TokenEnum.java b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/annotations/TokenEnum.java similarity index 93% rename from jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/annotations/TokenEnum.java rename to jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/annotations/TokenEnum.java index ffb5e2f..e2f626b 100644 --- a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/annotations/TokenEnum.java +++ b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/annotations/TokenEnum.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.onixbyte.simplejwt.annotations; +package com.onixbyte.jwt.annotations; -import com.onixbyte.simplejwt.constants.TokenDataType; +import com.onixbyte.jwt.constants.TokenDataType; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/constants/PredefinedKeys.java b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/constants/PredefinedKeys.java similarity index 98% rename from jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/constants/PredefinedKeys.java rename to jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/constants/PredefinedKeys.java index af3b315..36de075 100644 --- a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/constants/PredefinedKeys.java +++ b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/constants/PredefinedKeys.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.simplejwt.constants; +package com.onixbyte.jwt.constants; import java.util.List; diff --git a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/constants/TokenAlgorithm.java b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/constants/TokenAlgorithm.java similarity index 98% rename from jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/constants/TokenAlgorithm.java rename to jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/constants/TokenAlgorithm.java index 21d34c2..af77fd1 100644 --- a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/constants/TokenAlgorithm.java +++ b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/constants/TokenAlgorithm.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.simplejwt.constants; +package com.onixbyte.jwt.constants; import java.util.List; diff --git a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/constants/TokenDataType.java b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/constants/TokenDataType.java similarity index 97% rename from jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/constants/TokenDataType.java rename to jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/constants/TokenDataType.java index 187b2e9..98bdf43 100644 --- a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/constants/TokenDataType.java +++ b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/constants/TokenDataType.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.simplejwt.constants; +package com.onixbyte.jwt.constants; /** * The base data types used to process enum data. diff --git a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/exceptions/IllegalKeyPairException.java b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/exceptions/IllegalKeyPairException.java similarity index 97% rename from jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/exceptions/IllegalKeyPairException.java rename to jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/exceptions/IllegalKeyPairException.java index 55959ce..8ba5a89 100644 --- a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/exceptions/IllegalKeyPairException.java +++ b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/exceptions/IllegalKeyPairException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.simplejwt.exceptions; +package com.onixbyte.jwt.exceptions; /** * {@link IllegalKeyPairException} indicates an exception that the key pair is invalid. diff --git a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/exceptions/IllegalSecretException.java b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/exceptions/IllegalSecretException.java similarity index 97% rename from jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/exceptions/IllegalSecretException.java rename to jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/exceptions/IllegalSecretException.java index 3ade2f2..eddf440 100644 --- a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/exceptions/IllegalSecretException.java +++ b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/exceptions/IllegalSecretException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.simplejwt.exceptions; +package com.onixbyte.jwt.exceptions; /** * {@link IllegalKeyPairException} indicates the secret to sign a JWT is illegal. diff --git a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/exceptions/UnsupportedAlgorithmException.java b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/exceptions/UnsupportedAlgorithmException.java similarity index 97% rename from jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/exceptions/UnsupportedAlgorithmException.java rename to jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/exceptions/UnsupportedAlgorithmException.java index c626e40..a79d02d 100644 --- a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/exceptions/UnsupportedAlgorithmException.java +++ b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/exceptions/UnsupportedAlgorithmException.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.onixbyte.simplejwt.exceptions; +package com.onixbyte.jwt.exceptions; -import com.onixbyte.simplejwt.TokenResolver; +import com.onixbyte.jwt.TokenResolver; /** * This {@code UnsupportedAlgorithmException} represents the given diff --git a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/exceptions/WeakSecretException.java b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/exceptions/WeakSecretException.java similarity index 98% rename from jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/exceptions/WeakSecretException.java rename to jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/exceptions/WeakSecretException.java index a7a57e7..7c81641 100644 --- a/jwt-toolbox-facade/src/main/java/com/onixbyte/simplejwt/exceptions/WeakSecretException.java +++ b/jwt-toolbox-facade/src/main/java/com/onixbyte/jwt/exceptions/WeakSecretException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.simplejwt.exceptions; +package com.onixbyte.jwt.exceptions; /** * {@code WeakSecretException} represents that your secret is too weak to be diff --git a/jwt-toolbox-spring-boot-starter/build.gradle.kts b/jwt-toolbox-spring-boot-starter/build.gradle.kts index 1a7b0f3..65d0eac 100644 --- a/jwt-toolbox-spring-boot-starter/build.gradle.kts +++ b/jwt-toolbox-spring-boot-starter/build.gradle.kts @@ -81,13 +81,13 @@ tasks.test { publishing { publications { - create("simpleJwtSpringBootStarter") { + create("jwtSpringBootStarter") { groupId = group.toString() - artifactId = "simple-jwt-spring-boot-starter" + artifactId = "jwt-spring-boot-starter" version = artefactVersion pom { - name = "Simple JWT :: Spring Boot Starter" + name = "OnixByte JWT Toolbox :: Spring Boot Starter" description = "Simple JWT all-in-one package for Spring Boot." url = projectUrl @@ -124,7 +124,7 @@ publishing { from(components["java"]) signing { - sign(publishing.publications["simpleJwtSpringBootStarter"]) + sign(publishing.publications["jwtSpringBootStarter"]) } } @@ -139,4 +139,4 @@ publishing { } } } -} \ No newline at end of file +} diff --git a/jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/simplejwt/autoconfiguration/AuthzeroTokenResolverAutoConfiguration.java b/jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/jwt/autoconfiguration/AuthzeroTokenResolverAutoConfiguration.java similarity index 94% rename from jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/simplejwt/autoconfiguration/AuthzeroTokenResolverAutoConfiguration.java rename to jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/jwt/autoconfiguration/AuthzeroTokenResolverAutoConfiguration.java index 7dd52a4..f1a5e4f 100644 --- a/jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/simplejwt/autoconfiguration/AuthzeroTokenResolverAutoConfiguration.java +++ b/jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/jwt/autoconfiguration/AuthzeroTokenResolverAutoConfiguration.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.onixbyte.simplejwt.autoconfiguration; +package com.onixbyte.jwt.autoconfiguration; import com.onixbyte.identitygenerator.IdentityGenerator; -import com.onixbyte.simplejwt.TokenResolver; -import com.onixbyte.simplejwt.authzero.AuthzeroTokenResolver; -import com.onixbyte.simplejwt.autoconfiguration.properties.SimpleJwtProperties; +import com.onixbyte.jwt.TokenResolver; +import com.onixbyte.jwt.auth0.AuthzeroTokenResolver; +import com.onixbyte.jwt.autoconfiguration.properties.SimpleJwtProperties; import com.auth0.jwt.interfaces.DecodedJWT; import com.fasterxml.jackson.databind.ObjectMapper; -import com.onixbyte.simplejwt.constants.TokenAlgorithm; +import com.onixbyte.jwt.constants.TokenAlgorithm; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/simplejwt/autoconfiguration/GuidAutoConfiguration.java b/jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/jwt/autoconfiguration/GuidAutoConfiguration.java similarity index 92% rename from jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/simplejwt/autoconfiguration/GuidAutoConfiguration.java rename to jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/jwt/autoconfiguration/GuidAutoConfiguration.java index 16a42f8..674e2dd 100644 --- a/jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/simplejwt/autoconfiguration/GuidAutoConfiguration.java +++ b/jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/jwt/autoconfiguration/GuidAutoConfiguration.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.onixbyte.simplejwt.autoconfiguration; +package com.onixbyte.jwt.autoconfiguration; import com.onixbyte.identitygenerator.IdentityGenerator; -import com.onixbyte.simplejwt.autoconfiguration.conditions.GuidCreatorCondition; +import com.onixbyte.jwt.autoconfiguration.conditions.GuidCreatorCondition; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.AutoConfiguration; diff --git a/jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/simplejwt/autoconfiguration/conditions/GuidCreatorCondition.java b/jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/jwt/autoconfiguration/conditions/GuidCreatorCondition.java similarity index 97% rename from jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/simplejwt/autoconfiguration/conditions/GuidCreatorCondition.java rename to jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/jwt/autoconfiguration/conditions/GuidCreatorCondition.java index f282db6..0b62b61 100644 --- a/jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/simplejwt/autoconfiguration/conditions/GuidCreatorCondition.java +++ b/jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/jwt/autoconfiguration/conditions/GuidCreatorCondition.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.simplejwt.autoconfiguration.conditions; +package com.onixbyte.jwt.autoconfiguration.conditions; import com.onixbyte.identitygenerator.IdentityGenerator; import org.slf4j.Logger; diff --git a/jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/simplejwt/autoconfiguration/properties/SimpleJwtProperties.java b/jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/jwt/autoconfiguration/properties/SimpleJwtProperties.java similarity index 94% rename from jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/simplejwt/autoconfiguration/properties/SimpleJwtProperties.java rename to jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/jwt/autoconfiguration/properties/SimpleJwtProperties.java index 826d108..a855305 100644 --- a/jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/simplejwt/autoconfiguration/properties/SimpleJwtProperties.java +++ b/jwt-toolbox-spring-boot-starter/src/main/java/com/onixbyte/jwt/autoconfiguration/properties/SimpleJwtProperties.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.onixbyte.simplejwt.autoconfiguration.properties; +package com.onixbyte.jwt.autoconfiguration.properties; -import com.onixbyte.simplejwt.SecretCreator; -import com.onixbyte.simplejwt.autoconfiguration.AuthzeroTokenResolverAutoConfiguration; -import com.onixbyte.simplejwt.constants.TokenAlgorithm; +import com.onixbyte.jwt.SecretCreator; +import com.onixbyte.jwt.autoconfiguration.AuthzeroTokenResolverAutoConfiguration; +import com.onixbyte.jwt.constants.TokenAlgorithm; import org.springframework.boot.context.properties.ConfigurationProperties; /** diff --git a/jwt-toolbox-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/jwt-toolbox-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index a7b7bbe..fbd0048 100644 --- a/jwt-toolbox-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/jwt-toolbox-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,2 @@ -com.onixbyte.simplejwt.autoconfiguration.GuidAutoConfiguration -com.onixbyte.simplejwt.autoconfiguration.AuthzeroTokenResolverAutoConfiguration \ No newline at end of file +com.onixbyte.jwt.autoconfiguration.GuidAutoConfiguration +com.onixbyte.jwt.autoconfiguration.AuthzeroTokenResolverAutoConfiguration diff --git a/math-toolbox/build.gradle.kts b/math-toolbox/build.gradle.kts index e58a9e7..520d6dd 100644 --- a/math-toolbox/build.gradle.kts +++ b/math-toolbox/build.gradle.kts @@ -64,13 +64,13 @@ tasks.test { publishing { publications { - create("num4j") { + create("mathToolbox") { groupId = group.toString() - artifactId = "num4j" + artifactId = "math-toolbox" version = artefactVersion pom { - name = "Num4j" + name = "OnixByte Math Toolbox" description = "This module is an easy-to-use util for mathematical calculations in Java." url = projectUrl @@ -108,7 +108,7 @@ publishing { from(components["java"]) signing { - sign(publishing.publications["num4j"]) + sign(publishing.publications["mathToolbox"]) } } @@ -123,4 +123,4 @@ publishing { } } } -} \ No newline at end of file +} diff --git a/math-toolbox/src/main/java/com/onixbyte/nums/ChainedCalcUtil.java b/math-toolbox/src/main/java/com/onixbyte/math/ChainedCalcUtil.java similarity index 99% rename from math-toolbox/src/main/java/com/onixbyte/nums/ChainedCalcUtil.java rename to math-toolbox/src/main/java/com/onixbyte/math/ChainedCalcUtil.java index 62a7f61..bce105a 100644 --- a/math-toolbox/src/main/java/com/onixbyte/nums/ChainedCalcUtil.java +++ b/math-toolbox/src/main/java/com/onixbyte/math/ChainedCalcUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.nums; +package com.onixbyte.math; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/math-toolbox/src/main/java/com/onixbyte/nums/PercentileCalculator.java b/math-toolbox/src/main/java/com/onixbyte/math/PercentileCalculator.java similarity index 98% rename from math-toolbox/src/main/java/com/onixbyte/nums/PercentileCalculator.java rename to math-toolbox/src/main/java/com/onixbyte/math/PercentileCalculator.java index 3578ec5..3b3439e 100644 --- a/math-toolbox/src/main/java/com/onixbyte/nums/PercentileCalculator.java +++ b/math-toolbox/src/main/java/com/onixbyte/math/PercentileCalculator.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.onixbyte.nums; +package com.onixbyte.math; -import com.onixbyte.nums.model.QuartileBounds; +import com.onixbyte.math.model.QuartileBounds; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/math-toolbox/src/main/java/com/onixbyte/nums/model/QuartileBounds.java b/math-toolbox/src/main/java/com/onixbyte/math/model/QuartileBounds.java similarity index 99% rename from math-toolbox/src/main/java/com/onixbyte/nums/model/QuartileBounds.java rename to math-toolbox/src/main/java/com/onixbyte/math/model/QuartileBounds.java index 60b9470..60dafd0 100644 --- a/math-toolbox/src/main/java/com/onixbyte/nums/model/QuartileBounds.java +++ b/math-toolbox/src/main/java/com/onixbyte/math/model/QuartileBounds.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.onixbyte.nums.model; +package com.onixbyte.math.model; /** * A record representing the quartile bounds of a dataset. diff --git a/version-catalogue/build.gradle.kts b/version-catalogue/build.gradle.kts index e5c2ed2..398eacf 100644 --- a/version-catalogue/build.gradle.kts +++ b/version-catalogue/build.gradle.kts @@ -49,9 +49,9 @@ dependencies { publishing { publications { - create("devkitBom") { + create("versionCatalogue") { groupId = group.toString() - artifactId = "devkit-bom" + artifactId = "version-catalogue" version = artefactVersion pom { @@ -92,7 +92,7 @@ publishing { from(components["javaPlatform"]) signing { - sign(publishing.publications["devkitBom"]) + sign(publishing.publications["versionCatalogue"]) } }