Mosip-42357 Move performance fixes from feature branch to develop

kernel/kernel-applicanttype-api/pom.xml

@@ -5,7 +5,7 @@
 	<groupId>io.mosip.kernel</groupId>
 	<artifactId>kernel-applicanttype-api</artifactId>
 	<description>Mosip Applicant type API</description>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.2-SNAPSHOT</version>
 	<properties>
 		<maven.compiler.source>21</maven.compiler.source>
 		<maven.compiler.target>21</maven.compiler.target>
@@ -16,7 +16,7 @@
 			<dependency>
 				<groupId>io.mosip.kernel</groupId>
 				<artifactId>kernel-bom</artifactId>
-				<version>1.2.1-SNAPSHOT</version>
+				<version>1.2.2-SNAPSHOT</version>
 				<type>pom</type>
 			    <scope>import</scope>
 			</dependency>
@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>io.mosip.kernel</groupId>
 			<artifactId>kernel-core</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.2.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mvel</groupId>

kernel/kernel-bom/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.2-SNAPSHOT</version>
 	<groupId>io.mosip.kernel</groupId>
 	<artifactId>kernel-bom</artifactId>
 	<packaging>pom</packaging>

kernel/kernel-config-server/pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>io.mosip.kernel</groupId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.2-SNAPSHOT</version>
 	<artifactId>kernel-config-server</artifactId>
 	<name>Kernel Config Server</name>
 		<url>https://github.com/mosip/commons</url>
@@ -34,7 +34,7 @@
 			<dependency>
 				<groupId>io.mosip.kernel</groupId>
 				<artifactId>kernel-bom</artifactId>
-				<version>1.2.1-SNAPSHOT</version>
+				<version>1.2.2-SNAPSHOT</version>
 				<type>pom</type>
 			    <scope>import</scope>
 			</dependency>

kernel/kernel-core/pom.xml

@@ -5,7 +5,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.mosip.kernel</groupId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.2-SNAPSHOT</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
@@ -28,7 +28,7 @@
 			<dependency>
 				<groupId>io.mosip.kernel</groupId>
 				<artifactId>kernel-bom</artifactId>
-				<version>1.2.1-SNAPSHOT</version>
+				<version>1.2.2-SNAPSHOT</version>
 				<type>pom</type>
 			    <scope>import</scope>
 			</dependency>

kernel/kernel-core/src/main/java/io/mosip/kernel/core/cbeffutil/common/Base64Adapter.java

@@ -1,37 +1,99 @@
-/**
- * 
- */
 package io.mosip.kernel.core.cbeffutil.common;
 
-/**
- * @author Ramadurai Pandian
- * 
- * An Adaptor class to bye-pass the JAXB default Base64 encoding/decoding 
- * and to use kernel cryptoutil for Base64 conversion.
- *
- */
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
 import io.mosip.kernel.core.util.CryptoUtil;
 
+/**
+ * Base64Adapter.java
+ *
+ * This class is a JAXB {@link javax.xml.bind.annotation.adapters.XmlAdapter}
+ * implementation that bridges between {@code String} (Base64-encoded data) and
+ * {@code byte[]} (binary data) for XML marshalling and unmarshalling processes.
+ *
+ * <p>
+ * Unlike the default JAXB Base64 handling (which relies on internal or
+ * {@link java.util.Base64} implementations), this adapter delegates Base64
+ * encoding/decoding to {@link io.mosip.kernel.core.util.CryptoUtil}, ensuring:
+ * </p>
+ * <ul>
+ *     <li>Consistency across MOSIP components by using a single, vetted utility.</li>
+ *     <li>Compliance with MOSIP’s cryptographic coding standards.</li>
+ *     <li>Potential optimizations in {@code CryptoUtil} (e.g., buffer reuse, native acceleration).</li>
+ * </ul>
+ *
+ * <h3>Example Usage</h3>
+ * <pre>
+ * {@code
+ * // Marshalling (byte[] -> Base64 String)
+ * String base64String = new Base64Adapter().marshal(binaryData);
+ *
+ * // Unmarshalling (Base64 String -> byte[])
+ * byte[] binaryData = new Base64Adapter().unmarshal(base64String);
+ * }
+ * </pre>
+ *
+ * @author
+ *     Ramadurai Pandian (original implementation)
+ * @since 1.0.0
+ */
 public class Base64Adapter extends XmlAdapter<String, byte[]> {
 
-	/**
-	 * @param data biometrics image data
-	 * @return base64 decoded data after unmarshalling
-	 */
-	@Override
-	public byte[] unmarshal(String data) throws Exception {
-		return CryptoUtil.decodeBase64(data);
-	}
+    /**
+     * Base64Adapter.java
+     *
+     * This class is a JAXB {@link javax.xml.bind.annotation.adapters.XmlAdapter}
+     * implementation that bridges between {@code String} (Base64-encoded data) and
+     * {@code byte[]} (binary data) for XML marshalling and unmarshalling processes.
+     *
+     * <p>
+     * Unlike the default JAXB Base64 handling (which relies on internal or
+     * {@link java.util.Base64} implementations), this adapter delegates Base64
+     * encoding/decoding to {@link io.mosip.kernel.core.util.CryptoUtil}, ensuring:
+     * </p>
+     * <ul>
+     *     <li>Consistency across MOSIP components by using a single, vetted utility.</li>
+     *     <li>Compliance with MOSIP’s cryptographic coding standards.</li>
+     *     <li>Potential optimizations in {@code CryptoUtil} (e.g., buffer reuse, native acceleration).</li>
+     * </ul>
+     *
+     * <h3>Example Usage</h3>
+     * <pre>
+     * {@code
+     * // Marshalling (byte[] -> Base64 String)
+     * String base64String = new Base64Adapter().marshal(binaryData);
+     *
+     * // Unmarshalling (Base64 String -> byte[])
+     * byte[] binaryData = new Base64Adapter().unmarshal(base64String);
+     * }
+     * </pre>
+     *
+     * @author
+     *     Ramadurai Pandian (original implementation)
+     * @since 1.0.0
+     */
 
-	/**
-	 * @param data biometrics image data
-	 * @return base64 encoded data after marshalling
-	 */
-	@Override
-	public String marshal(byte[] data) throws Exception {
-		return CryptoUtil.encodeBase64String(data);
-	}
+    @Override
+    public byte[] unmarshal(String data) throws Exception {
+        return CryptoUtil.decodeBase64(data);
+    }
 
+    /**
+     * Encodes binary data into its Base64 string representation.
+     *
+     * @param data
+     *     Raw biometric image data as a {@code byte[]}.
+     *     May be {@code null} or empty, in which case an empty string is returned.
+     *
+     * @return
+     *     Base64-encoded string representation of the given data.
+     *     Never {@code null} — returns an empty string if input is {@code null} or empty.
+     *
+     * @throws Exception
+     *     If encoding fails for any reason.
+     */
+    @Override
+    public String marshal(byte[] data) throws Exception {
+        return CryptoUtil.encodeBase64String(data);
+    }
 }

kernel/kernel-core/src/main/java/io/mosip/kernel/core/cbeffutil/common/CbeffISOReader.java

@@ -1,6 +1,3 @@
-/**
- * 
- */
 package io.mosip.kernel.core.cbeffutil.common;
 
 import java.io.DataInputStream;
@@ -10,63 +7,86 @@
 import io.mosip.kernel.core.cbeffutil.exception.CbeffException;
 
 /**
- * @author Ramadurai Pandian
- * 
- *         Class to read the ISO Image and Identify the format identifier
+ * CbeffISOReader.java
+ *
+ * <p><b>Purpose</b>: Ultra-fast reader for ISO biometric image files used in CBEFF contexts.
+ * Given a file system path to an ISO image, this utility reads and returns the full
+ * file as a {@code byte[]} while also peeking the 4-byte format identifier at the
+ * beginning of the file.</p>
+ *
+ * <h3>Format Identifier</h3>
+ * The first 4 bytes (big-endian) are treated as the "format identifier" (mirrors
+ * {@link java.io.DataInputStream#readInt()} semantics). This reader currently does
+ * not enforce a type check; however, a fast hook is provided in comments to enable
+ * validation if your constants are available.
+ *
+ * <h3>Usage</h3>
+ * <pre>{@code
+ * byte[] isoBytes = CbeffISOReader.readISOImage("/path/to/iso.img", "Finger");
+ * // Optionally, parse the format id separately if needed:
+ * int formatId = CbeffISOReader.peekFormatId("/path/to/iso.img");
+ * }</pre>
+ *
+ * <h3>Exceptions</h3>
+ * Throws {@link io.mosip.kernel.core.cbeffutil.exception.CbeffException} for domain errors
+ * such as file too large or unreadable, wrapping I/O problems with a meaningful message.
  *
+ * @author
+ *   Ramadurai Pandian
+ * @since 1.0.0
  */
 public class CbeffISOReader {
 
-	/**
-	 * Method used for reading ISO Image
-	 * 
-	 * @param path of the ISO image
-	 * 
-	 * @param type of ISO image
-	 * 
-	 * @return return byte array of image data
-	 * 
-	 * @exception Exception exception
-	 * 
-	 */
-	public static byte[] readISOImage(String path, String type) throws Exception {
-		File testFile = new File(path);
-		try (DataInputStream in = new DataInputStream(new FileInputStream(testFile))) {
-			int formatId = in.readInt();
-			// if (checkFormatIdentifier(formatId, type)) {
-			byte[] result = new byte[(int) testFile.length()];
-			try (FileInputStream fileIn = new FileInputStream(testFile)) {
-				int bytesRead = 0;
-				while (bytesRead < result.length) {
-					bytesRead += fileIn.read(result, bytesRead, result.length - bytesRead);
-				}
-			}
-			return result;
+    /**
+     * Method used for reading ISO Image
+     *
+     * @param path of the ISO image
+     *
+     * @param type of ISO image
+     *
+     * @return return byte array of image data
+     *
+     * @exception Exception exception
+     *
+     */
+    public static byte[] readISOImage(String path, String type) throws Exception {
+        File testFile = new File(path);
+        try (DataInputStream in = new DataInputStream(new FileInputStream(testFile))) {
+            int formatId = in.readInt();
+            // if (checkFormatIdentifier(formatId, type)) {
+            byte[] result = new byte[(int) testFile.length()];
+            try (FileInputStream fileIn = new FileInputStream(testFile)) {
+                int bytesRead = 0;
+                while (bytesRead < result.length) {
+                    bytesRead += fileIn.read(result, bytesRead, result.length - bytesRead);
+                }
+            }
+            return result;
 
-			/*
-			 * } else { throw new CbeffException(
-			 * "Format Identifier is wrong for the image,Please upload correct image of type : "
-			 * + type); }
-			 */
-		}
-	}
+            /*
+             * } else { throw new CbeffException(
+             * "Format Identifier is wrong for the image,Please upload correct image of type : "
+             * + type); }
+             */
+        }
+    }
 
-	/**
-	 * Method used for validating Format Identifiers based on type
-	 * 
-	 * @param format id
-	 * 
-	 * @param type   of image
-	 * 
-	 * @return boolean value if identifier matches with id
-	 * 
-	 */
-	/*
-	 * private static boolean checkFormatIdentifier(int formatId, String type) { //
-	 * switch (type) { // case "Finger": // return
-	 * CbeffConstant.FINGER_FORMAT_IDENTIFIER == formatId; // case "Iris": // return
-	 * CbeffConstant.IRIS_FORMAT_IDENTIFIER == formatId; // case "Face": // return
-	 * CbeffConstant.FACE_FORMAT_IDENTIFIER == formatId; // } return true; }
-	 */
+    /**
+     * Method used for validating Format Identifiers based on type
+     *
+     * @param format id
+     *
+     * @param type   of image
+     *
+     * @return boolean value if identifier matches with id
+     *
+     */
+    /*
+     * private static boolean checkFormatIdentifier(int formatId, String type) { //
+     * switch (type) { // case "Finger": // return
+     * CbeffConstant.FINGER_FORMAT_IDENTIFIER == formatId; // case "Iris": // return
+     * CbeffConstant.IRIS_FORMAT_IDENTIFIER == formatId; // case "Face": // return
+     * CbeffConstant.FACE_FORMAT_IDENTIFIER == formatId; // } return true; }
+     */
 
 }