diff --git a/services/encryption-service/pom.xml b/services/encryption-service/pom.xml index fd69df70a..9339cd379 100644 --- a/services/encryption-service/pom.xml +++ b/services/encryption-service/pom.xml @@ -1,173 +1,167 @@ - - 4.0.0 - + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.2.13.RELEASE + + org.egov + egov-enc-service + 1.1.4 + egov-enc-service + + 2.17.1 + 1.8 + ${java.version} + ${java.version} + 1.18.8 + + + + org.springframework + spring-beans + 5.2.20.RELEASE + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.springframework.boot + spring-boot-starter-test + test + + + io.swagger + swagger-core + 1.5.18 + + + org.egov.services + tracer + 2.1.0-SNAPSHOT + + + org.projectlombok + lombok + true + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + org.json + json + 20180813 + + + javax.validation + validation-api + + + org.postgresql + postgresql + + + com.microsoft.sqlserver + mssql-jdbc + runtime + + + org.flywaydb + flyway-core + 6.4.3 + + + org.bouncycastle + bcprov-jdk15on + 1.60 + + + + com.amazonaws + aws-java-sdk-kms + 1.11.762 + + + + + repo.egovernments.org + eGov DIGIT Releases Repository + https://nexus-repo.digit.org/nexus/content/repositories/snapshots/ + + + repo.egovernments.org.snapshots + eGov ERP Releases Repository + https://nexus-repo.egovernments.org/nexus/content/repositories/snapshots/ + + + repo.egovernments.org.public + eGov Public Repository Group + https://nexus-repo.egovernments.org/nexus/content/groups/public/ + + + + src/main/java + + org.springframework.boot - spring-boot-starter-parent - 3.3.3 - - org.egov - egov-enc-service - 1.1.4 - egov-enc-service - - 2.17.1 - 1.8 - ${java.version} - ${java.version} - 1.18.8 - - - - org.springframework - spring-beans - 5.2.20.RELEASE - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-jdbc - - - org.springframework.boot - spring-boot-starter-test - test - - - io.swagger - swagger-core - 1.5.18 - - - org.egov.services - tracer - 2.1.0-SNAPSHOT - - - org.projectlombok - lombok - true - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - org.json - json - 20180813 - - - jakarta.validation - jakarta.validation-api - - - org.postgresql - postgresql - - - com.microsoft.sqlserver - mssql-jdbc - runtime - - - org.flywaydb - flyway-core - 6.4.3 - - - org.bouncycastle - bcprov-jdk15on - 1.60 - - - - com.amazonaws - aws-java-sdk-kms - 1.11.762 - - - jakarta.annotation - jakarta.annotation-api - - - - - repo.egovernments.org - eGov DIGIT Releases Repository - https://nexus-repo.digit.org/nexus/content/repositories/snapshots/ - - - repo.egovernments.org.snapshots - eGov ERP Releases Repository - https://nexus-repo.egovernments.org/nexus/content/repositories/snapshots/ - - - repo.egovernments.org.public - eGov Public Repository Group - https://nexus-repo.egovernments.org/nexus/content/groups/public/ - - - - src/main/java - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - org.projectlombok - lombok - - - org.springframework.boot - spring-boot-devtools - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + spring-boot-maven-plugin + + + + repackage + + + + + + + org.projectlombok + lombok + + + org.springframework.boot + spring-boot-devtools + + + + + + cz.habarta.typescript-generator + typescript-generator-maven-plugin + 2.22.595 + + + generate + + generate + + process-classes + + + + jackson2 + + org.egov.enc.web.models.EncryptionRequest + org.egov.enc.web.models.SignRequest + org.egov.enc.web.models.VerifyRequest + org.egov.enc.web.models.RotateKeyRequest + org.egov.enc.web.models.RotateKeyResponse + org.egov.enc.web.models.VerifyResponse + org.egov.enc.web.models.SignResponse + + Digit + module + + + + diff --git a/services/encryption-service/src/main/java/org/egov/enc/config/MainConfiguration.java b/services/encryption-service/src/main/java/org/egov/enc/config/MainConfiguration.java index 7f3dcdb5a..3c66d6f9a 100644 --- a/services/encryption-service/src/main/java/org/egov/enc/config/MainConfiguration.java +++ b/services/encryption-service/src/main/java/org/egov/enc/config/MainConfiguration.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Import; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import jakarta.annotation.PostConstruct; +import javax.annotation.PostConstruct; import java.util.TimeZone; diff --git a/services/encryption-service/src/main/java/org/egov/enc/keymanagement/KeyGenerator.java b/services/encryption-service/src/main/java/org/egov/enc/keymanagement/KeyGenerator.java index 4cb5d75fe..eacba6688 100644 --- a/services/encryption-service/src/main/java/org/egov/enc/keymanagement/KeyGenerator.java +++ b/services/encryption-service/src/main/java/org/egov/enc/keymanagement/KeyGenerator.java @@ -9,8 +9,8 @@ import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -import jakarta.crypto.*; -import jakarta.crypto.spec.SecretKeySpec; +import javax.crypto.*; +import javax.crypto.spec.SecretKeySpec; import java.security.*; import java.security.spec.InvalidKeySpecException; import java.util.ArrayList; diff --git a/services/encryption-service/src/main/java/org/egov/enc/keymanagement/KeyStore.java b/services/encryption-service/src/main/java/org/egov/enc/keymanagement/KeyStore.java index 3aca07724..1adbe2975 100644 --- a/services/encryption-service/src/main/java/org/egov/enc/keymanagement/KeyStore.java +++ b/services/encryption-service/src/main/java/org/egov/enc/keymanagement/KeyStore.java @@ -14,8 +14,8 @@ import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -import jakarta.crypto.*; -import jakarta.crypto.spec.SecretKeySpec; +import javax.crypto.*; +import javax.crypto.spec.SecretKeySpec; import java.security.*; import java.security.spec.InvalidKeySpecException; import java.security.spec.PKCS8EncodedKeySpec; diff --git a/services/encryption-service/src/main/java/org/egov/enc/keymanagement/masterkey/providers/AwsKmsMasterKey.java b/services/encryption-service/src/main/java/org/egov/enc/keymanagement/masterkey/providers/AwsKmsMasterKey.java index 0e79702b9..dacdf47f3 100644 --- a/services/encryption-service/src/main/java/org/egov/enc/keymanagement/masterkey/providers/AwsKmsMasterKey.java +++ b/services/encryption-service/src/main/java/org/egov/enc/keymanagement/masterkey/providers/AwsKmsMasterKey.java @@ -14,7 +14,7 @@ import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -import jakarta.annotation.PostConstruct; +import javax.annotation.PostConstruct; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.Base64; diff --git a/services/encryption-service/src/main/java/org/egov/enc/keymanagement/masterkey/providers/SoftwareBasedMasterKey.java b/services/encryption-service/src/main/java/org/egov/enc/keymanagement/masterkey/providers/SoftwareBasedMasterKey.java index 14629a4c5..e303e2bea 100644 --- a/services/encryption-service/src/main/java/org/egov/enc/keymanagement/masterkey/providers/SoftwareBasedMasterKey.java +++ b/services/encryption-service/src/main/java/org/egov/enc/keymanagement/masterkey/providers/SoftwareBasedMasterKey.java @@ -10,11 +10,11 @@ import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -import jakarta.annotation.PostConstruct; -import jakarta.crypto.SecretKey; -import jakarta.crypto.SecretKeyFactory; -import jakarta.crypto.spec.PBEKeySpec; -import jakarta.crypto.spec.SecretKeySpec; +import javax.annotation.PostConstruct; +import javax.crypto.SecretKey; +import javax.crypto.SecretKeyFactory; +import javax.crypto.spec.PBEKeySpec; +import javax.crypto.spec.SecretKeySpec; import java.nio.charset.StandardCharsets; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; diff --git a/services/encryption-service/src/main/java/org/egov/enc/services/EncryptionServiceInterface.java b/services/encryption-service/src/main/java/org/egov/enc/services/EncryptionServiceInterface.java index ef3024f0f..fd7136f9d 100644 --- a/services/encryption-service/src/main/java/org/egov/enc/services/EncryptionServiceInterface.java +++ b/services/encryption-service/src/main/java/org/egov/enc/services/EncryptionServiceInterface.java @@ -3,9 +3,9 @@ import org.egov.enc.models.Ciphertext; import org.egov.enc.models.Plaintext; -import jakarta.crypto.BadPaddingException; -import jakarta.crypto.IllegalBlockSizeException; -import jakarta.crypto.NoSuchPaddingException; +import javax.crypto.BadPaddingException; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.NoSuchPaddingException; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; diff --git a/services/encryption-service/src/main/java/org/egov/enc/services/SymmetricEncryptionService.java b/services/encryption-service/src/main/java/org/egov/enc/services/SymmetricEncryptionService.java index 0f3692a5a..cd3b0d8cf 100644 --- a/services/encryption-service/src/main/java/org/egov/enc/services/SymmetricEncryptionService.java +++ b/services/encryption-service/src/main/java/org/egov/enc/services/SymmetricEncryptionService.java @@ -8,10 +8,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import jakarta.crypto.BadPaddingException; -import jakarta.crypto.IllegalBlockSizeException; -import jakarta.crypto.NoSuchPaddingException; -import jakarta.crypto.SecretKey; +import javax.crypto.BadPaddingException; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.NoSuchPaddingException; +import javax.crypto.SecretKey; import java.nio.charset.StandardCharsets; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; diff --git a/services/encryption-service/src/main/java/org/egov/enc/utils/AsymmetricEncryptionUtil.java b/services/encryption-service/src/main/java/org/egov/enc/utils/AsymmetricEncryptionUtil.java index d33423ef2..a611b03d1 100644 --- a/services/encryption-service/src/main/java/org/egov/enc/utils/AsymmetricEncryptionUtil.java +++ b/services/encryption-service/src/main/java/org/egov/enc/utils/AsymmetricEncryptionUtil.java @@ -2,6 +2,7 @@ import lombok.extern.slf4j.Slf4j; import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.egov.enc.config.AppProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -24,9 +25,7 @@ public void setAsymmetricEncryptionMethod(@Value("${method.asymmetric}") String } @Autowired - public AsymmetricEncryptionUtil() { - init(); - } + public AsymmetricEncryptionUtil() { init(); } //Initialize Security Provider to BouncyCastleProvider public static void init() { diff --git a/services/encryption-service/src/main/java/org/egov/enc/utils/ProcessJSONUtil.java b/services/encryption-service/src/main/java/org/egov/enc/utils/ProcessJSONUtil.java index 8b20a8986..7ec080f0f 100644 --- a/services/encryption-service/src/main/java/org/egov/enc/utils/ProcessJSONUtil.java +++ b/services/encryption-service/src/main/java/org/egov/enc/utils/ProcessJSONUtil.java @@ -12,9 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import jakarta.crypto.BadPaddingException; -import jakarta.crypto.IllegalBlockSizeException; -import jakarta.crypto.NoSuchPaddingException; +import javax.crypto.BadPaddingException; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.NoSuchPaddingException; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; diff --git a/services/encryption-service/src/main/java/org/egov/enc/utils/SymmetricEncryptionUtil.java b/services/encryption-service/src/main/java/org/egov/enc/utils/SymmetricEncryptionUtil.java index e21ead9ec..642476bca 100644 --- a/services/encryption-service/src/main/java/org/egov/enc/utils/SymmetricEncryptionUtil.java +++ b/services/encryption-service/src/main/java/org/egov/enc/utils/SymmetricEncryptionUtil.java @@ -7,9 +7,9 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import jakarta.crypto.*; -import jakarta.crypto.spec.GCMParameterSpec; -import jakarta.crypto.spec.IvParameterSpec; +import javax.crypto.*; +import javax.crypto.spec.GCMParameterSpec; +import javax.crypto.spec.IvParameterSpec; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; diff --git a/services/encryption-service/src/main/java/org/egov/enc/web/controllers/CryptoApiController.java b/services/encryption-service/src/main/java/org/egov/enc/web/controllers/CryptoApiController.java index 7b15bfa69..23d85091a 100644 --- a/services/encryption-service/src/main/java/org/egov/enc/web/controllers/CryptoApiController.java +++ b/services/encryption-service/src/main/java/org/egov/enc/web/controllers/CryptoApiController.java @@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.validation.Valid; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; @Slf4j @Controller diff --git a/services/encryption-service/src/main/java/org/egov/enc/web/models/EncReqObject.java b/services/encryption-service/src/main/java/org/egov/enc/web/models/EncReqObject.java index 980021a88..42c1a4bc1 100644 --- a/services/encryption-service/src/main/java/org/egov/enc/web/models/EncReqObject.java +++ b/services/encryption-service/src/main/java/org/egov/enc/web/models/EncReqObject.java @@ -5,15 +5,15 @@ import lombok.*; import org.springframework.validation.annotation.Validated; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotNull; +import javax.validation.Valid; +import javax.validation.constraints.NotNull; /** * Encryption / Decryption Request Meta-data and Values */ @ApiModel(description = "Encryption / Decryption Request Meta-data and Values") @Validated -@jakarta.annotation.Generated(value = "org.egov.codegen.SpringBootCodegen", date = "2018-10-11T17:31:52.360+05:30") +@javax.annotation.Generated(value = "org.egov.codegen.SpringBootCodegen", date = "2018-10-11T17:31:52.360+05:30") @Getter @Setter diff --git a/services/encryption-service/src/main/java/org/egov/enc/web/models/EncryptionRequest.java b/services/encryption-service/src/main/java/org/egov/enc/web/models/EncryptionRequest.java index a61de86ce..76b1e1705 100644 --- a/services/encryption-service/src/main/java/org/egov/enc/web/models/EncryptionRequest.java +++ b/services/encryption-service/src/main/java/org/egov/enc/web/models/EncryptionRequest.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import java.util.List; @Getter diff --git a/services/encryption-service/src/main/java/org/egov/enc/web/models/RotateKeyRequest.java b/services/encryption-service/src/main/java/org/egov/enc/web/models/RotateKeyRequest.java index e00c4cd40..8a4f35d37 100644 --- a/services/encryption-service/src/main/java/org/egov/enc/web/models/RotateKeyRequest.java +++ b/services/encryption-service/src/main/java/org/egov/enc/web/models/RotateKeyRequest.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; @Getter @Setter diff --git a/services/encryption-service/src/main/java/org/egov/enc/web/models/SignRequest.java b/services/encryption-service/src/main/java/org/egov/enc/web/models/SignRequest.java index 6aecdda7a..84de5d19d 100644 --- a/services/encryption-service/src/main/java/org/egov/enc/web/models/SignRequest.java +++ b/services/encryption-service/src/main/java/org/egov/enc/web/models/SignRequest.java @@ -5,14 +5,14 @@ import lombok.*; import org.springframework.validation.annotation.Validated; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; /** * Object with the value to be signed */ @ApiModel(description = "Object with the value to be signed") @Validated -@jakarta.annotation.Generated(value = "org.egov.codegen.SpringBootCodegen", date = "2018-10-11T17:31:52.360+05:30") +@javax.annotation.Generated(value = "org.egov.codegen.SpringBootCodegen", date = "2018-10-11T17:31:52.360+05:30") @Getter @Setter diff --git a/services/encryption-service/src/main/java/org/egov/enc/web/models/VerifyRequest.java b/services/encryption-service/src/main/java/org/egov/enc/web/models/VerifyRequest.java index 1e504dfda..6999faaa3 100644 --- a/services/encryption-service/src/main/java/org/egov/enc/web/models/VerifyRequest.java +++ b/services/encryption-service/src/main/java/org/egov/enc/web/models/VerifyRequest.java @@ -6,14 +6,14 @@ import org.egov.enc.models.Signature; import org.springframework.validation.annotation.Validated; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; /** * Object with the value and signature to be verified */ @ApiModel(description = "Object with the value and signature to be verified") @Validated -@jakarta.annotation.Generated(value = "org.egov.codegen.SpringBootCodegen", date = "2018-10-11T17:31:52.360+05:30") +@javax.annotation.Generated(value = "org.egov.codegen.SpringBootCodegen", date = "2018-10-11T17:31:52.360+05:30") @Getter @Setter diff --git a/services/id-gen-service/pom.xml b/services/id-gen-service/pom.xml index cd28b2d70..ca198380a 100644 --- a/services/id-gen-service/pom.xml +++ b/services/id-gen-service/pom.xml @@ -1,154 +1,153 @@ - - 4.0.0 - + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.2.13.RELEASE + + + org.egov + egov-idgen + 1.2.4-SNAPSHOT + egov-idgen + Id generation service + + 2.17.1 + UTF-8 + 1.8 + UTF-8 + 1.18.8 + + + + org.springframework + spring-beans + 5.2.20.RELEASE + + + org.projectlombok + lombok + + + org.springframework.boot + spring-boot-starter + + + org.postgresql + postgresql + + + com.microsoft.sqlserver + mssql-jdbc + runtime + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.aspectj + aspectjrt + + + org.springframework + spring-aspects + + + org.flywaydb + flyway-core + 6.4.3 + + + org.egov.services + tracer + 2.0.0-SNAPSHOT + + + org.egov + mdms-client + 0.0.3-SNAPSHOT + + + com.jayway.jsonpath + json-path + 2.2.0 + + + + + repo.egovernments.org + eGov ERP Releases Repository + https://nexus-repo.egovernments.org/nexus/content/repositories/releases/ + + + repo.egovernments.org.snapshots + eGov ERP Snapshots Repository + https://nexus-repo.egovernments.org/nexus/content/repositories/snapshots/ + + + + + org.springframework.boot - spring-boot-starter-parent - 3.3.3 - - - org.egov - egov-idgen - 1.2.4-SNAPSHOT - egov-idgen - Id generation service - - 2.17.1 - UTF-8 - 1.8 - UTF-8 - 1.18.8 - - - - org.springframework - spring-beans - 5.2.20.RELEASE - - - org.projectlombok - lombok - - - org.springframework.boot - spring-boot-starter - - - org.postgresql - postgresql - - - com.microsoft.sqlserver - mssql-jdbc - runtime - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-starter-jdbc - - - org.aspectj - aspectjrt - - - org.springframework - spring-aspects - - - org.flywaydb - flyway-core - 6.4.3 - - - org.egov.services - tracer - 2.0.0-SNAPSHOT - - - org.egov - mdms-client - 0.0.3-SNAPSHOT - - - com.jayway.jsonpath - json-path - 2.2.0 - - - - - repo.egovernments.org - eGov ERP Releases Repository - https://nexus-repo.egovernments.org/nexus/content/repositories/releases/ - - - repo.egovernments.org.snapshots - eGov ERP Snapshots Repository - https://nexus-repo.egovernments.org/nexus/content/repositories/snapshots/ - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - org.springframework.boot - spring-boot-devtools - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + org.springframework.boot + spring-boot-devtools + + + + + + cz.habarta.typescript-generator + typescript-generator-maven-plugin + 2.22.595 + + + generate + + generate + + process-classes + + + + jackson2 + + org.egov.id.model.IdRequest + org.egov.id.model.IdResponse + + + org.egov.id.model.ResponseStatusEnum$ResponseStatusEnum:ResponseStatus + + + org.egov.id.model.Error:Error + org.egov.id.model.ErrorRes:ErrorRes + org.egov.id.model.Role:Role + org.egov.id.model.UserInfo:UserInfo + + Digit + true + module + + + + diff --git a/services/id-gen-service/src/main/java/org/egov/id/api/IdGenerationController.java b/services/id-gen-service/src/main/java/org/egov/id/api/IdGenerationController.java index 28dc3ad19..ee1df4b3f 100644 --- a/services/id-gen-service/src/main/java/org/egov/id/api/IdGenerationController.java +++ b/services/id-gen-service/src/main/java/org/egov/id/api/IdGenerationController.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import jakarta.validation.Valid; +import javax.validation.Valid; /** * api's related to the IdGeneration Controller diff --git a/services/id-gen-service/src/main/java/org/egov/id/masterdata/provider/DBMasterDataProvider.java b/services/id-gen-service/src/main/java/org/egov/id/masterdata/provider/DBMasterDataProvider.java index da16717dd..f4a77f6d5 100644 --- a/services/id-gen-service/src/main/java/org/egov/id/masterdata/provider/DBMasterDataProvider.java +++ b/services/id-gen-service/src/main/java/org/egov/id/masterdata/provider/DBMasterDataProvider.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import jakarta.sql.DataSource; +import javax.sql.DataSource; import java.util.List; @Service diff --git a/services/id-gen-service/src/main/java/org/egov/id/model/Error.java b/services/id-gen-service/src/main/java/org/egov/id/model/Error.java index fdcdac584..da3242fd4 100644 --- a/services/id-gen-service/src/main/java/org/egov/id/model/Error.java +++ b/services/id-gen-service/src/main/java/org/egov/id/model/Error.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/services/id-gen-service/src/main/java/org/egov/id/model/IdGenerationRequest.java b/services/id-gen-service/src/main/java/org/egov/id/model/IdGenerationRequest.java index 90c00a4c5..8a68d097d 100644 --- a/services/id-gen-service/src/main/java/org/egov/id/model/IdGenerationRequest.java +++ b/services/id-gen-service/src/main/java/org/egov/id/model/IdGenerationRequest.java @@ -10,7 +10,7 @@ import lombok.Setter; import lombok.ToString; -import jakarta.validation.Valid; +import javax.validation.Valid; /** *

IdGenerationRequest

diff --git a/services/id-gen-service/src/main/java/org/egov/id/model/IdRequest.java b/services/id-gen-service/src/main/java/org/egov/id/model/IdRequest.java index 64245d6a9..54e740274 100644 --- a/services/id-gen-service/src/main/java/org/egov/id/model/IdRequest.java +++ b/services/id-gen-service/src/main/java/org/egov/id/model/IdRequest.java @@ -1,8 +1,8 @@ package org.egov.id.model; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/services/id-gen-service/src/main/java/org/egov/id/model/RequestInfo.java b/services/id-gen-service/src/main/java/org/egov/id/model/RequestInfo.java index 3f09adad9..efb445c11 100644 --- a/services/id-gen-service/src/main/java/org/egov/id/model/RequestInfo.java +++ b/services/id-gen-service/src/main/java/org/egov/id/model/RequestInfo.java @@ -2,8 +2,8 @@ import java.io.IOException; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/services/id-gen-service/src/main/java/org/egov/id/model/ResponseInfo.java b/services/id-gen-service/src/main/java/org/egov/id/model/ResponseInfo.java index c881379ed..3334c0326 100644 --- a/services/id-gen-service/src/main/java/org/egov/id/model/ResponseInfo.java +++ b/services/id-gen-service/src/main/java/org/egov/id/model/ResponseInfo.java @@ -1,7 +1,7 @@ package org.egov.id.model; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/services/id-gen-service/src/main/java/org/egov/id/model/Role.java b/services/id-gen-service/src/main/java/org/egov/id/model/Role.java index b476c67b8..fc62d3eb0 100644 --- a/services/id-gen-service/src/main/java/org/egov/id/model/Role.java +++ b/services/id-gen-service/src/main/java/org/egov/id/model/Role.java @@ -1,7 +1,7 @@ package org.egov.id.model; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/services/id-gen-service/src/main/java/org/egov/id/model/TenantRole.java b/services/id-gen-service/src/main/java/org/egov/id/model/TenantRole.java index 053c9327d..da647d6a8 100644 --- a/services/id-gen-service/src/main/java/org/egov/id/model/TenantRole.java +++ b/services/id-gen-service/src/main/java/org/egov/id/model/TenantRole.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/services/id-gen-service/src/main/java/org/egov/id/model/UserInfo.java b/services/id-gen-service/src/main/java/org/egov/id/model/UserInfo.java index 2b8367960..8615ee79f 100644 --- a/services/id-gen-service/src/main/java/org/egov/id/model/UserInfo.java +++ b/services/id-gen-service/src/main/java/org/egov/id/model/UserInfo.java @@ -3,9 +3,9 @@ import java.util.ArrayList; import java.util.List; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Pattern; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/services/id-gen-service/src/main/java/org/egov/id/service/IdGenerationService.java b/services/id-gen-service/src/main/java/org/egov/id/service/IdGenerationService.java index fcd940905..575a993d5 100644 --- a/services/id-gen-service/src/main/java/org/egov/id/service/IdGenerationService.java +++ b/services/id-gen-service/src/main/java/org/egov/id/service/IdGenerationService.java @@ -5,7 +5,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import jakarta.sql.DataSource; +import javax.sql.DataSource; import lombok.extern.slf4j.Slf4j; import org.egov.id.config.PropertiesManager;