Merge pull request #989 from balaji-alluru/release-1.2.0.x

ES-519
mosip · May 30, 2024 · 1105f7a · 1105f7a
2 parents 86640e4 + ab76642
commit 1105f7a
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 17 deletions.
diff --git a/kernel/kernel-ref-idobjectvalidator/pom.xml b/kernel/kernel-ref-idobjectvalidator/pom.xml
@@ -4,12 +4,12 @@
 	<parent>
 		<groupId>io.mosip.kernel</groupId>
 		<artifactId>kernel-ref-parent</artifactId>
-		<version>1.2.0.1</version>
+		<version>1.2.0.2-SNAPSHOT</version>
 	</parent>
 
 	<name>kernel-ref-idobjectvalidator</name>
 	<artifactId>kernel-ref-idobjectvalidator</artifactId>
-	<version>1.2.0.1</version>
+	<version>1.2.0.2-SNAPSHOT</version>
 
 	<properties>
 		<kernel-core.version>1.2.0.1</kernel-core.version>

diff --git a/kernel/kernel-smsserviceprovider-msg91/README.md b/kernel/kernel-smsserviceprovider-msg91/README.md
@@ -28,7 +28,9 @@ Its expected that the adopters do not change the controller and the REST api.
  #-----------------------------VID Properties--------------------------------------
 mosip.kernel.sms.enabled=true
 mosip.kernel.sms.country.code=91
-mosip.kernel.sms.number.length=10
+mosip.kernel.sms.number.min.length=10
+mosip.kernel.sms.number.max.length=10
+
 
 
 #----------msg91 gateway---------------

diff --git a/kernel/kernel-smsserviceprovider-msg91/pom.xml b/kernel/kernel-smsserviceprovider-msg91/pom.xml
@@ -7,7 +7,7 @@
 	<name>kernel-smsserviceprovider-msg91</name>
 	<description>kernel-smsserviceprovider-msg91</description>
 	<url>https://github.com/mosip/commons</url>
-	<version>1.2.0.1</version>
+	<version>1.2.0.2-SNAPSHOT</version>
 <properties>		
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 

diff --git a/...1/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/impl/SMSServiceProviderImpl.java b/...1/src/main/java/io/mosip/kernel/smsserviceprovider/msg91/impl/SMSServiceProviderImpl.java
@@ -36,8 +36,11 @@ public class SMSServiceProviderImpl implements SMSServiceProvider {
 	@Value("${mosip.kernel.sms.country.code}")
 	String countryCode;
 
-	@Value("${mosip.kernel.sms.number.length}")
-	int numberLength;
+	@Value("${mosip.kernel.sms.number.min.length}")
+	int numberMinLength;
+
+	@Value("${mosip.kernel.sms.number.max.length}")
+	int numberMaxLength;
 
 	@Value("${mosip.kernel.sms.api}")
 	String api;
@@ -82,12 +85,16 @@ public SMSResponseDto sendSms(String contactNumber, String message) {
 	}
 
 	private void validateInput(String contactNumber) {
-		if (!StringUtils.isNumeric(contactNumber) || contactNumber.length() < numberLength
-				|| contactNumber.length() > numberLength) {
+		if (!StringUtils.isNumeric(contactNumber) || (!inRange(contactNumber.length(), numberMinLength,
+				numberMaxLength))) {
 			throw new InvalidNumberException(SmsExceptionConstant.SMS_INVALID_CONTACT_NUMBER.getErrorCode(),
-					SmsExceptionConstant.SMS_INVALID_CONTACT_NUMBER.getErrorMessage() + numberLength
-							+ SmsPropertyConstant.SUFFIX_MESSAGE.getProperty());
+					SmsExceptionConstant.SMS_INVALID_CONTACT_NUMBER.getErrorMessage() + numberMinLength + "-"
+							+ numberMaxLength + SmsPropertyConstant.SUFFIX_MESSAGE.getProperty());
 		}
 	}
 
+	private boolean inRange(int value, int min, int max) {
+		return (value >= min) && (value <= max);
+	}
+
 }
diff --git a/...1/src/test/java/io/mosip/kernel/smsserviceprovider/msg91/test/SmsServiceProviderTest.java b/...1/src/test/java/io/mosip/kernel/smsserviceprovider/msg91/test/SmsServiceProviderTest.java
@@ -63,9 +63,6 @@ public PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer
 	@Value("${mosip.kernel.sms.route}")
 	String route;
 
-	@Value("${mosip.kernel.sms.number.length}")
-	String length;
-
 	@Test
 	public void sendSmsTest() {
 

diff --git a/kernel/kernel-smsserviceprovider-msg91/src/test/resources/application.properties b/kernel/kernel-smsserviceprovider-msg91/src/test/resources/application.properties
@@ -1,6 +1,7 @@
 mosip.kernel.sms.enabled=true
 mosip.kernel.sms.country.code=91
-mosip.kernel.sms.number.length=10
+mosip.kernel.sms.number.min.length=10
+mosip.kernel.sms.number.max.length=10
 
 
 #----------msg91 gateway---------------

diff --git a/kernel/kernel-virusscanner-clamav/pom.xml b/kernel/kernel-virusscanner-clamav/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
                 <groupId>io.mosip.kernel</groupId>
                 <artifactId>kernel-ref-parent</artifactId>
-                <version>1.2.0.1</version>
+                <version>1.2.0.2-SNAPSHOT</version>
         </parent>
 
 	<artifactId>kernel-virusscanner-clamav</artifactId>
-    	<version>1.2.0.1</version>
+    	<version>1.2.0.2-SNAPSHOT</version>
 	<properties>		
 		<kernel.core.version>1.2.0.1</kernel.core.version>
 		<maven.compiler.source>11</maven.compiler.source>

diff --git a/kernel/pom.xml b/kernel/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.mosip.kernel</groupId>
 	<artifactId>kernel-ref-parent</artifactId>
-	<version>1.2.0.1</version>
+	<version>1.2.0.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>kernel</name>
 	<description>Parent project of MOSIP Kernel  Referernce Implementation components</description>