fix osgi service resolving issues

wso2-extensions · Jan 17, 2025 · df14c67 · df14c67
1 parent 62f8c22
commit df14c67
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 55 deletions.
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -229,7 +229,6 @@
             <artifactId>org.wso2.carbon.identity.oauth.extension</artifactId>
             <scope>compile</scope>
         </dependency>
-
     </dependencies>
 
     <build>

diff --git a/...rc/main/java/org/wso2/carbon/identity/oauth/endpoint/authz/OAuth2AuthzServiceFactory.java b/...rc/main/java/org/wso2/carbon/identity/oauth/endpoint/authz/OAuth2AuthzServiceFactory.java
@@ -18,6 +18,8 @@
 
 package org.wso2.carbon.identity.oauth.endpoint.authz;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.identity.openidconnect.OpenIDConnectClaimFilter;
 import org.wso2.carbon.identity.openidconnect.OpenIDConnectClaimFilterImpl;
 
 /**
@@ -28,7 +30,13 @@ public class OAuth2AuthzServiceFactory {
     private static final OpenIDConnectClaimFilterImpl SERVICE;
 
     static {
-        SERVICE = new OpenIDConnectClaimFilterImpl();
+        OpenIDConnectClaimFilterImpl openIDConnectClaimFilter = (OpenIDConnectClaimFilterImpl)
+                PrivilegedCarbonContext.getThreadLocalCarbonContext().
+                        getOSGiService(OpenIDConnectClaimFilter.class, null);
+        if (openIDConnectClaimFilter == null) {
+            throw new IllegalStateException("OpenIdConnectClaimFilter is not available from OSGi context.");
+        }
+        SERVICE = openIDConnectClaimFilter;
     }
 
     public static OpenIDConnectClaimFilterImpl getOpenIdClaimFilterImpl() {

diff --git a/...nt/src/main/java/org/wso2/carbon/identity/oauth/endpoint/device/DeviceServiceFactory.java b/...nt/src/main/java/org/wso2/carbon/identity/oauth/endpoint/device/DeviceServiceFactory.java
@@ -20,18 +20,17 @@
 
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.oauth2.device.api.DeviceAuthService;
-import org.wso2.carbon.identity.oauth2.device.api.DeviceAuthServiceImpl;
 
 /**
  * Service holder for managing instances of Device Authentication related services.
  */
 public class DeviceServiceFactory {
 
-    private static final DeviceAuthServiceImpl SERVICE;
+    private static final DeviceAuthService SERVICE;
 
     static {
-        DeviceAuthServiceImpl deviceAuthService = (DeviceAuthServiceImpl) PrivilegedCarbonContext
-                .getThreadLocalCarbonContext().getOSGiService(DeviceAuthServiceImpl.class, null);
+        DeviceAuthService deviceAuthService = (DeviceAuthService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(DeviceAuthService.class, null);
          if (deviceAuthService == null) {
              throw new IllegalStateException("DeviceAuthService is not available from OSGi context.");
          }

diff --git a/...in/java/org/wso2/carbon/identity/oauth/endpoint/util/factory/WebFingerServiceFactory.java b/...in/java/org/wso2/carbon/identity/oauth/endpoint/util/factory/WebFingerServiceFactory.java
diff --git a/...endpoint/src/test/java/org/wso2/carbon/identity/oauth/endpoint/util/EndpointUtilTest.java b/...endpoint/src/test/java/org/wso2/carbon/identity/oauth/endpoint/util/EndpointUtilTest.java
@@ -78,7 +78,6 @@
 import org.wso2.carbon.identity.oauth.endpoint.util.factory.OIDCProviderServiceFactory;
 import org.wso2.carbon.identity.oauth.endpoint.util.factory.Oauth2ScopeServiceFactory;
 import org.wso2.carbon.identity.oauth.endpoint.util.factory.RequestObjectServiceFactory;
-import org.wso2.carbon.identity.oauth.endpoint.util.factory.WebFingerServiceFactory;
 import org.wso2.carbon.identity.oauth2.OAuth2ScopeService;
 import org.wso2.carbon.identity.oauth2.OAuth2Service;
 import org.wso2.carbon.identity.oauth2.OAuth2TokenValidationService;
@@ -792,8 +791,6 @@ public void testGetLoginPageURLFromCache() throws Exception {
     @Test
     public void testGetServices() {
 
-        assertTrue(WebFingerServiceFactory.getWebFingerService() instanceof DefaultWebFingerProcessor,
-                "Retrieved incorrect WebFingerService");
         assertTrue(OIDCProviderRequestValidatorFactory.getOIDProviderRequestValidator()
                         instanceof DefaultOIDCProviderRequestBuilder,
                 "Retrieved incorrect OIDProviderRequestValidator");