From b25a68ad07f6514ec99af2186675d8e279fbf649 Mon Sep 17 00:00:00 2001
From: lashini <lashini@wso2.com>
Date: Fri, 24 Jan 2025 17:13:33 +0530
Subject: [PATCH 1/5] [Spring Cleanup] Remove Spring dependencies in the Input
 Validation API

---
 .../pom.xml                                   |  7 +--
 .../common/InputValidationServiceHolder.java  | 23 ++++----
 .../InputValidationOSGiServiceFactory.java    | 54 -------------------
 .../pom.xml                                   |  7 +--
 .../validation/v1/ValidationRulesApi.java     | 13 +++--
 .../ValidationRulesApiServiceFactory.java     |  6 +--
 .../ValidationRulesManagementApiService.java  | 42 ++++++++-------
 ...ationRulesManagementApiServiceFactory.java | 51 ++++++++++++++++++
 .../impl/ValidationRulesApiServiceImpl.java   | 32 +++++++----
 .../cxf/input-validation-server-v1-cxf.xml    | 29 ----------
 10 files changed, 119 insertions(+), 145 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/src/main/java/org/wso2/carbon/identity/api/server/input/validation/common/factory/InputValidationOSGiServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesManagementApiServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/resources/META-INF/cxf/input-validation-server-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
index 29ba7130d0..2cb4992672 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2022, WSO2 LLC. (http://www.wso2.org).
+  ~ Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.org).
   ~
   ~ WSO2 LLC. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
@@ -43,11 +43,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.utils</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/src/main/java/org/wso2/carbon/identity/api/server/input/validation/common/InputValidationServiceHolder.java b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/src/main/java/org/wso2/carbon/identity/api/server/input/validation/common/InputValidationServiceHolder.java
index 5de474e288..d99ccff700 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/src/main/java/org/wso2/carbon/identity/api/server/input/validation/common/InputValidationServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/src/main/java/org/wso2/carbon/identity/api/server/input/validation/common/InputValidationServiceHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -18,6 +18,7 @@
 
 package org.wso2.carbon.identity.api.server.input.validation.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.input.validation.mgt.services.InputValidationManagementService;
 
 /**
@@ -25,7 +26,13 @@
  */
 public class InputValidationServiceHolder {
 
-    private static InputValidationManagementService inputValidationMgtService;
+    private InputValidationServiceHolder () {};
+
+    private static class InputValidationManagementServiceHolder {
+        static final InputValidationManagementService SERVICE = (InputValidationManagementService)
+                PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                        .getOSGiService(InputValidationManagementService.class, null);
+    }
 
     /**
      * Get InputValidationMgtService OSGi service.
@@ -34,16 +41,6 @@ public class InputValidationServiceHolder {
      */
     public static InputValidationManagementService getInputValidationMgtService() {
 
-        return inputValidationMgtService;
-    }
-
-    /**
-     * Set InputValidationMgtService OSGi service.
-     *
-     * @param inputValidationMgtService Input Validation Management Service.
-     */
-    public static void setInputValidationMgtService(InputValidationManagementService inputValidationMgtService) {
-
-        InputValidationServiceHolder.inputValidationMgtService = inputValidationMgtService;
+        return InputValidationManagementServiceHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/src/main/java/org/wso2/carbon/identity/api/server/input/validation/common/factory/InputValidationOSGiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/src/main/java/org/wso2/carbon/identity/api/server/input/validation/common/factory/InputValidationOSGiServiceFactory.java
deleted file mode 100644
index f0fc4e2336..0000000000
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/src/main/java/org/wso2/carbon/identity/api/server/input/validation/common/factory/InputValidationOSGiServiceFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2022, WSO2 LLC. (http://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.identity.api.server.input.validation.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.input.validation.mgt.services.InputValidationManagementService;
-
-/**
- * Factory Beans serve as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the InputValidationManagementService type of object inside the container.
- */
-public class InputValidationOSGiServiceFactory extends AbstractFactoryBean<InputValidationManagementService> {
-
-    private InputValidationManagementService inputValidationMgtService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected InputValidationManagementService createInstance() throws Exception {
-
-        if (this.inputValidationMgtService == null) {
-            InputValidationManagementService taskOperationService =
-                    (InputValidationManagementService) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(InputValidationManagementService.class, null);
-
-            if (taskOperationService == null) {
-                throw new Exception("Unable to retrieve ConfigurationManager service.");
-            }
-            this.inputValidationMgtService = taskOperationService;
-        }
-        return this.inputValidationMgtService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
index 81e1355c8c..4d1a2ca66c 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- ~ Copyright (c) 2022, WSO2 LLC. (http://www.wso2.com).
+ ~ Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
  ~
  ~ WSO2 LLC. licenses this file to you under the Apache License,
  ~ Version 2.0 (the "License"); you may not use this file except
@@ -78,11 +78,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/gen/java/org/wso2/carbon/identity/api/server/input/validation/v1/ValidationRulesApi.java b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/gen/java/org/wso2/carbon/identity/api/server/input/validation/v1/ValidationRulesApi.java
index d5547524c3..d0d81b7f9f 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/gen/java/org/wso2/carbon/identity/api/server/input/validation/v1/ValidationRulesApi.java
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/gen/java/org/wso2/carbon/identity/api/server/input/validation/v1/ValidationRulesApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -18,18 +18,17 @@
 
 package org.wso2.carbon.identity.api.server.input.validation.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.Multipart;
 import java.io.InputStream;
 import java.util.List;
 
+import org.wso2.carbon.identity.api.server.input.validation.v1.factories.ValidationRulesApiServiceFactory;
 import org.wso2.carbon.identity.api.server.input.validation.v1.models.Error;
 import java.util.List;
 import org.wso2.carbon.identity.api.server.input.validation.v1.models.ValidationConfigModel;
 import org.wso2.carbon.identity.api.server.input.validation.v1.models.ValidationConfigModelForField;
 import org.wso2.carbon.identity.api.server.input.validation.v1.models.ValidatorModel;
-import org.wso2.carbon.identity.api.server.input.validation.v1.ValidationRulesApiService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -43,8 +42,12 @@
 
 public class ValidationRulesApi  {
 
-    @Autowired
-    private ValidationRulesApiService delegate;
+    private final ValidationRulesApiService delegate;
+
+    public ValidationRulesApi() {
+
+        this.delegate = ValidationRulesApiServiceFactory.getValidationRulesApi();
+    }
 
     @Valid
     @GET
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/gen/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/gen/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesApiServiceFactory.java
index 67f2319901..a6937118d4 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/gen/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/gen/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesApiServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -26,7 +26,7 @@
  */
 public class ValidationRulesApiServiceFactory {
 
-   private final static ValidationRulesApiService service = new ValidationRulesApiServiceImpl();
+   private final static ValidationRulesApiService SERVICE = new ValidationRulesApiServiceImpl();
 
    /**
     * Method to get ValidationRulesApiService.
@@ -35,6 +35,6 @@ public class ValidationRulesApiServiceFactory {
     */
    public static ValidationRulesApiService getValidationRulesApi() {
 
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/core/ValidationRulesManagementApiService.java b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/core/ValidationRulesManagementApiService.java
index 65fc7c4970..7394b5c4e7 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/core/ValidationRulesManagementApiService.java
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/core/ValidationRulesManagementApiService.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2022, WSO2 LLC. (http://www.wso2.org).
+ * Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
  * You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.wso2.carbon.identity.api.server.input.validation.v1.core;
@@ -22,7 +24,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.identity.api.server.common.error.APIError;
 import org.wso2.carbon.identity.api.server.common.error.ErrorResponse;
-import org.wso2.carbon.identity.api.server.input.validation.common.InputValidationServiceHolder;
 import org.wso2.carbon.identity.api.server.input.validation.common.util.ValidationManagementConstants;
 import org.wso2.carbon.identity.api.server.input.validation.v1.models.MappingModel;
 import org.wso2.carbon.identity.api.server.input.validation.v1.models.RuleModel;
@@ -39,6 +40,7 @@
 import org.wso2.carbon.identity.input.validation.mgt.model.ValidatorConfiguration;
 import org.wso2.carbon.identity.input.validation.mgt.model.validators.AbstractRegExValidator;
 import org.wso2.carbon.identity.input.validation.mgt.model.validators.AbstractRulesValidator;
+import org.wso2.carbon.identity.input.validation.mgt.services.InputValidationManagementService;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -66,8 +68,14 @@
  */
 public class ValidationRulesManagementApiService {
 
+    private final InputValidationManagementService inputValidationManagementService;
     private static final Log LOGGER = LogFactory.getLog(ValidationRulesManagementApiService.class);
 
+    public ValidationRulesManagementApiService(InputValidationManagementService inputValidationManagementService) {
+
+        this.inputValidationManagementService = inputValidationManagementService;
+    }
+
     /**
      * Method to get input validation configuration.
      *
@@ -77,7 +85,7 @@ public class ValidationRulesManagementApiService {
     public List<ValidationConfigModel> getValidationConfiguration(String tenantDomain) {
 
         try {
-            List<ValidationConfiguration> configurations = InputValidationServiceHolder.getInputValidationMgtService()
+            List<ValidationConfiguration> configurations = inputValidationManagementService
                     .getInputValidationConfiguration(tenantDomain);
             return buildResponse(configurations);
         } catch (InputValidationMgtException e) {
@@ -95,7 +103,7 @@ public ValidationConfigModel getValidationConfigurationForField(String tenantDom
 
         try {
             isFieldSupported(field);
-            ValidationConfiguration configuration = InputValidationServiceHolder.getInputValidationMgtService()
+            ValidationConfiguration configuration = inputValidationManagementService
                     .getInputValidationConfigurationForField(tenantDomain, field);
             return buildResponse(configuration);
         } catch (InputValidationMgtException e) {
@@ -115,7 +123,7 @@ public List<ValidationConfigModel> updateInputValidationConfiguration(
         try {
             List<ValidationConfiguration> requestDTO = buildRequestDTOFromValidationRequest(validationConfigModel);
             validateProperties(requestDTO, tenantDomain);
-            List<ValidationConfiguration> configurations = InputValidationServiceHolder.getInputValidationMgtService()
+            List<ValidationConfiguration> configurations = inputValidationManagementService
                     .updateInputValidationConfiguration(requestDTO, tenantDomain);
             return buildResponse(configurations);
         } catch (InputValidationMgtException e) {
@@ -139,7 +147,7 @@ public ValidationConfigModel updateInputValidationConfigurationForField(
             configModels.add(validationConfigModel);
             List<ValidationConfiguration> requestDTO = buildRequestDTOFromValidationRequest(configModels);
             validateProperties(requestDTO, tenantDomain);
-            ValidationConfiguration configurations = InputValidationServiceHolder.getInputValidationMgtService()
+            ValidationConfiguration configurations = inputValidationManagementService
                     .updateValidationConfiguration(requestDTO.get(0), tenantDomain);
             return buildResponse(configurations);
         } catch (InputValidationMgtException e) {
@@ -156,8 +164,7 @@ public List<ValidatorModel> getValidators(String tenantDomain) {
 
         List<ValidatorConfiguration> validators;
         try {
-            validators = InputValidationServiceHolder.getInputValidationMgtService()
-                    .getValidatorConfigurations(tenantDomain);
+            validators = inputValidationManagementService.getValidatorConfigurations(tenantDomain);
             return buildValidatorResponse(validators);
         } catch (InputValidationMgtException e) {
             if (ERROR_CODE_INPUT_VALIDATION_NOT_EXISTS.getCode().contains(e.getErrorCode())) {
@@ -361,8 +368,7 @@ private void validateProperties(List<ValidationConfiguration> configurations, St
     private void validateProperties(String field, boolean isRules, List<RulesConfiguration> rules, String tenantDomain)
             throws InputValidationMgtClientException {
 
-        Map<String, Validator> allValidators = InputValidationServiceHolder.getInputValidationMgtService()
-                .getValidators(tenantDomain);
+        Map<String, Validator> allValidators = inputValidationManagementService.getValidators(tenantDomain);
         ValidationContext context;
         for (RulesConfiguration rule: rules) {
             Validator validator = allValidators.get(rule.getValidatorName());
@@ -386,7 +392,7 @@ private void validateProperties(String field, boolean isRules, List<RulesConfigu
         }
 
         // Validate provided validation is allowed for the field.
-        for (FieldValidationConfigurationHandler handler: InputValidationServiceHolder.getInputValidationMgtService()
+        for (FieldValidationConfigurationHandler handler: inputValidationManagementService
                 .getFieldValidationConfigurationHandlers().values()) {
             if (handler.canHandle(field)) {
                 handler.validateValidationConfiguration(rules);
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesManagementApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesManagementApiServiceFactory.java
new file mode 100644
index 0000000000..8143bd294b
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesManagementApiServiceFactory.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.input.validation.v1.factories;
+
+import org.wso2.carbon.identity.api.server.input.validation.common.InputValidationServiceHolder;
+import org.wso2.carbon.identity.api.server.input.validation.v1.core.ValidationRulesManagementApiService;
+import org.wso2.carbon.identity.input.validation.mgt.services.InputValidationManagementService;
+
+/**
+ * Factory to return ValidationRulesManagementApiService.
+ */
+public class ValidationRulesManagementApiServiceFactory {
+
+    private static final ValidationRulesManagementApiService SERVICE;
+
+    static {
+        InputValidationManagementService inputValidationManagementService = InputValidationServiceHolder
+                .getInputValidationMgtService();
+
+        if (inputValidationManagementService == null) {
+            throw new IllegalStateException("InputValidationManagementService is not available from OSGi context.");
+        }
+
+        SERVICE = new ValidationRulesManagementApiService(inputValidationManagementService);
+    }
+
+    /**
+     * Get ValidationRulesManagementApiService.
+     *
+     * @return ValidationRulesManagementApiService
+     */
+    public static ValidationRulesManagementApiService getValidationRulesManagementApiService() {
+        return SERVICE;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/impl/ValidationRulesApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/impl/ValidationRulesApiServiceImpl.java
index 551485a767..e9373915cf 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/impl/ValidationRulesApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/impl/ValidationRulesApiServiceImpl.java
@@ -1,24 +1,26 @@
 /*
- * Copyright (c) 2022, WSO2 LLC. (http://www.wso2.org).
+ * Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
  * You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.wso2.carbon.identity.api.server.input.validation.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.server.input.validation.v1.ValidationRulesApiService;
 import org.wso2.carbon.identity.api.server.input.validation.v1.core.ValidationRulesManagementApiService;
+import org.wso2.carbon.identity.api.server.input.validation.v1.factories.ValidationRulesManagementApiServiceFactory;
 import org.wso2.carbon.identity.api.server.input.validation.v1.models.ValidationConfigModel;
 import org.wso2.carbon.identity.api.server.input.validation.v1.models.ValidationConfigModelForField;
 
@@ -32,8 +34,16 @@
  */
 public class ValidationRulesApiServiceImpl implements ValidationRulesApiService {
 
-    @Autowired
-    private ValidationRulesManagementApiService validationRulesManagementApiService;
+    private final ValidationRulesManagementApiService validationRulesManagementApiService;
+
+    public ValidationRulesApiServiceImpl() {
+        try {
+            this.validationRulesManagementApiService = ValidationRulesManagementApiServiceFactory
+                    .getValidationRulesManagementApiService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating ValidationRulesManagementApiService.", e);
+        }
+    }
 
     @Override
     public Response getValidationRules() {
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/resources/META-INF/cxf/input-validation-server-v1-cxf.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/resources/META-INF/cxf/input-validation-server-v1-cxf.xml
deleted file mode 100644
index 5e87090809..0000000000
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/resources/META-INF/cxf/input-validation-server-v1-cxf.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2022, WSO2 LLC. (http://www.wso2.org).
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-    <bean class="org.wso2.carbon.identity.api.server.input.validation.v1.core.ValidationRulesManagementApiService"/>
-    <bean class="org.wso2.carbon.identity.api.server.input.validation.v1.impl.ValidationRulesApiServiceImpl"/>
-
-    <bean id="inputValidationServiceFactoryBean" class="org.wso2.carbon.identity.api.server.input.validation.common.factory.InputValidationOSGiServiceFactory"/>
-
-    <bean id="InputValidationServiceHolderBean" class="org.wso2.carbon.identity.api.server.input.validation.common.InputValidationServiceHolder">
-        <property name="inputValidationMgtService" ref="inputValidationServiceFactoryBean"/>
-    </bean>
-</beans>

From 2df16f46d76db4a58b6a16ab893ee6048ad2ff12 Mon Sep 17 00:00:00 2001
From: lashini <lashini@wso2.com>
Date: Fri, 24 Jan 2025 17:17:07 +0530
Subject: [PATCH 2/5] fix license headers

---
 .../pom.xml                                                     | 2 +-
 .../input/validation/common/InputValidationServiceHolder.java   | 2 +-
 .../pom.xml                                                     | 2 +-
 .../api/server/input/validation/v1/ValidationRulesApi.java      | 2 +-
 .../v1/factories/ValidationRulesApiServiceFactory.java          | 2 +-
 .../validation/v1/core/ValidationRulesManagementApiService.java | 2 +-
 .../factories/ValidationRulesManagementApiServiceFactory.java   | 2 +-
 .../input/validation/v1/impl/ValidationRulesApiServiceImpl.java | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
index 2cb4992672..63ab6742b5 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.org).
+  ~ Copyright (c) 2022, WSO2 LLC. (http://www.wso2.org).
   ~
   ~ WSO2 LLC. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/src/main/java/org/wso2/carbon/identity/api/server/input/validation/common/InputValidationServiceHolder.java b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/src/main/java/org/wso2/carbon/identity/api/server/input/validation/common/InputValidationServiceHolder.java
index d99ccff700..9f2a0426a0 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/src/main/java/org/wso2/carbon/identity/api/server/input/validation/common/InputValidationServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/src/main/java/org/wso2/carbon/identity/api/server/input/validation/common/InputValidationServiceHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2022, WSO2 LLC. (http://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
index 4d1a2ca66c..61dbd211f4 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- ~ Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
+ ~ Copyright (c) 2022, WSO2 LLC. (http://www.wso2.com).
  ~
  ~ WSO2 LLC. licenses this file to you under the Apache License,
  ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/gen/java/org/wso2/carbon/identity/api/server/input/validation/v1/ValidationRulesApi.java b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/gen/java/org/wso2/carbon/identity/api/server/input/validation/v1/ValidationRulesApi.java
index d0d81b7f9f..45bc2816ac 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/gen/java/org/wso2/carbon/identity/api/server/input/validation/v1/ValidationRulesApi.java
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/gen/java/org/wso2/carbon/identity/api/server/input/validation/v1/ValidationRulesApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2022, WSO2 LLC. (http://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/gen/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/gen/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesApiServiceFactory.java
index a6937118d4..8021fb1bd6 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/gen/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/gen/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesApiServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2022, WSO2 LLC. (http://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/core/ValidationRulesManagementApiService.java b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/core/ValidationRulesManagementApiService.java
index 7394b5c4e7..4f8ffd3ae6 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/core/ValidationRulesManagementApiService.java
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/core/ValidationRulesManagementApiService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2022, WSO2 LLC. (http://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesManagementApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesManagementApiServiceFactory.java
index 8143bd294b..b6120476c9 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesManagementApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesManagementApiServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2025, WSO2 LLC. (http://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/impl/ValidationRulesApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/impl/ValidationRulesApiServiceImpl.java
index e9373915cf..2ab063a9c6 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/impl/ValidationRulesApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/impl/ValidationRulesApiServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2022, WSO2 LLC. (http://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except

From 49e9de0b5e9e9fa9b4c541f1d6719e833aabcc8a Mon Sep 17 00:00:00 2001
From: Lashini Jayasekara <30428591+lashinijay@users.noreply.github.com>
Date: Fri, 24 Jan 2025 17:18:17 +0530
Subject: [PATCH 3/5] fix formatting

---
 .../factories/ValidationRulesManagementApiServiceFactory.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesManagementApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesManagementApiServiceFactory.java
index b6120476c9..f298dc3b49 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesManagementApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesManagementApiServiceFactory.java
@@ -43,7 +43,7 @@ public class ValidationRulesManagementApiServiceFactory {
     /**
      * Get ValidationRulesManagementApiService.
      *
-     * @return ValidationRulesManagementApiService
+     * @return ValidationRulesManagementApiService.
      */
     public static ValidationRulesManagementApiService getValidationRulesManagementApiService() {
         return SERVICE;

From dfe68c0f3953fa3deda95630cea9b379d5daec46 Mon Sep 17 00:00:00 2001
From: Lashini Jayasekara <30428591+lashinijay@users.noreply.github.com>
Date: Fri, 24 Jan 2025 17:18:44 +0530
Subject: [PATCH 4/5] fix formatting

---
 .../v1/factories/ValidationRulesManagementApiServiceFactory.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesManagementApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesManagementApiServiceFactory.java
index f298dc3b49..8b12627b86 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesManagementApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/factories/ValidationRulesManagementApiServiceFactory.java
@@ -46,6 +46,7 @@ public class ValidationRulesManagementApiServiceFactory {
      * @return ValidationRulesManagementApiService.
      */
     public static ValidationRulesManagementApiService getValidationRulesManagementApiService() {
+
         return SERVICE;
     }
 }

From 5a3d4ceef865022005ff64f152dcfb45086eba68 Mon Sep 17 00:00:00 2001
From: Lashini Jayasekara <30428591+lashinijay@users.noreply.github.com>
Date: Fri, 24 Jan 2025 17:28:27 +0530
Subject: [PATCH 5/5] fix formatting

Co-authored-by: Thamindu R <thamindu.randil@gmail.com>
---
 .../input/validation/v1/impl/ValidationRulesApiServiceImpl.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/impl/ValidationRulesApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/impl/ValidationRulesApiServiceImpl.java
index 2ab063a9c6..3ef6fe7d95 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/impl/ValidationRulesApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/src/main/java/org/wso2/carbon/identity/api/server/input/validation/v1/impl/ValidationRulesApiServiceImpl.java
@@ -37,6 +37,7 @@ public class ValidationRulesApiServiceImpl implements ValidationRulesApiService
     private final ValidationRulesManagementApiService validationRulesManagementApiService;
 
     public ValidationRulesApiServiceImpl() {
+    
         try {
             this.validationRulesManagementApiService = ValidationRulesManagementApiServiceFactory
                     .getValidationRulesManagementApiService();