From b4987d93bbf1aba09f14d17ce7a3b5e4af9fabae Mon Sep 17 00:00:00 2001
From: NipuniBhagya <nipunib@wso2.com>
Date: Tue, 15 Oct 2024 13:57:13 +0530
Subject: [PATCH] Resolve PR comments

---
 .../pom.xml                                   |  2 +-
 .../APIResourceManagementServiceHolder.java   |  9 +++------
 .../pom.xml                                   |  2 +-
 .../api/resource/v1/ApiResourcesApi.java      |  1 +
 .../api/server/api/resource/v1/MetaApi.java   |  1 +
 .../api/server/api/resource/v1/ScopesApi.java |  1 +
 ...PIResourceCollectionManagementService.java |  1 +
 .../ServerAPIResourceManagementService.java   |  1 +
 ...rceCollectionManagementServiceFactory.java | 19 +++++++++++++++++++
 ...erAPIResourceManagementServiceFactory.java | 19 +++++++++++++++++++
 10 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
index 946e3cce90..f1e2720343 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+  ~ Copyright (c) 2023-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
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/APIResourceManagementServiceHolder.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/APIResourceManagementServiceHolder.java
index c553596f2f..9d06159bce 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/APIResourceManagementServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/APIResourceManagementServiceHolder.java
@@ -33,22 +33,19 @@ private APIResourceManagementServiceHolder() {}
     private static class APIResourceManagerHolder {
 
         static final APIResourceManager SERVICE = (APIResourceManager) PrivilegedCarbonContext
-                .getThreadLocalCarbonContext()
-                .getOSGiService(APIResourceManager.class, null);
+                .getThreadLocalCarbonContext().getOSGiService(APIResourceManager.class, null);
     }
 
     private static class APIResourceCollectionManagerHolder {
 
         static final APIResourceCollectionManager SERVICE = (APIResourceCollectionManager) PrivilegedCarbonContext
-                .getThreadLocalCarbonContext()
-                .getOSGiService(APIResourceCollectionManager.class, null);
+                .getThreadLocalCarbonContext().getOSGiService(APIResourceCollectionManager.class, null);
     }
 
     private static class OAuthAdminServiceImplHolder {
 
         static final OAuthAdminServiceImpl SERVICE = (OAuthAdminServiceImpl) PrivilegedCarbonContext
-                .getThreadLocalCarbonContext()
-                .getOSGiService(OAuthAdminServiceImpl.class, null);
+                .getThreadLocalCarbonContext().getOSGiService(OAuthAdminServiceImpl.class, null);
     }
 
     /**
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
index a197fdf267..94147bccc6 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+  ~ Copyright (c) 2023-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
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ApiResourcesApi.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ApiResourcesApi.java
index 325b4305a7..d061c00cab 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ApiResourcesApi.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ApiResourcesApi.java
@@ -49,6 +49,7 @@ public class ApiResourcesApi  {
     private final ApiResourcesApiService delegate;
 
     public ApiResourcesApi() {
+
         this.delegate = ApiResourcesApiServiceFactory.getApiResourcesApi();
     }
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/MetaApi.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/MetaApi.java
index 1e286c6ff8..2d15931e9d 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/MetaApi.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/MetaApi.java
@@ -42,6 +42,7 @@ public class MetaApi  {
     private final MetaApiService delegate;
 
     public MetaApi() {
+
         this.delegate = MetaApiServiceFactory.getMetaApi();
     }
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopesApi.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopesApi.java
index 8606c5eef3..e8af53fba8 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopesApi.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopesApi.java
@@ -43,6 +43,7 @@ public class ScopesApi  {
     private final ScopesApiService delegate;
 
     public ScopesApi() {
+
         this.delegate = ScopesApiServiceFactory.getScopesApi();
     }
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceCollectionManagementService.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceCollectionManagementService.java
index 12164efeec..8329e69350 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceCollectionManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceCollectionManagementService.java
@@ -57,6 +57,7 @@ public class ServerAPIResourceCollectionManagementService {
     private final APIResourceCollectionManager apiResourceCollectionManager;
 
     public ServerAPIResourceCollectionManagementService(APIResourceCollectionManager apiResourceCollectionManager) {
+
         this.apiResourceCollectionManager = apiResourceCollectionManager;
     }
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java
index c6a4cffb40..aa3d890e49 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java
@@ -71,6 +71,7 @@ public class ServerAPIResourceManagementService {
     private static final Log LOG = LogFactory.getLog(ServerAPIResourceManagementService.class);
 
     public ServerAPIResourceManagementService(APIResourceManager apiResourceManager) {
+
         this.apiResourceManager = apiResourceManager;
     }
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ServerAPIResourceCollectionManagementServiceFactory.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ServerAPIResourceCollectionManagementServiceFactory.java
index 61b38b4341..64ce6f99b6 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ServerAPIResourceCollectionManagementServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ServerAPIResourceCollectionManagementServiceFactory.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2023-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.api.resource.v1.factories;
 
 import org.wso2.carbon.identity.api.resource.collection.mgt.APIResourceCollectionManager;
@@ -28,6 +46,7 @@ public class ServerAPIResourceCollectionManagementServiceFactory {
      * @return ServerAPIResourceCollectionManagementService.
      */
     public static ServerAPIResourceCollectionManagementService getServerAPIResourceCollectionManagementService() {
+
         return SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ServerAPIResourceManagementServiceFactory.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ServerAPIResourceManagementServiceFactory.java
index 854103ec72..611e31a100 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ServerAPIResourceManagementServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ServerAPIResourceManagementServiceFactory.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2023-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.api.resource.v1.factories;
 
 import org.wso2.carbon.identity.api.resource.mgt.APIResourceManager;
@@ -27,6 +45,7 @@ public class ServerAPIResourceManagementServiceFactory {
      * @return ServerAPIResourceManagementService.
      */
     public static ServerAPIResourceManagementService getServerAPIResourceManagementService() {
+
         return SERVICE;
     }