Address review comments

wso2 · Oct 5, 2023 · 6223a56 · 6223a56
1 parent b4a7a58
commit 6223a56
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/...identity/api/server/organization/management/v1/service/OrganizationManagementService.java b/...identity/api/server/organization/management/v1/service/OrganizationManagementService.java
@@ -101,6 +101,8 @@
 public class OrganizationManagementService {
 
     private static final Log LOG = LogFactory.getLog(OrganizationManagementService.class);
+    private static final OrganizationDiscoveryManager organizationDiscoveryManager =
+            OrganizationManagementServiceHolder.getInstance().getOrganizationDiscoveryManager();
 
     /**
      * Retrieve organization IDs.
@@ -399,7 +401,7 @@ public Response addOrganizationDiscoveryAttributes(OrganizationDiscoveryPostRequ
                                                                organizationDiscoveryPostRequest) {
 
         try {
-            List<OrgDiscoveryAttribute> orgDiscoveryAttributeList = getOrganizationDiscoveryManager()
+            List<OrgDiscoveryAttribute> orgDiscoveryAttributeList = organizationDiscoveryManager
                     .addOrganizationDiscoveryAttributes(organizationDiscoveryPostRequest.getOrganizationId(),
                             getOrgDiscoveryAttributesFromPostRequest(organizationDiscoveryPostRequest), true);
             String organizationId = organizationDiscoveryPostRequest.getOrganizationId();
@@ -421,7 +423,7 @@ public Response addOrganizationDiscoveryAttributes(OrganizationDiscoveryPostRequ
     public Response getOrganizationDiscoveryAttributes(String organizationId) {
 
         try {
-            List<OrgDiscoveryAttribute> orgDiscoveryAttributeList = getOrganizationDiscoveryManager()
+            List<OrgDiscoveryAttribute> orgDiscoveryAttributeList = organizationDiscoveryManager
                     .getOrganizationDiscoveryAttributes(organizationId, true);
             return Response.ok().entity(getOrganizationDiscoveryAttributesResponse(orgDiscoveryAttributeList)).build();
         } catch (OrganizationManagementClientException e) {
@@ -443,7 +445,7 @@ public Response updateOrganizationDiscoveryAttributes(String organizationId, Org
             organizationDiscoveryAttributes) {
 
         try {
-            List<OrgDiscoveryAttribute> orgDiscoveryAttributeList = getOrganizationDiscoveryManager()
+            List<OrgDiscoveryAttribute> orgDiscoveryAttributeList = organizationDiscoveryManager
                     .updateOrganizationDiscoveryAttributes(organizationId,
                             getOrgDiscoveryAttributesFromPutRequest(organizationDiscoveryAttributes), true);
             return Response.ok().entity(getOrganizationDiscoveryAttributesResponse(orgDiscoveryAttributeList)).build();
@@ -463,7 +465,7 @@ public Response updateOrganizationDiscoveryAttributes(String organizationId, Org
     public Response deleteOrganizationDiscoveryAttributes(String organizationId) {
 
         try {
-            getOrganizationDiscoveryManager().deleteOrganizationDiscoveryAttributes(organizationId, true);
+            organizationDiscoveryManager.deleteOrganizationDiscoveryAttributes(organizationId, true);
             return Response.noContent().build();
         } catch (OrganizationManagementClientException e) {
             return OrganizationManagementEndpointUtil.handleClientErrorResponse(e, LOG);
@@ -485,7 +487,7 @@ public Response getOrganizationsDiscoveryAttributes(String filter, Integer offse
         handleNotImplementedCapabilities(filter, offset, limit);
         try {
             Map<String, List<OrgDiscoveryAttribute>> organizationsDiscoveryAttributes =
-                    getOrganizationDiscoveryManager().getOrganizationsDiscoveryAttributes();
+                    organizationDiscoveryManager.getOrganizationsDiscoveryAttributes();
             OrganizationsDiscoveryResponse response = new OrganizationsDiscoveryResponse();
             organizationsDiscoveryAttributes.forEach((key, value) -> {
                 OrganizationDiscoveryResponse organizationDiscoveryResponse = new OrganizationDiscoveryResponse();
@@ -517,7 +519,7 @@ public Response isDiscoveryAttributeAvailable(OrganizationDiscoveryCheckPOSTRequ
                                                           organizationDiscoveryCheckPOSTRequest) {
 
         try {
-            boolean discoveryAttributeValueAvailable = getOrganizationDiscoveryManager()
+            boolean discoveryAttributeValueAvailable = organizationDiscoveryManager
                     .isDiscoveryAttributeValueAvailable(organizationDiscoveryCheckPOSTRequest.getType(),
                             organizationDiscoveryCheckPOSTRequest.getValue());
             OrganizationDiscoveryCheckPOSTResponse organizationDiscoveryCheckPOSTResponse =
@@ -540,7 +542,7 @@ public Response getOrganizationMetadata() {
 
         try {
             Organization organization = getOrganizationManager().getOrganization(getOrganizationId(), false, true);
-            List<OrgDiscoveryAttribute> organizationDiscoveryAttributes = getOrganizationDiscoveryManager()
+            List<OrgDiscoveryAttribute> organizationDiscoveryAttributes = organizationDiscoveryManager
                     .getOrganizationDiscoveryAttributes(getOrganizationId(), false);
             return Response.ok().entity(getOrganizationMetadataResponse(organization, organizationDiscoveryAttributes))
                     .build();
@@ -946,9 +948,4 @@ private OrgApplicationManager getOrgApplicationManager() {
 
         return OrganizationManagementServiceHolder.getInstance().getOrgApplicationManager();
     }
-
-    private OrganizationDiscoveryManager getOrganizationDiscoveryManager() {
-
-        return OrganizationManagementServiceHolder.getInstance().getOrganizationDiscoveryManager();
-    }
 }