diff --git a/backend/fossology/src/main/java/org/eclipse/sw360/fossology/FossologyHandler.java b/backend/fossology/src/main/java/org/eclipse/sw360/fossology/FossologyHandler.java index 91069c531f..ce792455d6 100644 --- a/backend/fossology/src/main/java/org/eclipse/sw360/fossology/FossologyHandler.java +++ b/backend/fossology/src/main/java/org/eclipse/sw360/fossology/FossologyHandler.java @@ -70,7 +70,7 @@ public class FossologyHandler implements FossologyService.Iface { boolean reportStep = false; - @Autowired + public FossologyHandler( FossologyRestConfig fossologyRestConfig, FossologyRestClient fossologyRestClient, AttachmentConnector attachmentConnector) { diff --git a/backend/fossology/src/main/java/org/eclipse/sw360/fossology/FossologyServlet.java b/backend/fossology/src/main/java/org/eclipse/sw360/fossology/FossologyServlet.java index 6a6b122269..ea5fc17690 100644 --- a/backend/fossology/src/main/java/org/eclipse/sw360/fossology/FossologyServlet.java +++ b/backend/fossology/src/main/java/org/eclipse/sw360/fossology/FossologyServlet.java @@ -25,7 +25,7 @@ @Controller public class FossologyServlet extends SpringTServlet { - @Autowired + public FossologyServlet(FossologyHandler fossologyHandler) throws MalformedURLException { // Create a service processor using the provided handler super(new FossologyService.Processor<>(fossologyHandler), new TCompactProtocol.Factory()); diff --git a/backend/fossology/src/main/java/org/eclipse/sw360/fossology/config/FossologyRestConfig.java b/backend/fossology/src/main/java/org/eclipse/sw360/fossology/config/FossologyRestConfig.java index abf36e09bf..b74d9bf6d5 100644 --- a/backend/fossology/src/main/java/org/eclipse/sw360/fossology/config/FossologyRestConfig.java +++ b/backend/fossology/src/main/java/org/eclipse/sw360/fossology/config/FossologyRestConfig.java @@ -52,7 +52,7 @@ public class FossologyRestConfig { private static final String BASEURL_VERSION_SUFFIX = "/api/v2"; - @Autowired + public FossologyRestConfig(ConfigContainerRepository repository) throws SW360Exception { this.repository = repository; // eager loading (or initial insert) diff --git a/backend/fossology/src/main/java/org/eclipse/sw360/fossology/rest/FossologyRestClient.java b/backend/fossology/src/main/java/org/eclipse/sw360/fossology/rest/FossologyRestClient.java index 0fdc819668..3a115e12e2 100644 --- a/backend/fossology/src/main/java/org/eclipse/sw360/fossology/rest/FossologyRestClient.java +++ b/backend/fossology/src/main/java/org/eclipse/sw360/fossology/rest/FossologyRestClient.java @@ -92,7 +92,7 @@ public class FossologyRestClient { private final String expectedVersionPrefix = "2."; - @Autowired + public FossologyRestClient(ObjectMapper objectMapper, FossologyRestConfig restConfig, RestTemplate restTemplate) { this.objectMapper = objectMapper; this.restConfig = restConfig; diff --git a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/rest/OAuthClientController.java b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/rest/OAuthClientController.java index edee10ebea..4226db7294 100644 --- a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/rest/OAuthClientController.java +++ b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/rest/OAuthClientController.java @@ -68,17 +68,22 @@ public class OAuthClientController { */ public static final String UNUSED_REDIRECT_URI = "https://localhost/unused-redirect"; - @Autowired - private PasswordEncoder passwordEncoder; + + private final PasswordEncoder passwordEncoder; @Value("${security.oauth2.resource.id}") private String resourceId; - @Autowired - private OAuthClientRepository repo; - @Autowired - private Sw360UserMirrorService userMirrorService; + private final OAuthClientRepository repo; + + private final Sw360UserMirrorService userMirrorService; + + OAuthClientController(PasswordEncoder passwordEncoder, OAuthClientRepository oAuthClientRepository, Sw360UserMirrorService sw360UserMirrorService) { + this.passwordEncoder = passwordEncoder; + this.repo = oAuthClientRepository; + this.userMirrorService = sw360UserMirrorService; + } /** * Normalize a caller-supplied {@code scope} set to the canonical diff --git a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/service/Sw360ClientDetailsService.java b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/service/Sw360ClientDetailsService.java index a516197767..b8ada0e299 100644 --- a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/service/Sw360ClientDetailsService.java +++ b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/service/Sw360ClientDetailsService.java @@ -49,8 +49,11 @@ public class Sw360ClientDetailsService implements RegisteredClientRepository { @Value("${security.refreshtoken.validity:360}") private Integer defaultRefreshTokenValiditySeconds; - @Autowired - private OAuthClientRepository clientRepo; + private final OAuthClientRepository clientRepo; + + Sw360ClientDetailsService(OAuthClientRepository oAuthClientRepository) { + this.clientRepo = oAuthClientRepository; + } @Override public RegisteredClient findByClientId(@Nonnull String clientId) { diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/cache/CacheAdminController.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/cache/CacheAdminController.java index 86fba41a5f..30291d0a0a 100644 --- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/cache/CacheAdminController.java +++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/cache/CacheAdminController.java @@ -47,7 +47,6 @@ * for all READ-only users on all endpoints — not just admin endpoints.

*/ @BasePathAwareController -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) @RestController @SecurityRequirement(name = "tokenAuth") @SecurityRequirement(name = "basic") @@ -63,6 +62,11 @@ public class CacheAdminController implements RepresentationModelProcessor tokenCustomizer() { diff --git a/rest/rest-common/src/main/java/org/eclipse/sw360/rest/common/security/authproviders/Sw360UserAuthenticationProvider.java b/rest/rest-common/src/main/java/org/eclipse/sw360/rest/common/security/authproviders/Sw360UserAuthenticationProvider.java index 05528b19a8..71497a309d 100644 --- a/rest/rest-common/src/main/java/org/eclipse/sw360/rest/common/security/authproviders/Sw360UserAuthenticationProvider.java +++ b/rest/rest-common/src/main/java/org/eclipse/sw360/rest/common/security/authproviders/Sw360UserAuthenticationProvider.java @@ -5,7 +5,6 @@ package org.eclipse.sw360.rest.common.security.authproviders; import org.eclipse.sw360.rest.common.client.service.Sw360UserDetailsService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -23,11 +22,14 @@ @Service public class Sw360UserAuthenticationProvider implements AuthenticationProvider { - @Autowired - private Sw360UserDetailsService userDetailsService; + private final Sw360UserDetailsService userDetailsService; - @Autowired - private PasswordEncoder passwordEncoder; + private final PasswordEncoder passwordEncoder; + + public Sw360UserAuthenticationProvider(PasswordEncoder passwordEncoder, Sw360UserDetailsService sw360UserDetailsService) { + this.passwordEncoder = passwordEncoder; + this.userDetailsService = sw360UserDetailsService; + } /** * @param authentication the authentication request object. diff --git a/rest/rest-common/src/test/java/org/eclipse/sw360/rest/authserver/security/authproviders/Sw360UserAuthenticationProviderTest.java b/rest/rest-common/src/test/java/org/eclipse/sw360/rest/authserver/security/authproviders/Sw360UserAuthenticationProviderTest.java index 63ca548084..bb9970f03a 100644 --- a/rest/rest-common/src/test/java/org/eclipse/sw360/rest/authserver/security/authproviders/Sw360UserAuthenticationProviderTest.java +++ b/rest/rest-common/src/test/java/org/eclipse/sw360/rest/authserver/security/authproviders/Sw360UserAuthenticationProviderTest.java @@ -33,11 +33,12 @@ public class Sw360UserAuthenticationProviderTest { @Test public void shouldAddPasswordFactorAuthority_onSuccessfulAuthentication() { - Sw360UserAuthenticationProvider provider = new Sw360UserAuthenticationProvider(); Sw360UserDetailsService userDetailsService = mock(Sw360UserDetailsService.class); PasswordEncoder passwordEncoder = mock(PasswordEncoder.class); + Sw360UserAuthenticationProvider provider = new Sw360UserAuthenticationProvider(passwordEncoder, userDetailsService); + ReflectionTestUtils.setField(provider, "userDetailsService", userDetailsService); ReflectionTestUtils.setField(provider, "passwordEncoder", passwordEncoder);