diff --git a/kernel/kernel-config-server/src/main/java/io/mosip/kernel/config/server/controller/RefreshController.java b/kernel/kernel-config-server/src/main/java/io/mosip/kernel/config/server/controller/RefreshController.java index 4f5abcca30d..c9bb85d7909 100644 --- a/kernel/kernel-config-server/src/main/java/io/mosip/kernel/config/server/controller/RefreshController.java +++ b/kernel/kernel-config-server/src/main/java/io/mosip/kernel/config/server/controller/RefreshController.java @@ -37,7 +37,7 @@ public class RefreshController { @GetMapping("/refresh") public Map refreshContext(@RequestParam("servicename") String serviceName) { - logger.info("refreshContext invoked with serviceName : {}", serviceName); + logger.info("refreshContext invoked with (sanitized) serviceName : {}", serviceName.replaceAll("[\n\r\t]", "_")); Map result = new HashMap<>(); if(Objects.nonNull(discoveryClient)) { diff --git a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/idgenerator/config/HibernateDaoConfig.java b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/idgenerator/config/HibernateDaoConfig.java index 4526a8f0f8f..c9d1dec5060 100644 --- a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/idgenerator/config/HibernateDaoConfig.java +++ b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/idgenerator/config/HibernateDaoConfig.java @@ -18,22 +18,19 @@ import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; -import org.springframework.context.annotation.Import; import org.springframework.context.annotation.PropertySource; import org.springframework.core.env.Environment; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfiguration; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; -import io.mosip.kernel.vidgenerator.constant.HibernatePersistenceConstant; +import io.mosip.kernel.idgenerator.constant.HibernatePersistenceConstant; import jakarta.persistence.EntityManagerFactory; /** diff --git a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/idgenerator/config/UinServiceHealthCheckerhandler.java b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/idgenerator/config/UinServiceHealthCheckerhandler.java index d601bd195f5..9986c3166cd 100644 --- a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/idgenerator/config/UinServiceHealthCheckerhandler.java +++ b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/idgenerator/config/UinServiceHealthCheckerhandler.java @@ -17,7 +17,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import io.mosip.kernel.uingenerator.constant.HibernatePersistenceConstant; +import io.mosip.kernel.idgenerator.constant.HibernatePersistenceConstant; import io.mosip.kernel.uingenerator.constant.UINHealthConstants; import io.mosip.kernel.uingenerator.constant.UinGeneratorConstant; import io.netty.handler.codec.http.HttpResponse; diff --git a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/uingenerator/constant/HibernatePersistenceConstant.java b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/idgenerator/constant/HibernatePersistenceConstant.java similarity index 98% rename from kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/uingenerator/constant/HibernatePersistenceConstant.java rename to kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/idgenerator/constant/HibernatePersistenceConstant.java index 85ff93801ec..8aea6fd35a8 100644 --- a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/uingenerator/constant/HibernatePersistenceConstant.java +++ b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/idgenerator/constant/HibernatePersistenceConstant.java @@ -1,7 +1,7 @@ /** * */ -package io.mosip.kernel.uingenerator.constant; +package io.mosip.kernel.idgenerator.constant; /** * @author Dharmesh Khandelwal diff --git a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/vidgenerator/constant/HibernatePersistenceConstant.java b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/vidgenerator/constant/HibernatePersistenceConstant.java deleted file mode 100644 index 3841d9bc00f..00000000000 --- a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/vidgenerator/constant/HibernatePersistenceConstant.java +++ /dev/null @@ -1,127 +0,0 @@ -/** - * - */ -package io.mosip.kernel.vidgenerator.constant; - -/** - * @author Dharmesh Khandelwal - * @since 1.0.0 - * - */ -public class HibernatePersistenceConstant { - - /** - * Private constructor for HibernatePersistenceConstants - */ - private HibernatePersistenceConstant() { - } - - /** - * The string field JAVAX_PERSISTENCE_JDBC_PASS - */ - public static final String JAVAX_PERSISTENCE_JDBC_PASS = "id_database_password"; - /** - * The string field JAVAX_PERSISTENCE_JDBC_USER - */ - public static final String JAVAX_PERSISTENCE_JDBC_USER = "id_database_username"; - /** - * The string field JAVAX_PERSISTENCE_JDBC_URL - */ - public static final String JAVAX_PERSISTENCE_JDBC_URL = "id_database_url"; - /** - * The string field JAVAX_PERSISTENCE_JDBC_DRIVER - */ - public static final String JAVAX_PERSISTENCE_JDBC_DRIVER = "javax.persistence.jdbc.driver"; - /** - * The string constant my sql dialect - */ - public static final String MY_SQL5_DIALECT = "org.hibernate.dialect.MySQL5Dialect"; - /** - * The string constant my sql dialect - */ - public static final String POSTGRESQL_95_DIALECT = "org.hibernate.dialect.PostgreSQLDialect"; - /** - * The string constant for hibernate statistics - */ - public static final String HIBERNATE_GENERATE_STATISTICS = "hibernate.generate_statistics"; - /** - * The string constant for use_structured_entries - */ - public static final String HIBERNATE_CACHE_USE_STRUCTURED_ENTRIES = "hibernate.cache.use_structured_entries"; - /** - * The string constant for use_query_cache - */ - public static final String HIBERNATE_CACHE_USE_QUERY_CACHE = "hibernate.cache.use_query_cache"; - /** - * The string constant for use_second_level_cache - */ - public static final String HIBERNATE_CACHE_USE_SECOND_LEVEL_CACHE = "hibernate.cache.use_second_level_cache"; - /** - * The string constant for charSet - */ - public static final String HIBERNATE_CONNECTION_CHAR_SET = "hibernate.connection.charSet"; - /** - * The string constant for format_sql - */ - public static final String HIBERNATE_FORMAT_SQL = "hibernate.format_sql"; - /** - * The string constant for show_sql - */ - public static final String HIBERNATE_SHOW_SQL = "hibernate.show_sql"; - /** - * The string constant for dialect - */ - public static final String HIBERNATE_DIALECT = "hibernate.dialect"; - /** - * The string constant for hbm2ddl - */ - public static final String HIBERNATE_HBM2DDL_AUTO = "hibernate.hbm2ddl.auto"; - /** - * The string constant for non_contextual_creation - */ - public static final String HIBERNATE_NON_CONTEXTUAL_CREATION = "hibernate.jdbc.lob.non_contextual_creation"; - /** - * The string constant for current_session_context_class - */ - public static final String HIBERNATE_CURRENT_SESSION_CONTEXT = "hibernate.current_session_context_class"; - - /** - * The string constant mosip package - */ - public static final String MOSIP_PACKAGE = "io.mosip.*"; - - /** - * The string constant false - */ - public static final String FALSE = "false"; - /** - * The string constant utf8 - */ - public static final String UTF8 = "utf8"; - /** - * The string constant true - */ - public static final String TRUE = "true"; - - /** - * The string constant update - */ - public static final String UPDATE = "update"; - /** - * The string constant jta - */ - public static final String JTA = "jta"; - /** - * The string constant hibernate - */ - public static final String HIBERNATE = "hibernate"; - /** - * - */ - public static final String HIBERNATE_EJB_INTERCEPTOR = "hibernate.ejb.interceptor"; - /** - * - */ - public static final String EMPTY_INTERCEPTOR = "hibernate.empty.interceptor"; - -} diff --git a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/vidgenerator/constant/VIDHealthConstants.java b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/vidgenerator/constant/VIDHealthConstants.java index 41432db25aa..c9a0a5cff27 100644 --- a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/vidgenerator/constant/VIDHealthConstants.java +++ b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/vidgenerator/constant/VIDHealthConstants.java @@ -70,4 +70,4 @@ public class VIDHealthConstants { */ public static final String OUTCOME = "outcome"; -} +} \ No newline at end of file diff --git a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/vidgenerator/verticle/VidPoolCheckerVerticle.java b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/vidgenerator/verticle/VidPoolCheckerVerticle.java index f4a25347ffd..e48ea7be461 100644 --- a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/vidgenerator/verticle/VidPoolCheckerVerticle.java +++ b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/vidgenerator/verticle/VidPoolCheckerVerticle.java @@ -35,7 +35,7 @@ public VidPoolCheckerVerticle(final ApplicationContext context) { this.context = context; this.vidService = this.context.getBean(VidService.class); this.environment = this.context.getBean(Environment.class); - this.threshold = environment.getProperty("mosip.kernel.vid.min-unused-threshold", Long.class); + this.threshold = environment.getProperty("mosip.kernel.vid.min-unused-threshold", Long.class, 100000L); } private AtomicBoolean locked = new AtomicBoolean(false); diff --git a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/vidgenerator/verticle/VidPopulatorVerticle.java b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/vidgenerator/verticle/VidPopulatorVerticle.java index ebc17d337ac..fb84ec7e4c0 100644 --- a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/vidgenerator/verticle/VidPopulatorVerticle.java +++ b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/vidgenerator/verticle/VidPopulatorVerticle.java @@ -31,7 +31,7 @@ public class VidPopulatorVerticle extends AbstractVerticle { @SuppressWarnings("unchecked") public VidPopulatorVerticle(final ApplicationContext context) { this.environment = context.getBean(Environment.class); - this.vidToGenerate = environment.getProperty("mosip.kernel.vid.vids-to-generate", Long.class); + this.vidToGenerate = environment.getProperty("mosip.kernel.vid.vids-to-generate", Long.class, 200000L); this.vidWriter = context.getBean("vidWriter", VidWriter.class); this.metaDataUtil = context.getBean(VIDMetaDataUtil.class); this.vidGenerator = context.getBean(VidGenerator.class); diff --git a/kernel/kernel-idgenerator-service/src/test/java/io/mosip/kernel/idgenerator/test/config/ExceptionDaoConfig.java b/kernel/kernel-idgenerator-service/src/test/java/io/mosip/kernel/idgenerator/test/config/ExceptionDaoConfig.java index bd09f0aafa9..645d6b4b6ef 100644 --- a/kernel/kernel-idgenerator-service/src/test/java/io/mosip/kernel/idgenerator/test/config/ExceptionDaoConfig.java +++ b/kernel/kernel-idgenerator-service/src/test/java/io/mosip/kernel/idgenerator/test/config/ExceptionDaoConfig.java @@ -3,7 +3,6 @@ import java.util.HashMap; import java.util.Map; -import jakarta.persistence.EntityManagerFactory; import javax.sql.DataSource; import org.mockito.Mockito; @@ -33,8 +32,8 @@ import io.mosip.kernel.core.authmanager.authadapter.spi.VertxAuthenticationProvider; import io.mosip.kernel.core.signatureutil.spi.SignatureUtil; -import io.mosip.kernel.vidgenerator.constant.HibernatePersistenceConstant; -import io.mosip.kernel.vidgenerator.service.VidService; +import io.mosip.kernel.idgenerator.constant.HibernatePersistenceConstant; +import jakarta.persistence.EntityManagerFactory; /** * Configuration class for IDGenerator diff --git a/kernel/kernel-idgenerator-service/src/test/java/io/mosip/kernel/idgenerator/test/config/HibernateDaoConfig.java b/kernel/kernel-idgenerator-service/src/test/java/io/mosip/kernel/idgenerator/test/config/HibernateDaoConfig.java index 2bdc55d1164..41b8e713b4e 100644 --- a/kernel/kernel-idgenerator-service/src/test/java/io/mosip/kernel/idgenerator/test/config/HibernateDaoConfig.java +++ b/kernel/kernel-idgenerator-service/src/test/java/io/mosip/kernel/idgenerator/test/config/HibernateDaoConfig.java @@ -32,7 +32,7 @@ import com.zaxxer.hikari.HikariDataSource; import io.mosip.kernel.core.authmanager.authadapter.spi.VertxAuthenticationProvider; -import io.mosip.kernel.vidgenerator.constant.HibernatePersistenceConstant; +import io.mosip.kernel.idgenerator.constant.HibernatePersistenceConstant; /** * Configuration class for IDGenerator diff --git a/kernel/kernel-idgenerator-service/src/test/java/io/mosip/kernel/idgenerator/test/config/UinNullDaoConfig.java b/kernel/kernel-idgenerator-service/src/test/java/io/mosip/kernel/idgenerator/test/config/UinNullDaoConfig.java index 4feb37daaab..f1007e08a86 100644 --- a/kernel/kernel-idgenerator-service/src/test/java/io/mosip/kernel/idgenerator/test/config/UinNullDaoConfig.java +++ b/kernel/kernel-idgenerator-service/src/test/java/io/mosip/kernel/idgenerator/test/config/UinNullDaoConfig.java @@ -3,7 +3,6 @@ import java.util.HashMap; import java.util.Map; -import jakarta.persistence.EntityManagerFactory; import javax.sql.DataSource; import org.mockito.Mockito; @@ -32,12 +31,8 @@ import com.zaxxer.hikari.HikariDataSource; import io.mosip.kernel.core.authmanager.authadapter.spi.VertxAuthenticationProvider; -import io.mosip.kernel.core.signatureutil.spi.SignatureUtil; -import io.mosip.kernel.uingenerator.service.UinService; -import io.mosip.kernel.uingenerator.service.impl.UinServiceImpl; -import io.mosip.kernel.vidgenerator.constant.HibernatePersistenceConstant; -import io.mosip.kernel.vidgenerator.service.VidService; -import io.mosip.kernel.vidgenerator.service.impl.VidServiceImpl; +import io.mosip.kernel.idgenerator.constant.HibernatePersistenceConstant; +import jakarta.persistence.EntityManagerFactory; /** * Configuration class for IDGenerator diff --git a/kernel/kernel-notification-service/src/main/java/io/mosip/kernel/emailnotification/service/impl/EmailNotificationServiceImpl.java b/kernel/kernel-notification-service/src/main/java/io/mosip/kernel/emailnotification/service/impl/EmailNotificationServiceImpl.java index e16acce7706..d2f0a091c41 100644 --- a/kernel/kernel-notification-service/src/main/java/io/mosip/kernel/emailnotification/service/impl/EmailNotificationServiceImpl.java +++ b/kernel/kernel-notification-service/src/main/java/io/mosip/kernel/emailnotification/service/impl/EmailNotificationServiceImpl.java @@ -84,7 +84,7 @@ public ResponseDto sendEmail(String[] mailTo, String[] mailCc, String mailSubjec } @Async - private void send(String[] mailTo, String[] mailCc, String mailSubject, String mailContent, + public void send(String[] mailTo, String[] mailCc, String mailSubject, String mailContent, MultipartFile[] attachments) { EmailNotificationUtils.validateMailArguments(fromEmailAddress, mailTo, mailSubject, mailContent); /** diff --git a/kernel/kernel-pridgenerator-service/src/main/java/io/mosip/kernel/pridgenerator/verticle/PridPoolCheckerVerticle.java b/kernel/kernel-pridgenerator-service/src/main/java/io/mosip/kernel/pridgenerator/verticle/PridPoolCheckerVerticle.java index 1e6da673cc4..55f70af694f 100644 --- a/kernel/kernel-pridgenerator-service/src/main/java/io/mosip/kernel/pridgenerator/verticle/PridPoolCheckerVerticle.java +++ b/kernel/kernel-pridgenerator-service/src/main/java/io/mosip/kernel/pridgenerator/verticle/PridPoolCheckerVerticle.java @@ -35,7 +35,7 @@ public PridPoolCheckerVerticle(final ApplicationContext context) { this.context = context; this.PridService = this.context.getBean(PridService.class); this.environment = this.context.getBean(Environment.class); - this.threshold = environment.getProperty("mosip.kernel.prid.min-unused-threshold", Long.class); + this.threshold = environment.getProperty("mosip.kernel.prid.min-unused-threshold", Long.class, 1000L); } private AtomicBoolean locked = new AtomicBoolean(false); diff --git a/kernel/kernel-pridgenerator-service/src/main/java/io/mosip/kernel/pridgenerator/verticle/PridPopulatorVerticle.java b/kernel/kernel-pridgenerator-service/src/main/java/io/mosip/kernel/pridgenerator/verticle/PridPopulatorVerticle.java index 96b083c73ae..87419381fd1 100644 --- a/kernel/kernel-pridgenerator-service/src/main/java/io/mosip/kernel/pridgenerator/verticle/PridPopulatorVerticle.java +++ b/kernel/kernel-pridgenerator-service/src/main/java/io/mosip/kernel/pridgenerator/verticle/PridPopulatorVerticle.java @@ -31,7 +31,7 @@ public class PridPopulatorVerticle extends AbstractVerticle { @SuppressWarnings("unchecked") public PridPopulatorVerticle(final ApplicationContext context) { this.environment = context.getBean(Environment.class); - this.pridToGenerate = environment.getProperty("mosip.kernel.prid.prids-to-generate", Long.class); + this.pridToGenerate = environment.getProperty("mosip.kernel.prid.prids-to-generate", Long.class, 2000L); this.pridWriter = context.getBean("pridWriter", PridWriter.class); this.metaDataUtil = context.getBean("metaDataUtil", MetaDataUtil.class); this.pridGenerator = context.getBean(PridGenerator.class);