[Spring Cleanup] Remove Spring dependencies in the secret management API

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
+  ~ Copyright (c) 2021-2024, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ WSO2 Inc. licenses this file to you under the Apache 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
@@ -52,11 +52,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.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/src/main/java/org/wso2/carbon/identity/api/server/secret/management/common/SecretManagementServiceHolder.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
+ * Copyright (c) 2021-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * WSO2 Inc. licenses this file to you under the Apache 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
@@ -18,33 +18,30 @@
 
 package org.wso2.carbon.identity.api.server.secret.management.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.secret.mgt.core.SecretManager;
 
 /**
  * Service holder class for secret management.
  */
 public class SecretManagementServiceHolder {
 
-    private static SecretManager secretConfigManager;
+    private SecretManagementServiceHolder() {
 
-    /**
-     * Get SecretManager OSGi service.
-     *
-     * @return secretConfig manager.
-     */
-    public static SecretManager getSecretConfigManager() {
+    }
 
-        return secretConfigManager;
+    private static class SecretManagerServiceHolder {
+        static final SecretManager SERVICE = (SecretManager) PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                .getOSGiService(SecretManager.class, null);
     }
 
     /**
-     * Set SecretManager OSGi service.
+     * Get SecretManager OSGi service.
      *
-     * @param secretConfigManager Secret Manager.
+     * @return secretConfig manager.
      */
-    public static void setSecretConfigManager(SecretManager secretConfigManager) {
+    public static SecretManager getSecretConfigManager() {
 
-        SecretManagementServiceHolder.secretConfigManager = secretConfigManager;
+        return SecretManagerServiceHolder.SERVICE;
     }
-
 }

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
+  ~ Copyright (c) 2021-2024, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ WSO2 Inc. licenses this file to you under the Apache 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
@@ -104,11 +104,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.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/secret/management/v1/SecretTypeApi.java

@@ -1,23 +1,24 @@
 /*
- * Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
+ * 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.api.server.secret.management.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
-
+import org.wso2.carbon.identity.api.server.secret.management.v1.factories.SecretTypeApiServiceFactory;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.Error;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretResponse;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretTypeAddRequest;
@@ -35,8 +36,12 @@
 
 public class SecretTypeApi {
 
-    @Autowired
-    private SecretTypeApiService delegate;
+    private final SecretTypeApiService delegate;
+
+    public SecretTypeApi() {
+
+        this.delegate = SecretTypeApiServiceFactory.getSecretTypeApi();
+    }
 
     @Valid
     @POST

components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/secret/management/v1/SecretsApi.java

@@ -1,23 +1,24 @@
 /*
-* Copyright (c) 2021, WSO2 Inc. (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.
-* 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.
-*/
+ * Copyright (c) 2021-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.secret.management.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
-
+import org.wso2.carbon.identity.api.server.secret.management.v1.factories.SecretsApiServiceFactory;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.Error;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretAddRequest;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretPatchRequest;
@@ -35,8 +36,12 @@
 
 public class SecretsApi  {
 
-    @Autowired
-    private SecretsApiService delegate;
+    private final SecretsApiService delegate;
+
+    public SecretsApi() {
+
+        this.delegate = SecretsApiServiceFactory.getSecretsApi();
+    }
 
     @Valid
     @POST

components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/secret/management/v1/factories/SecretTypeApiServiceFactory.java

@@ -1,30 +1,40 @@
 /*
-* Copyright (c) 2021, WSO2 Inc. (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.
-* 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.
-*/
+ * Copyright (c) 2021-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.secret.management.v1.factories;
 
 import org.wso2.carbon.identity.api.server.secret.management.v1.SecretTypeApiService;
 import org.wso2.carbon.identity.api.server.secret.management.v1.impl.SecretTypeApiServiceImpl;
 
+/**
+ * Factory class for SecretTypeApiService.
+ */
 public class SecretTypeApiServiceFactory {
 
-   private final static SecretTypeApiService service = new SecretTypeApiServiceImpl();
+   private final static SecretTypeApiService SERVICE = new SecretTypeApiServiceImpl();
 
+   /**
+    * Get SecretTypeApiService.
+    *
+    * @return SecretTypeApiService.
+    */
    public static SecretTypeApiService getSecretTypeApi()
    {
-      return service;
+      return SERVICE;
    }
 }

components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/secret/management/v1/factories/SecretsApiServiceFactory.java

@@ -1,30 +1,40 @@
 /*
-* Copyright (c) 2021, WSO2 Inc. (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.
-* 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.
-*/
+ * Copyright (c) 2021-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.secret.management.v1.factories;
 
 import org.wso2.carbon.identity.api.server.secret.management.v1.SecretsApiService;
 import org.wso2.carbon.identity.api.server.secret.management.v1.impl.SecretsApiServiceImpl;
 
+/**
+ * Factory class for SecretsApiService.
+ */
 public class SecretsApiServiceFactory {
 
-   private final static SecretsApiService service = new SecretsApiServiceImpl();
+   private final static SecretsApiService SERVICE = new SecretsApiServiceImpl();
 
+   /**
+    * Get SecretsApiService.
+    *
+    * @return SecretsApiService.
+    */
    public static SecretsApiService getSecretsApi()
    {
-      return service;
+      return SERVICE;
    }
 }