Refactor MarketplaceExternalServicePlaceholder to separate file and update imports in tests

- Moved MarketplaceExternalServicePlaceholder to its own file for better modularity
- Updated ComponentsFacade and ComponentsServiceTest to reference the new class location
- Cleaned up unused imports and improved static import specificity in test classes
- Minor code cleanup in PolicyAuthorizationManager and PolicyService

Author: angelmp01

api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/facade/ComponentsFacade.java

@@ -21,23 +21,4 @@ public Component getProjectComponent(String projectId, String componentId) {
     public Component createProjectComponent(String projectId, CreateComponentRequest createComponentRequest) {
         return marketplaceExternalService.createProjectComponent(projectId, createComponentRequest);
     }
-
-    @Service
-    class MarketplaceExternalServicePlaceholder implements ExternalService {
-
-        @Override
-        public boolean isHealthy() {
-            return false;
-        }
-
-        public Component getProjectComponent(String projectId, String componentId) {
-            log.info("Get component with id '" + componentId + "' for project '" + projectId + "'");
-            return null;
-        }
-
-        public Component createProjectComponent(String projectId, CreateComponentRequest createComponentRequest) {
-            log.info("Creating component for project '" + projectId + "'" + " with request: " + createComponentRequest);
-            return null;
-        }
-    }
 }

api-project-component-v0/src/main/java/org/opendevstack/apiservice/project/facade/MarketplaceExternalServicePlaceholder.java

@@ -0,0 +1,27 @@
+package org.opendevstack.apiservice.project.facade;
+
+import lombok.extern.slf4j.Slf4j;
+import org.opendevstack.apiservice.externalservice.api.ExternalService;
+import org.opendevstack.apiservice.project.model.Component;
+import org.opendevstack.apiservice.project.model.CreateComponentRequest;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+class MarketplaceExternalServicePlaceholder implements ExternalService {
+
+    @Override
+    public boolean isHealthy() {
+        return false;
+    }
+
+    public Component getProjectComponent(String projectId, String componentId) {
+        log.info("Get component with id '" + componentId + "' for project '" + projectId + "'");
+        return null;
+    }
+
+    public Component createProjectComponent(String projectId, CreateComponentRequest createComponentRequest) {
+        log.info("Creating component for project '" + projectId + "'" + " with request: " + createComponentRequest);
+        return null;
+    }
+}

api-project-component-v0/src/test/java/org/opendevstack/apiservice/project/facade/ComponentsServiceTest.java

@@ -19,7 +19,7 @@
 class ComponentsServiceTest {
 
     @Mock
-    private ComponentsFacade.MarketplaceExternalServicePlaceholder marketPlaceExternalServicePlaceholder;
+    private MarketplaceExternalServicePlaceholder marketPlaceExternalServicePlaceholder;
 
     private ComponentsFacade componentsFacade;
 

core-security/src/main/java/org/opendevstack/apiservice/core/security/authorization/PolicyAuthorizationManager.java

@@ -1,26 +1,20 @@
 package org.opendevstack.apiservice.core.security.authorization;
 
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
-import java.util.Optional;
-
 import org.opendevstack.apiservice.core.contracts.auth.AuthorizationDecision;
 import org.opendevstack.apiservice.core.contracts.policy.PolicyContext;
 import org.opendevstack.apiservice.core.contracts.policy.PolicyRule;
 import org.opendevstack.apiservice.core.contracts.registry.ApiDefinition;
-import org.opendevstack.apiservice.core.security.filter.AuthTypeEnforcementFilter;
 import org.opendevstack.apiservice.core.security.registry.ApiDefinitionResolver;
-//** */ import org.opendevstack.apiservice.core.engine.filter.CachedBodyHttpServletRequest;
-//** */import org.opendevstack.apiservice.core.security.filter.AuthTypeEnforcementFilter;
 import org.springframework.security.authorization.AuthorizationManager;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.access.intercept.RequestAuthorizationContext;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
-import java.util.Map;
+import java.util.Optional;
 import java.util.function.Supplier;
 
 /**

core-security/src/main/java/org/opendevstack/apiservice/core/security/authorization/PolicyService.java

@@ -1,9 +1,7 @@
 package org.opendevstack.apiservice.core.security.authorization;
 
-//import org.opendevstack.apiservice.core.config.CacheConfig;
 import org.opendevstack.apiservice.core.contracts.persistence.PolicyDao;
 import org.opendevstack.apiservice.core.contracts.policy.PolicyRule;
-//import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -17,9 +15,7 @@ public class PolicyService {
     public PolicyService(PolicyDao policyDao) {
         this.policyDao = policyDao;
     }
-
-//    @Cacheable(cacheNames = CacheConfig.POLICIES_CACHE,
-//               key = "#apiDefinitionId + '::' + (#clientId != null ? #clientId : '*')")
+    
     public List<PolicyRule> findPolicies(String apiDefinitionId, String clientId) {
         if (clientId != null) {
             List<PolicyRule> rules = new ArrayList<>();

core-security/src/test/java/org/opendevstack/apiservice/core/security/authorization/PolicyAuthorizationManagerTest.java

@@ -12,11 +12,19 @@
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.security.web.access.intercept.RequestAuthorizationContext;
 
-import java.util.*;
-import java.util.function.Supplier;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
 
 class PolicyAuthorizationManagerTest {
 

core-security/src/test/java/org/opendevstack/apiservice/core/security/authorization/PolicyContextFactoryTest.java

@@ -10,10 +10,13 @@
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 
 import java.time.Instant;
-import java.util.Map;
 import java.util.Set;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class PolicyContextFactoryTest {
 

core-security/src/test/java/org/opendevstack/apiservice/core/security/authorization/PolicyEngineTest.java

@@ -12,8 +12,12 @@
 import java.util.Map;
 import java.util.UUID;
 
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 class PolicyEngineTest {
 

core-security/src/test/java/org/opendevstack/apiservice/core/security/authorization/PolicyServiceTest.java

@@ -9,8 +9,13 @@
 import java.util.Map;
 import java.util.UUID;
 
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 class PolicyServiceTest {
 

core-security/src/test/java/org/opendevstack/apiservice/core/security/config/SecurityConfigTest.java

@@ -7,8 +7,10 @@
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.web.SecurityFilterChain;
 
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 class SecurityConfigTest {