Sonar autowired cont.

R-Sandor · Sep 15, 2024 · 8902011 · 8902011
1 parent 848784b
commit 8902011
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/server/src/main/java/dev/findfirst/security/userAuth/tenant/data/TenantService.java b/server/src/main/java/dev/findfirst/security/userAuth/tenant/data/TenantService.java
@@ -4,14 +4,14 @@
 import org.springframework.stereotype.Service;
 
 import jakarta.transaction.Transactional;
-
+import lombok.RequiredArgsConstructor;
 import dev.findfirst.security.userAuth.tenant.model.Tenant;
 
 @Service
+@RequiredArgsConstructor
 public class TenantService {
 
-  @Autowired
-  private TenantRepository tenantRepository;
+  private final TenantRepository tenantRepository;
 
   public Tenant create(String name) {
     var tenant = new Tenant();

diff --git a/server/src/test/java/dev/findfirst/core/controller/BookmarkControllerTest.java b/server/src/test/java/dev/findfirst/core/controller/BookmarkControllerTest.java
@@ -49,20 +49,22 @@
 @Testcontainers
 @IntegrationTest
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class BookmarkControllerTest {
+class BookmarkControllerTest {
 
   @Container
   @ServiceConnection
   static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:16.2-alpine3.19");
 
   @Autowired
-  BookmarkRepository bkmkRepo;
-
-  @Autowired
-  TestRestTemplate restTemplate;
+  BookmarkControllerTest(BookmarkRepository bookmarkRepository, TestRestTemplate tRestTemplate, WebApplicationContext wContext) { 
+    this.bkmkRepo = bookmarkRepository; 
+    this.restTemplate = tRestTemplate;
+    this.wac = wContext;
+  }
 
-  @Autowired
-  WebApplicationContext wac;
+  final BookmarkRepository bkmkRepo;
+  final TestRestTemplate restTemplate;
+  final WebApplicationContext wac;
 
   private WebTestClient client;