LPD-40120 SF - Match to SYZ's code for better readability and perform…

…ance
liferay · Nov 7, 2024 · d7c166c · d7c166c
1 parent 7327eee
commit d7c166c
Showing 1 changed file with 24 additions and 36 deletions.
diff --git a/.../main/java/com/liferay/oauth2/provider/service/impl/OAuth2ScopeGrantLocalServiceImpl.java b/.../main/java/com/liferay/oauth2/provider/service/impl/OAuth2ScopeGrantLocalServiceImpl.java
@@ -9,7 +9,6 @@
 import com.liferay.oauth2.provider.model.OAuth2Authorization;
 import com.liferay.oauth2.provider.model.OAuth2ScopeGrant;
 import com.liferay.oauth2.provider.scope.liferay.LiferayOAuth2Scope;
-import com.liferay.oauth2.provider.service.OAuth2AuthorizationLocalService;
 import com.liferay.oauth2.provider.service.base.OAuth2ScopeGrantLocalServiceBaseImpl;
 import com.liferay.portal.aop.AopService;
 import com.liferay.portal.kernel.exception.PortalException;
@@ -23,7 +22,6 @@
 
 import org.osgi.framework.Bundle;
 import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Reference;
 
 /**
  * @author Brian Wing Shun Chan
@@ -118,42 +116,35 @@ public Collection<OAuth2ScopeGrant> getOAuth2ScopeGrants(
 		long companyId, String applicationName, String bundleSymbolicName,
 		String accessTokenContent) {
 
-		List<OAuth2Authorization> oAuth2Authorizations =
-			oAuth2AuthorizationPersistence.findByC_ATCH(
-				companyId, accessTokenContent.hashCode());
+		List<OAuth2ScopeGrant> oAuth2ScopeGrants = new ArrayList<>();
 
-		if (oAuth2Authorizations.isEmpty()) {
-			return Collections.emptyList();
-		}
+		for (OAuth2Authorization oAuth2Authorization :
+				oAuth2AuthorizationPersistence.findByC_ATCH(
+					companyId, accessTokenContent.hashCode())) {
 
-		List<OAuth2ScopeGrant> oAuth2ScopeGrants = new ArrayList<>();
+			if (!Objects.equals(
+					accessTokenContent,
+					oAuth2Authorization.getAccessTokenContent())) {
 
-		oAuth2Authorizations.forEach(
-			oAuth2Authorization -> {
-				if (!Objects.equals(
-						oAuth2Authorization.getAccessTokenContent(),
-						accessTokenContent)) {
+				continue;
+			}
 
-					return;
-				}
+			for (OAuth2ScopeGrant oAuth2ScopeGrant :
+					oAuth2ScopeGrantPersistence.
+						getOAuth2AuthorizationOAuth2ScopeGrants(
+							oAuth2Authorization.getPrimaryKey())) {
 
-				oAuth2ScopeGrantPersistence.
-					getOAuth2AuthorizationOAuth2ScopeGrants(
-						oAuth2Authorization.getOAuth2AuthorizationId()
-					).forEach(
-						oAuth2ScopeGrant -> {
-							if (Objects.equals(
-									oAuth2ScopeGrant.getApplicationName(),
-									applicationName) &&
-								Objects.equals(
-									oAuth2ScopeGrant.getBundleSymbolicName(),
-									bundleSymbolicName)) {
-
-								oAuth2ScopeGrants.add(oAuth2ScopeGrant);
-							}
-						}
-					);
-			});
+				if (Objects.equals(
+						applicationName,
+						oAuth2ScopeGrant.getApplicationName()) &&
+					Objects.equals(
+						bundleSymbolicName,
+						oAuth2ScopeGrant.getBundleSymbolicName())) {
+
+					oAuth2ScopeGrants.add(oAuth2ScopeGrant);
+				}
+			}
+		}
 
 		return oAuth2ScopeGrants;
 	}
@@ -221,7 +212,4 @@ private boolean _isMatch(
 		return true;
 	}
 
-	@Reference
-	private OAuth2AuthorizationLocalService _oAuth2AuthorizationLocalService;
-
 }