Remove Spring dependencies in claim management API

components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml

@@ -50,10 +50,5 @@
             <artifactId>org.wso2.carbon.identity.organization.management.service</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 </project>

components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/src/main/java/org/wso2/carbon/identity/api/server/claim/management/common/ClaimManagementDataHolder.java

@@ -1,21 +1,24 @@
 /*
- * Copyright (c) (2019-2023), WSO2 LLC. (http://www.wso2.org).
+ * Copyright (c) 2019-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.claim.management.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.claim.metadata.mgt.ClaimMetadataManagementService;
 import org.wso2.carbon.identity.organization.management.service.OrganizationManager;
 
@@ -24,37 +27,35 @@
  */
 public class ClaimManagementDataHolder {
 
-    private static ClaimMetadataManagementService claimMetadataManagementService;
-    private static OrganizationManager organizationManager;
-
-    public static ClaimMetadataManagementService getClaimMetadataManagementService() {
-
-        return claimMetadataManagementService;
+    private static class OrganizationManagerHolder {
+        static final OrganizationManager SERVICE = (OrganizationManager) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext()
+                .getOSGiService(OrganizationManager.class, null);
     }
 
-    public static void setClaimMetadataManagementService(
-            ClaimMetadataManagementService claimMetadataManagementService) {
-
-        ClaimManagementDataHolder.claimMetadataManagementService = claimMetadataManagementService;
+    private static class ClaimMetadataManagementServiceHolder {
+        static final ClaimMetadataManagementService SERVICE = (ClaimMetadataManagementService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext()
+                .getOSGiService(ClaimMetadataManagementService.class, null);
     }
 
     /**
-     * Get organizationManager OSGi service.
+     * Get ClaimMetadataManagementService OSGi service.
      *
-     * @return organization Manager.
+     * @return ClaimMetadataManagementService.
      */
-    public static OrganizationManager getOrganizationManager() {
+    public static ClaimMetadataManagementService getClaimMetadataManagementService() {
 
-        return organizationManager;
+        return ClaimMetadataManagementServiceHolder.SERVICE;
     }
 
     /**
-     * Set organizationManager OSGi service.
+     * Get organizationManager OSGi service.
      *
-     * @param organizationManager Organization Manager.
+     * @return organization Manager.
      */
-    public static void setOrganizationManager(OrganizationManager organizationManager) {
+    public static OrganizationManager getOrganizationManager() {
 
-        ClaimManagementDataHolder.organizationManager = organizationManager;
+        return OrganizationManagerHolder.SERVICE;
     }
 }

components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml

@@ -80,11 +80,6 @@
             <artifactId>cxf-rt-rs-service-description</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>

components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/src/gen/java/org/wso2/carbon/identity/rest/api/server/claim/management/v1/ClaimManagementApi.java

@@ -1,22 +1,23 @@
 /*
- * Copyright (c) 2021, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2021-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.rest.api.server.claim.management.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.server.claim.management.v1.dto.*;
 import org.wso2.carbon.identity.rest.api.server.claim.management.v1.ClaimManagementApiService;
 import org.wso2.carbon.identity.rest.api.server.claim.management.v1.factories.ClaimManagementApiServiceFactory;
@@ -45,8 +46,11 @@
 @io.swagger.annotations.Api(value = "/claim-dialects", description = "the claim-dialects API")
 public class ClaimManagementApi  {
 
-    @Autowired
-    private ClaimManagementApiService delegate;
+    private final ClaimManagementApiService delegate;
+
+    public ClaimManagementApi() {
+        this.delegate = ClaimManagementApiServiceFactory.getClaimManagementApi();
+    }
 
     @Valid
     @POST

components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/src/gen/java/org/wso2/carbon/identity/rest/api/server/claim/management/v1/factories/ClaimManagementApiServiceFactory.java

@@ -1,30 +1,40 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-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.rest.api.server.claim.management.v1.factories;
 
 import org.wso2.carbon.identity.rest.api.server.claim.management.v1.ClaimManagementApiService;
 import org.wso2.carbon.identity.rest.api.server.claim.management.v1.impl.ClaimManagementApiServiceImpl;
 
+/**
+ * Factory class for ClaimManagementApiService.
+ */
 public class ClaimManagementApiServiceFactory {
 
-   private final static ClaimManagementApiService service = new ClaimManagementApiServiceImpl();
+   private final static ClaimManagementApiService SERVICE = new ClaimManagementApiServiceImpl();
 
+   /**
+    * Get ClaimManagementApiService.
+    *
+    * @return ClaimManagementApiService.
+    */
    public static ClaimManagementApiService getClaimManagementApi()
    {
-      return service;
+      return SERVICE;
    }
 }