MOSIP-40013

commons-packet/commons-packet-manager/pom.xml

@@ -38,7 +38,7 @@
         <kernel.auth.adaptor.version>1.2.1-SNAPSHOT</kernel.auth.adaptor.version>
         <kernel-dataaccess-hibernate.version>1.2.1-SNAPSHOT</kernel-dataaccess-hibernate.version>
         <kernel.logger.logback.version>1.2.1-SNAPSHOT</kernel.logger.logback.version>
-        <khazana.version>1.2.1-SNAPSHOT</khazana.version>
+        <khazana.version>1.2.2-SNAPSHOT</khazana.version>
          <kernel.bom.version>1.2.1-SNAPSHOT</kernel.bom.version>
          <mockito.core.version>3.11.2</mockito.core.version>
         <sonar.coverage.exclusions>**/constants/**,**/config/**,**/audit/**,**/util/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Utils.java,**/*Validator.java,**/*Helper.java,**/verticle/**,**/VidWriter.java/**,**/masterdata/utils/**,**/spi/**,**/core/http/**,"**/LocationServiceImpl.java","**/RegistrationCenterMachineServiceImpl.java","**/RegistrationCenterServiceImpl.java","**/pridgenerator/**","**/idgenerator/prid","**/proxy/**","**/cryptosignature/**"</sonar.coverage.exclusions>

commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/audit/AuditLogEntry.java

@@ -94,5 +94,4 @@ public String addAudit(String description, String eventId,
 
 		return responseWrapper != null ? responseWrapper.getBody() : null;
 	}
-
-}
+}

commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/audit/ServerUtil.java

@@ -1,21 +1,21 @@
 package io.mosip.commons.packet.audit;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class ServerUtil {
 
 	/** The server instance. */
 	private static ServerUtil serverInstance = null;
-	
+
 	/** The Constant LOGGER. */
 	private static final Logger LOGGER = LoggerFactory.getLogger(ServerUtil.class);
-	
+
 	/** The host not found. */
-	private String noHost  = "HOST_NOT_FOUND";
+	private String noHost = "HOST_NOT_FOUND";
 
 	/**
 	 * 
@@ -38,7 +38,6 @@ public static synchronized ServerUtil getServerUtilInstance() {
 		} else {
 			return serverInstance;
 		}
-
 	}
 
 	/**
@@ -48,14 +47,12 @@ public static synchronized ServerUtil getServerUtilInstance() {
 	 *
 	 */
 	public String getServerIp() {
-
 		try {
 			return InetAddress.getLocalHost().getHostAddress();
 		} catch (UnknownHostException e) {
 			LOGGER.error(noHost, e.getMessage());
 			return "UNKNOWN-HOST";
 		}
-
 	}
 
 	/**
@@ -72,5 +69,4 @@ public String getServerName() {
 			return "UNKNOWN-HOST";
 		}
 	}
-
-}
+}

commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/config/OfflineConfig.java

@@ -13,4 +13,4 @@
 @EnableJpaRepositories(basePackages = {"io.mosip.kernel.keymanagerservice.repository.*"})
 public class OfflineConfig {
 
-}
+}

commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/config/PacketManagerConfig.java

@@ -53,16 +53,7 @@ public class PacketManagerConfig {
      */
     @PostConstruct
     public void validateReferenceReaderProvider() throws ClassNotFoundException {
-		Set<String> readerProviders = PacketHelper.getReaderProvider(packetReaderConfig);
-            if (!CollectionUtils.isEmpty(readerProviders)) {
-                for (String className : readerProviders) {
-                    logger.debug(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.ID.toString(), null,
-                            "Validating the reference provider readers are present or not.");
-                    getBean(className);
-                }
-            } else
-            logger.debug(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.ID.toString(), null,
-                    "Reference provider reader class is not provided.");
+    	validateProviders(PacketHelper.getReaderProvider(packetReaderConfig), "reader");
     }
 
     /**
@@ -72,16 +63,7 @@ public void validateReferenceReaderProvider() throws ClassNotFoundException {
      */
     @PostConstruct
     public void validateReferenceWriterProvider() throws ClassNotFoundException {
-		Set<String> writerProviders = PacketHelper.getWriterProvider(packetWriterConfig);
-        if (!CollectionUtils.isEmpty(writerProviders)) {
-            for (String className : writerProviders) {
-                logger.debug(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.ID.toString(), null,
-                        "Validating the reference provider writers are present or not.");
-                getBean(className);
-            }
-        } else
-            logger.debug(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.ID.toString(), null,
-                "Reference provider writer class is not provided.");
+    	validateProviders(PacketHelper.getWriterProvider(packetWriterConfig), "writer");
     }
 
     /**
@@ -95,19 +77,7 @@ public void validateReferenceWriterProvider() throws ClassNotFoundException {
     @Bean
     @Lazy
     public List<IPacketReader> referenceReaderProviders() throws ClassNotFoundException {
-        List<IPacketReader> iPacketReaders = new ArrayList<>();
-		Set<String> readerProviders = PacketHelper.getReaderProvider(packetReaderConfig);
-        if (!CollectionUtils.isEmpty(readerProviders)) {
-            for (String className : readerProviders) {
-                logger.debug(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.ID.toString(), null,
-                        "Validating the reference provider readers are present or not.");
-                iPacketReaders.add((IPacketReader) getBean(className));
-            }
-        } else {
-            logger.debug(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.ID.toString(), null,
-                    "reference provider reader is not present.");
-        }
-        return iPacketReaders;
+        return loadProviders(PacketHelper.getReaderProvider(packetReaderConfig), IPacketReader.class);
     }
 
     /**
@@ -121,23 +91,56 @@ public List<IPacketReader> referenceReaderProviders() throws ClassNotFoundExcept
     @Bean
     @Lazy
     public List<IPacketWriter> referenceWriterProviders() throws ClassNotFoundException {
-        List<IPacketWriter> iPacketWriters = new ArrayList<>();
-		Set<String> writerProviders = PacketHelper.getWriterProvider(packetWriterConfig);
-        if (!CollectionUtils.isEmpty(writerProviders)) {
-            for (String className : writerProviders) {
+        return loadProviders(PacketHelper.getWriterProvider(packetWriterConfig), IPacketWriter.class);
+    }
+
+    private void validateProviders(Set<String> classNames, String type) {
+        if (CollectionUtils.isEmpty(classNames)) {
+            logger.warn(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.ID.toString(), null,
+                    String.format("No reference provider %s classes provided.", type));
+            return;
+        }
+
+        for (String className : classNames) {
+            try {
                 logger.debug(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.ID.toString(), null,
-                        "Validating the reference provider writers are present or not.");
-                iPacketWriters.add((IPacketWriter) getBean(className));
+                        String.format("Validating reference provider %s class: %s", type, className));
+                getBean(className);
+            } catch (RuntimeException e) {
+                logger.error(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.ID.toString(), null,
+                        String.format("Invalid %s class %s: %s", type, className, e.getMessage()));
+                throw e;
             }
-        } else {
-            logger.debug(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.ID.toString(), null,
-                    "reference provider writer is not present.");
         }
-        return iPacketWriters;
     }
-
-    private Object getBean(String className) throws ClassNotFoundException {
-        Class<?> clazz = Class.forName(className);
-        return applicationContext.getBean(clazz);
+
+    private <T> List<T> loadProviders(Set<String> classNames, Class<T> expectedType) {
+        List<T> providers = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(classNames)) {
+            for (String className : classNames) {
+                Object bean = getBean(className);
+                if (expectedType.isInstance(bean)) {
+                    providers.add(expectedType.cast(bean));
+                } else {
+                    throw new IllegalArgumentException(String.format("Bean %s is not of expected type %s", className, expectedType.getSimpleName()));
+                }
+            }
+        }
+        return providers;
+    }
+
+    private Object getBean(String className) {
+        try {
+            if (className == null || className.trim().isEmpty()) {
+                throw new ClassNotFoundException("Invalid class name: " + className);
+            }
+            className = className.replace(":", "").trim();
+            Class<?> clazz = Class.forName(className.trim());
+            return applicationContext.getBean(clazz);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException("Class not found: " + className, e);
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to load bean: " + className, e);
+        }
     }
-}
+}

commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/config/PacketReaderAndWriterConfig.java

@@ -27,4 +27,4 @@ public Map<String, String> readerConfiguration() {
 	public Map<String, String> writerConfiguration() {
 		return new HashMap<>();
 	}
-}
+}

commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/constants/PacketUtilityErrorCodes.java

@@ -30,7 +30,7 @@ public enum PacketUtilityErrorCodes {
 	TAG_NOT_FOUND("KER-PUT-024", "Requested tag not present"),
 	SOURCE_NOT_PRESENT("KER-PUT-025", "Invalid source or process."),
 	DELETE_TAGGING_FAILED("KER-PUT-026", "Failed to delete tags."),
-	OBJECT_DOESNOT_EXISTS("KER-PUT-027", "Object doesnot exists."),
+	OBJECT_DOESNOT_EXISTS("KER-PUT-027", "Object does not exists."),
 	UNKNOWN_EXCEPTION("KER-PUT-028", "Unknown Exception.");
 
 

commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/dto/packet/CryptomanagerRequestDto.java

@@ -59,4 +59,4 @@ public class CryptomanagerRequestDto {
 
 	@NotBlank(message = "should not be null or empty")
 	private String aad;
-}
+}

commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/dto/packet/CryptomanagerResponseDto.java

@@ -1,7 +1,5 @@
 package io.mosip.commons.packet.dto.packet;
 
-
-
 import io.mosip.kernel.core.http.ResponseWrapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;