From 6ffd1ef1d8c600a34515fca72ddd4df7735cf4fc Mon Sep 17 00:00:00 2001 From: Loganathan Sekar Date: Wed, 13 Mar 2024 20:33:19 +0530 Subject: [PATCH 1/7] WIP-Updated auditmanager api Signed-off-by: Loganathan Sekar --- kernel/kernel-auditmanager-api/pom.xml | 34 +++-- kernel/kernel-auditmanager-service/pom.xml | 150 +++++---------------- 2 files changed, 50 insertions(+), 134 deletions(-) diff --git a/kernel/kernel-auditmanager-api/pom.xml b/kernel/kernel-auditmanager-api/pom.xml index 8b8d544a..8aee6a89 100644 --- a/kernel/kernel-auditmanager-api/pom.xml +++ b/kernel/kernel-auditmanager-api/pom.xml @@ -12,20 +12,20 @@ UTF-8 - 11 - 11 + 17 + 17 3.8.0 3.0.2 3.1.0 - 3.2.0 + 3.6.3 2.3 - 2.0.2.RELEASE - 2.0.7.RELEASE - 5.0.5.RELEASE - 2.0.4.RELEASE + 3.2.2 + 3.2.2 + 6.2.1 + 4.1.0 2.0.7 @@ -54,10 +54,10 @@ 6.0.12.Final - 4.12 - 2.23.4 - 1.7.4 - 2.0.7 + 4.13.2 + 5.10.0 + 2.0.9 + 2.0.9 1.2.3 @@ -84,7 +84,7 @@ 2.2 4.5.6 19.0 - 1.18.8 + 1.18.22 0.1.54 1.4.0 7.1.0 @@ -113,7 +113,7 @@ 1.4.2 1.2.1-SNAPSHOT 1.2.1-SNAPSHOT - 0.8.5 + 0.8.11 **/dto/**,**/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/request/**,**/spi/**,"**/proxy/**","**/AuditManagerBootApplication.java " **/dto/**,**/entity/**,**/config/** @@ -162,6 +162,12 @@ modelmapper ${modelmapper.version} + + junit + junit + ${junit.version} + test + @@ -228,7 +234,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + ${maven.javadoc.version} attach-javadocs diff --git a/kernel/kernel-auditmanager-service/pom.xml b/kernel/kernel-auditmanager-service/pom.xml index 24be0db4..26c3dd70 100644 --- a/kernel/kernel-auditmanager-service/pom.xml +++ b/kernel/kernel-auditmanager-service/pom.xml @@ -5,25 +5,25 @@ io.mosip.kernel kernel-auditmanager-service - 1.2.1-SNAPSHOT + 1.2.1-java17-SNAPSHOT UTF-8 - 11 - 11 + 17 + 17 3.8.0 3.0.2 3.1.0 - 3.2.0 + 3.6.3 2.3 - 2.0.2.RELEASE - 2.0.7.RELEASE - 5.0.5.RELEASE - 2.0.4.RELEASE + 3.2.2 + 3.2.2 + 6.2.1 + 4.1.0 2.0.7 @@ -52,10 +52,10 @@ 6.0.12.Final - 4.12 - 2.23.4 - 1.7.4 - 2.0.7 + 4.13.2 + 5.10.0 + 2.0.9 + 2.0.9 1.2.3 @@ -82,7 +82,7 @@ 2.2 4.5.6 19.0 - 1.18.8 + 1.18.22 0.1.54 1.4.0 7.1.0 @@ -111,115 +111,13 @@ 1.4.2 UTF-8 - - 11 - 11 - 3.8.0 - - 3.0.2 - 3.1.0 - 3.2.0 - 2.3 - - - 2.0.2.RELEASE - 2.0.7.RELEASE - 5.0.5.RELEASE - 2.0.4.RELEASE - - - 2.0.7 - 1.5.21 - 2.9.2 - - - 3.6.2 - 3.7.0 - - - - 1.2 - 3.0.0 - 1.3 - 2.2 - 2.0.1.Final - 2.2.6 - - - 1.4.197 - 5.1.46 - 42.2.25 - 2.5.0 - 5.2.17.Final - 6.0.12.Final - - - 4.12 - 2.23.4 - 1.7.4 - 2.0.7 - - - 1.2.3 - 1.7.19 - 1.7.7 - 1.7.25 2.17.1 - - - 2.9.5 - 2.9.8 - 2.9.6 - 20180130 - 2.2.10 - 20180813 - 1.1.1 - - - 3.6.1 - 3.7 - 2.6 - 1.11 - 4.3 - 1.9.2 - 2.2 - 4.5.6 - 19.0 - 1.18.8 - 0.1.54 - 1.4.0 - 7.1.0 - 2.0.0 - 5.5.13 - 2.3.23 - 1.7 - 2.0 - 1.5.2 - 2.1.1 - 1.66 - 63.1 - 1.0.0 - 3.3.3 - 3.1.0 - 4.1.0-incubating - 1.11.368 - 0.2.4 - 2.3.0 - 3.0.1 - 1.9.12 - 0.6.0 - 2.0.0.AM2 - 1.8.12 - 1.4.2 - 1.4.2 1.5.10 - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT + 1.2.1-java17-SNAPSHOT 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT - 0.8.5 + 1.2.1-java17-SNAPSHOT + 0.8.11 **/dto/**,**/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/request/**,**/spi/**,"**/proxy/**","**/AuditManagerBootApplication.java" **/dto/**,**/entity/**,**/config/** 2.12.0 @@ -292,6 +190,18 @@ log4j-api ${apache.logging.log4j.api.version} + + junit + junit + ${junit.version} + test + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + provided + @@ -375,7 +285,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + ${maven.javadoc.version} attach-javadocs @@ -497,7 +407,7 @@ io.mosip.kernel kernel-auth-adapter - 1.2.1-SNAPSHOT + 1.2.1-java17-SNAPSHOT From ecf4fec758b14c3014a39979b518ea453b101651 Mon Sep 17 00:00:00 2001 From: Loganathan Sekar Date: Wed, 13 Mar 2024 21:17:42 +0530 Subject: [PATCH 2/7] Test fix Signed-off-by: Loganathan Sekar --- .../test/config/TestSecurityConfig.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/kernel/kernel-auditmanager-service/src/test/java/io/mosip/kernel/auditmanager/test/config/TestSecurityConfig.java b/kernel/kernel-auditmanager-service/src/test/java/io/mosip/kernel/auditmanager/test/config/TestSecurityConfig.java index d2a37ccf..2507a206 100644 --- a/kernel/kernel-auditmanager-service/src/test/java/io/mosip/kernel/auditmanager/test/config/TestSecurityConfig.java +++ b/kernel/kernel-auditmanager-service/src/test/java/io/mosip/kernel/auditmanager/test/config/TestSecurityConfig.java @@ -8,11 +8,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.User; @@ -25,18 +24,17 @@ @Configuration @EnableWebSecurity -@EnableGlobalMethodSecurity(prePostEnabled = true) -public class TestSecurityConfig extends WebSecurityConfigurerAdapter { +@EnableMethodSecurity +public class TestSecurityConfig { @Bean public HttpFirewall defaultHttpFirewall() { return new DefaultHttpFirewall(); } - @Override + @Bean public void configure(WebSecurity webSecurity) throws Exception { - webSecurity.ignoring().antMatchers(allowedEndPoints()); - super.configure(webSecurity); + webSecurity.ignoring().requestMatchers(allowedEndPoints()); webSecurity.httpFirewall(defaultHttpFirewall()); } @@ -46,7 +44,7 @@ private String[] allowedEndPoints() { "/*/configuration/security", "/*/swagger-resources/**", "/*/swagger-ui.html" }; } - @Override + @Bean protected void configure(final HttpSecurity httpSecurity) throws Exception { httpSecurity.csrf().disable(); httpSecurity.httpBasic().and().authorizeRequests().anyRequest().authenticated().and().sessionManagement() From 410161840628ba6261f659402b2620ca1f21970b Mon Sep 17 00:00:00 2001 From: Loganathan Sekar Date: Fri, 15 Mar 2024 21:15:53 +0530 Subject: [PATCH 3/7] Committing changes. --- kernel/kernel-auditmanager-api/pom.xml | 25 ++++++++++++++++--- kernel/kernel-auditmanager-service/pom.xml | 20 +++++++++++---- .../exception/ApiExceptionHandler.java | 3 +-- .../test/config/TestSecurityConfig.java | 4 +-- 4 files changed, 40 insertions(+), 12 deletions(-) diff --git a/kernel/kernel-auditmanager-api/pom.xml b/kernel/kernel-auditmanager-api/pom.xml index 8aee6a89..78062960 100644 --- a/kernel/kernel-auditmanager-api/pom.xml +++ b/kernel/kernel-auditmanager-api/pom.xml @@ -22,8 +22,8 @@ 2.3 - 3.2.2 - 3.2.2 + 3.2.3 + 3.2.3 6.2.1 4.1.0 @@ -61,7 +61,7 @@ 1.2.3 - 1.7.19 + 2.0.7 1.7.7 1.7.25 @@ -123,6 +123,16 @@ io.mosip.kernel kernel-core ${kernel.core.version} + + + org.slf4j + slf4j-api + + + org.springframework + spring-aop + + org.springframework.boot @@ -133,6 +143,10 @@ com.h2database h2 + + org.slf4j + slf4j-api + @@ -168,6 +182,11 @@ ${junit.version} test + + org.slf4j + slf4j-api + ${slf4j.version} + diff --git a/kernel/kernel-auditmanager-service/pom.xml b/kernel/kernel-auditmanager-service/pom.xml index 26c3dd70..7f791018 100644 --- a/kernel/kernel-auditmanager-service/pom.xml +++ b/kernel/kernel-auditmanager-service/pom.xml @@ -20,9 +20,9 @@ 2.3 - 3.2.2 - 3.2.2 - 6.2.1 + 3.2.3 + 3.2.3 + 6.2.2 4.1.0 @@ -111,8 +111,8 @@ 1.4.2 UTF-8 - 2.17.1 - 1.5.10 + 2.23.1 + 1.7.0 1.2.1-java17-SNAPSHOT 1.2.1-SNAPSHOT 1.2.1-SNAPSHOT @@ -173,6 +173,16 @@ org.springdoc springdoc-openapi-ui ${springdoc.version} + + + org.springframework + spring-web + + + org.springframework + spring-webmvc + + org.springframework.boot diff --git a/kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/exception/ApiExceptionHandler.java b/kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/exception/ApiExceptionHandler.java index 73540cf9..fa49a013 100644 --- a/kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/exception/ApiExceptionHandler.java +++ b/kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/exception/ApiExceptionHandler.java @@ -5,8 +5,6 @@ import java.time.ZoneId; import java.util.List; -import javax.servlet.http.HttpServletRequest; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -28,6 +26,7 @@ import io.mosip.kernel.core.exception.ServiceError; import io.mosip.kernel.core.http.ResponseWrapper; import io.mosip.kernel.core.util.EmptyCheckUtils; +import jakarta.servlet.http.HttpServletRequest; /** * Class for handling API exceptions diff --git a/kernel/kernel-auditmanager-service/src/test/java/io/mosip/kernel/auditmanager/test/config/TestSecurityConfig.java b/kernel/kernel-auditmanager-service/src/test/java/io/mosip/kernel/auditmanager/test/config/TestSecurityConfig.java index 2507a206..5cec9786 100644 --- a/kernel/kernel-auditmanager-service/src/test/java/io/mosip/kernel/auditmanager/test/config/TestSecurityConfig.java +++ b/kernel/kernel-auditmanager-service/src/test/java/io/mosip/kernel/auditmanager/test/config/TestSecurityConfig.java @@ -4,8 +4,6 @@ import java.util.Arrays; import java.util.List; -import javax.servlet.http.HttpServletResponse; - import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; @@ -22,6 +20,8 @@ import org.springframework.security.web.firewall.DefaultHttpFirewall; import org.springframework.security.web.firewall.HttpFirewall; +import jakarta.servlet.http.HttpServletResponse; + @Configuration @EnableWebSecurity @EnableMethodSecurity From 303ea430103a56c8c66952056b66ada9d6e2c8db Mon Sep 17 00:00:00 2001 From: Loganathan Sekar Date: Fri, 15 Mar 2024 21:15:57 +0530 Subject: [PATCH 4/7] Committing changes. From b2b60ebb044578dfb2595df7880c8aebee4b1f8d Mon Sep 17 00:00:00 2001 From: Loganathan Sekar Date: Tue, 19 Mar 2024 06:12:26 +0530 Subject: [PATCH 5/7] Used BBOM file for dependencies --- kernel/kernel-auditmanager-api/pom.xml | 141 ++---------------- .../kernel/auditmanager/entity/Audit.java | 13 +- kernel/kernel-auditmanager-service/pom.xml | 139 ++--------------- .../AuditManagerBootApplication.java | 4 +- 4 files changed, 39 insertions(+), 258 deletions(-) diff --git a/kernel/kernel-auditmanager-api/pom.xml b/kernel/kernel-auditmanager-api/pom.xml index 78062960..a9f2213a 100644 --- a/kernel/kernel-auditmanager-api/pom.xml +++ b/kernel/kernel-auditmanager-api/pom.xml @@ -7,7 +7,7 @@ io.mosip.kernel kernel-auditmanager-api - 1.2.1-SNAPSHOT + 1.2.1-java17-SNAPSHOT UTF-8 @@ -21,171 +21,60 @@ 3.6.3 2.3 - - 3.2.3 - 3.2.3 - 6.2.1 - 4.1.0 - - - 2.0.7 - 1.5.21 - 2.9.2 - - - 3.6.2 - 3.7.0 - - - - 1.2 - 3.0.0 - 1.3 - 2.2 - 2.0.1.Final - 2.2.6 - - - 1.4.197 - 5.1.46 - 42.2.25 - 2.5.0 - 5.2.17.Final - 6.0.12.Final - - - 4.13.2 - 5.10.0 - 2.0.9 - 2.0.9 - - - 1.2.3 - 2.0.7 - 1.7.7 - 1.7.25 - - - 2.9.5 - 2.9.8 - 2.9.6 - 20180130 - 2.2.10 - 20180813 - 1.1.1 - - - 3.6.1 - 3.7 - 2.6 - 1.11 - 4.3 - 1.9.2 - 2.2 - 4.5.6 - 19.0 - 1.18.22 - 0.1.54 - 1.4.0 - 7.1.0 - 2.0.0 - 5.5.13 - 2.3.23 - 1.7 - 2.0 - 1.5.2 - 2.1.1 - 1.66 - 63.1 - 1.0.0 - 3.3.3 - 3.1.0 - 4.1.0-incubating - 1.11.368 - 0.2.4 - 2.3.0 - 3.0.1 - 1.9.12 - 0.6.0 - 2.0.0.AM2 - 1.8.12 - 1.4.2 - 1.4.2 - 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT + 1.2.1-java17-SNAPSHOT + 0.8.11 **/dto/**,**/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/request/**,**/spi/**,"**/proxy/**","**/AuditManagerBootApplication.java " **/dto/**,**/entity/**,**/config/** + + + + + io.mosip.kernel + kernel-bom + 1.2.1-java17-SNAPSHOT + pom + import + + + io.mosip.kernel kernel-core ${kernel.core.version} - - - org.slf4j - slf4j-api - - - org.springframework - spring-aop - - org.springframework.boot spring-boot-starter-data-jpa - ${spring.boot.version} - - - com.h2database - h2 - - - org.slf4j - slf4j-api - - org.springframework.boot spring-boot-starter-validation - ${spring.boot.version} - - - com.h2database - h2 - - com.h2database h2 - ${h2.version} runtime org.postgresql postgresql - ${postgresql.version} org.modelmapper modelmapper - ${modelmapper.version} junit junit - ${junit.version} test org.slf4j slf4j-api - ${slf4j.version} diff --git a/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/Audit.java b/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/Audit.java index c5b7209b..8550c1ba 100644 --- a/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/Audit.java +++ b/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/Audit.java @@ -2,12 +2,12 @@ import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -28,6 +28,7 @@ @AllArgsConstructor public class Audit extends BaseAudit { + @Id @NotNull @Size(min = 1, max = 64) @Column(name = "event_id", nullable = false, updatable = false, length = 64) diff --git a/kernel/kernel-auditmanager-service/pom.xml b/kernel/kernel-auditmanager-service/pom.xml index 7f791018..1df2309e 100644 --- a/kernel/kernel-auditmanager-service/pom.xml +++ b/kernel/kernel-auditmanager-service/pom.xml @@ -20,108 +20,26 @@ 2.3 - 3.2.3 - 3.2.3 - 6.2.2 - 4.1.0 - - - 2.0.7 - 1.5.21 - 2.9.2 - - - 3.6.2 - 3.7.0 - - - - 1.2 - 3.0.0 - 1.3 - 2.2 - 2.0.1.Final - 2.2.6 - - - 1.4.197 - 5.1.46 - 42.2.25 - 2.5.0 - 5.2.17.Final - 6.0.12.Final - - - 4.13.2 - 5.10.0 - 2.0.9 - 2.0.9 - - - 1.2.3 - 1.7.19 - 1.7.7 - 1.7.25 - - - 2.9.5 - 2.9.8 - 2.9.6 - 20180130 - 2.2.10 - 20180813 - 1.1.1 - - - 3.6.1 - 3.7 - 2.6 - 1.11 - 4.3 - 1.9.2 - 2.2 - 4.5.6 - 19.0 - 1.18.22 - 0.1.54 - 1.4.0 - 7.1.0 - 2.0.0 - 5.5.13 - 2.3.23 - 1.7 - 2.0 - 1.5.2 - 2.1.1 - 1.66 - 63.1 - 1.0.0 - 3.3.3 - 3.1.0 - 4.1.0-incubating - 1.11.368 - 0.2.4 - 2.3.0 - 3.0.1 - 1.9.12 - 0.6.0 - 2.0.0.AM2 - 1.8.12 - 1.4.2 - 1.4.2 - UTF-8 - - 2.23.1 - 1.7.0 1.2.1-java17-SNAPSHOT 1.2.1-SNAPSHOT - 1.2.1-SNAPSHOT + 1.2.1-java17-SNAPSHOT 1.2.1-java17-SNAPSHOT - 0.8.11 + 1.2.1-java17-SNAPSHOT + **/dto/**,**/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/request/**,**/spi/**,"**/proxy/**","**/AuditManagerBootApplication.java" **/dto/**,**/entity/**,**/config/** - 2.12.0 + + + + io.mosip.kernel + kernel-bom + 1.2.1-java17-SNAPSHOT + pom + import + + + io.mosip.kernel @@ -131,7 +49,6 @@ org.postgresql postgresql - ${postgresql.version} io.mosip.kernel @@ -146,70 +63,44 @@ org.springframework.boot spring-boot-starter-security - ${spring.boot.version} org.springframework.security spring-security-test - ${spring.security.test.version} org.springframework.boot spring-boot-starter-web - ${spring.boot.version} com.googlecode.json-simple json-simple - 1.1.1 - - - junit - junit - - org.springdoc springdoc-openapi-ui - ${springdoc.version} - - - org.springframework - spring-web - - - org.springframework - spring-webmvc - - org.springframework.boot spring-boot-configuration-processor true - ${spring.boot.version} com.fasterxml.jackson.datatype jackson-datatype-jsr310 - ${fasterxml.jackson.module.jsr310.version} org.apache.logging.log4j log4j-api - ${apache.logging.log4j.api.version} junit junit - ${junit.version} test jakarta.servlet jakarta.servlet-api - 6.0.0 provided @@ -229,7 +120,6 @@ org.springframework.boot spring-boot-maven-plugin - ${spring.boot.version} true ZIP @@ -369,7 +259,6 @@ org.jacoco jacoco-maven-plugin - ${jacoco.maven.plugin.version} diff --git a/kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/AuditManagerBootApplication.java b/kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/AuditManagerBootApplication.java index e771319e..1a6af43d 100644 --- a/kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/AuditManagerBootApplication.java +++ b/kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/AuditManagerBootApplication.java @@ -2,6 +2,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.domain.EntityScan; /** * Audit manager application @@ -10,8 +11,9 @@ * @since 1.0.0 * */ -@SpringBootApplication(scanBasePackages = { "io.mosip.kernel.auditmanager.*","${mosip.auth.adapter.impl.basepackage}" +@SpringBootApplication(scanBasePackages = { "io.mosip.kernel.auditmanager","${mosip.auth.adapter.impl.basepackage}" ,"io.mosip.kernel.core.logger.config"}) +@EntityScan(basePackages = "io.mosip.kernel.auditmanager.entity") public class AuditManagerBootApplication { /** From e656b2e3086ceb74ec64ae6d5a3ac4a553c59d60 Mon Sep 17 00:00:00 2001 From: Loganathan Sekar Date: Tue, 19 Mar 2024 06:12:36 +0530 Subject: [PATCH 6/7] Used BBOM file for dependencies From f663e581055946465cb90dd3079d58c8fd41fa3a Mon Sep 17 00:00:00 2001 From: Loganathan Sekar Date: Tue, 19 Mar 2024 20:23:50 +0530 Subject: [PATCH 7/7] Fix to entity classes Signed-off-by: Loganathan Sekar --- .../java/io/mosip/kernel/auditmanager/entity/Audit.java | 2 -- .../io/mosip/kernel/auditmanager/entity/BaseAudit.java | 9 ++++----- .../io/mosip/kernel/auditmanager/util/AuditUtils.java | 9 ++++----- .../kernel/auditmanager/AuditManagerBootApplication.java | 2 -- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/Audit.java b/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/Audit.java index 8550c1ba..ac05ac9c 100644 --- a/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/Audit.java +++ b/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/Audit.java @@ -4,7 +4,6 @@ import jakarta.persistence.Column; import jakarta.persistence.Entity; -import jakarta.persistence.Id; import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; @@ -28,7 +27,6 @@ @AllArgsConstructor public class Audit extends BaseAudit { - @Id @NotNull @Size(min = 1, max = 64) @Column(name = "event_id", nullable = false, updatable = false, length = 64) diff --git a/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/BaseAudit.java b/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/BaseAudit.java index 81a223e1..e1e27460 100644 --- a/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/BaseAudit.java +++ b/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/BaseAudit.java @@ -3,10 +3,9 @@ import java.time.LocalDateTime; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; - +import jakarta.persistence.Column; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import lombok.AllArgsConstructor; import lombok.Data; @@ -17,9 +16,9 @@ * @since 1.0.0 * */ -@MappedSuperclass @Data @AllArgsConstructor +@MappedSuperclass public class BaseAudit { /** diff --git a/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/util/AuditUtils.java b/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/util/AuditUtils.java index 5cf83348..30eb4cbe 100644 --- a/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/util/AuditUtils.java +++ b/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/util/AuditUtils.java @@ -2,14 +2,13 @@ import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; - import io.mosip.kernel.auditmanager.constant.AuditErrorCodes; import io.mosip.kernel.auditmanager.request.AuditRequestDto; import io.mosip.kernel.core.auditmanager.exception.AuditManagerException; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; /** * Utility class for Audit Manager diff --git a/kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/AuditManagerBootApplication.java b/kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/AuditManagerBootApplication.java index 1a6af43d..a2cd2842 100644 --- a/kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/AuditManagerBootApplication.java +++ b/kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/AuditManagerBootApplication.java @@ -2,7 +2,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.domain.EntityScan; /** * Audit manager application @@ -13,7 +12,6 @@ */ @SpringBootApplication(scanBasePackages = { "io.mosip.kernel.auditmanager","${mosip.auth.adapter.impl.basepackage}" ,"io.mosip.kernel.core.logger.config"}) -@EntityScan(basePackages = "io.mosip.kernel.auditmanager.entity") public class AuditManagerBootApplication { /**