Modernize @Autowired usage for Spring Boot 3.5 in 10 service classes

Convert field injection to constructor injection pattern for:
- UsagePointServiceImpl (with interface compatibility)
- ImportServiceImpl (with @qualifier support)
- ResourceServiceImpl
- RetailCustomerServiceImpl
- AuthorizationServiceImpl
- ServiceLocationServiceImpl
- StatementServiceImpl
- BatchListServiceImpl
- ReadingTypeServiceImpl
- ModernExportService (remove unnecessary @Autowired)

Benefits:
- Immutable dependencies with final fields
- Better testability and fail-fast dependency resolution
- Follows Spring Boot 3.5 best practices
- Eliminates ~40 @Autowired annotations and ~80 getter/setter methods

Remaining: 16 service classes still need modernization
Status: 10/26 service classes modernized (38% complete)

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

Author: dfcoffin

src/main/java/org/greenbuttonalliance/espi/common/service/customer/impl/ServiceLocationServiceImpl.java

@@ -40,8 +40,11 @@
 @Transactional
 public class ServiceLocationServiceImpl implements ServiceLocationService {
 
-    @Autowired
-    private ServiceLocationRepository serviceLocationRepository;
+    private final ServiceLocationRepository serviceLocationRepository;
+
+    public ServiceLocationServiceImpl(ServiceLocationRepository serviceLocationRepository) {
+        this.serviceLocationRepository = serviceLocationRepository;
+    }
 
     @Override
     @Transactional(readOnly = true)

src/main/java/org/greenbuttonalliance/espi/common/service/customer/impl/StatementServiceImpl.java

@@ -42,8 +42,11 @@
 @Transactional
 public class StatementServiceImpl implements StatementService {
 
-    @Autowired
-    private StatementRepository statementRepository;
+    private final StatementRepository statementRepository;
+
+    public StatementServiceImpl(StatementRepository statementRepository) {
+        this.statementRepository = statementRepository;
+    }
 
     @Override
     @Transactional(readOnly = true)

src/main/java/org/greenbuttonalliance/espi/common/service/export/ModernExportService.java

@@ -47,7 +47,6 @@ public class ModernExportService {
     private final MeterReadingExportService meterReadingExportService;
     private final AtomExportService atomExportService;
 
-    @Autowired
     public ModernExportService(
         UsagePointExportService usagePointExportService,
         MeterReadingExportService meterReadingExportService,

src/main/java/org/greenbuttonalliance/espi/common/service/impl/AuthorizationServiceImpl.java

@@ -41,17 +41,20 @@
 @Service
 public class AuthorizationServiceImpl implements AuthorizationService {
 
-	@Autowired
-	private AuthorizationRepository authorizationRepository;
-
-	@Autowired
-	private UsagePointRepository usagePointRepository;
-
-	@Autowired
-	private ResourceService resourceService;
-
-	@Autowired
-	private ImportService importService;
+	private final AuthorizationRepository authorizationRepository;
+	private final UsagePointRepository usagePointRepository;
+	private final ResourceService resourceService;
+	private final ImportService importService;
+
+	public AuthorizationServiceImpl(AuthorizationRepository authorizationRepository,
+									UsagePointRepository usagePointRepository,
+									ResourceService resourceService,
+									ImportService importService) {
+		this.authorizationRepository = authorizationRepository;
+		this.usagePointRepository = usagePointRepository;
+		this.resourceService = resourceService;
+		this.importService = importService;
+	}
 
 	@Override
 	public List<Authorization> findAllByRetailCustomerId(Long retailCustomerId) {
@@ -260,38 +263,5 @@ public List<Long> findAllIdsByBulkId(String thirdParty, Long bulkId) {
 		return authorizationRepository.findAllIdsByBulkId(thirdParty, bulkId.toString());
 	}
 
-	public void setAuthorizationRepository(
-			AuthorizationRepository authorizationRepository) {
-		this.authorizationRepository = authorizationRepository;
-	}
-
-	public AuthorizationRepository getAuthorizationRepository() {
-		return this.authorizationRepository;
-	}
-
-	public void setUsagePointRepository(
-			UsagePointRepository usagePointRepository) {
-		this.usagePointRepository = usagePointRepository;
-	}
-
-	public UsagePointRepository getUsagePointRepository() {
-		return this.usagePointRepository;
-	}
-
-	public void setResourceService(ResourceService resourceService) {
-		this.resourceService = resourceService;
-	}
-
-	public ResourceService getResourceService() {
-		return this.resourceService;
-	}
-
-	public void setImportService(ImportService importService) {
-		this.importService = importService;
-	}
-
-	public ImportService getImportService() {
-		return this.importService;
-	}
 
 }

src/main/java/org/greenbuttonalliance/espi/common/service/impl/BatchListServiceImpl.java

@@ -35,8 +35,11 @@
 		org.springframework.dao.EmptyResultDataAccessException.class })
 public class BatchListServiceImpl implements BatchListService {
 
-	@Autowired
-	private BatchListRepository repository;
+	private final BatchListRepository repository;
+
+	public BatchListServiceImpl(BatchListRepository repository) {
+		this.repository = repository;
+	}
 
 	@Override
 	public void persist(BatchList batchList) {
@@ -48,9 +51,6 @@ public List<BatchList> findAll() {
 		return repository.findAll();
 	}
 
-	public void setRepository(BatchListRepository repository) {
-		this.repository = repository;
-	}
 
 	public BatchListRepository getRepository(BatchListRepository repository) {
 		return repository;

src/main/java/org/greenbuttonalliance/espi/common/service/impl/ImportServiceImpl.java

@@ -49,27 +49,29 @@ public class ImportServiceImpl implements ImportService {
 
 	private final Log logger = LogFactory.getLog(getClass());
 
-	@Autowired
-	@Qualifier("domainMarshaller")
-	private Jaxb2Marshaller jaxb2Marshaller;
-
-	@Autowired
-	private AuthorizationService authorizationService;
-
-	@Autowired
-	private SubscriptionService subscriptionService;
-
-	@Autowired
-	private UsagePointService usagePointService;
-
-	@Autowired
-	private RetailCustomerService retailCustomerService;
-
-	@Autowired
-	private ResourceService resourceService;
-
-	@Autowired
-	private EntryProcessorService entryProcessorService;
+	private final Jaxb2Marshaller jaxb2Marshaller;
+	private final AuthorizationService authorizationService;
+	private final SubscriptionService subscriptionService;
+	private final UsagePointService usagePointService;
+	private final RetailCustomerService retailCustomerService;
+	private final ResourceService resourceService;
+	private final EntryProcessorService entryProcessorService;
+
+	public ImportServiceImpl(@Qualifier("domainMarshaller") Jaxb2Marshaller jaxb2Marshaller,
+							 AuthorizationService authorizationService,
+							 SubscriptionService subscriptionService,
+							 UsagePointService usagePointService,
+							 RetailCustomerService retailCustomerService,
+							 ResourceService resourceService,
+							 EntryProcessorService entryProcessorService) {
+		this.jaxb2Marshaller = jaxb2Marshaller;
+		this.authorizationService = authorizationService;
+		this.subscriptionService = subscriptionService;
+		this.usagePointService = usagePointService;
+		this.retailCustomerService = retailCustomerService;
+		this.resourceService = resourceService;
+		this.entryProcessorService = entryProcessorService;
+	}
 
 	// this is a list of the UsagePointIds referenced during
 	// this import
@@ -254,63 +256,5 @@ public void importData(InputStream stream, Long retailCustomerId)
 		}
 	}
 
-	public void setJaxb2Marshaller(Jaxb2Marshaller marshaller) {
-		this.jaxb2Marshaller = marshaller;
-	}
-
-	public Jaxb2Marshaller getJaxb2Marshaller() {
-		return this.jaxb2Marshaller;
-	}
-
-	public void setAuthorizationService(
-			AuthorizationService authorizationService) {
-		this.authorizationService = authorizationService;
-	}
-
-	public AuthorizationService getAuthorizationService() {
-		return this.authorizationService;
-	}
-
-	public void setSubscriptionService(SubscriptionService subscriptionService) {
-		this.subscriptionService = subscriptionService;
-	}
-
-	public SubscriptionService getSubscriptionService() {
-		return this.subscriptionService;
-	}
-
-	public void setUsagePointService(UsagePointService usagePointService) {
-		this.usagePointService = usagePointService;
-	}
-
-	public UsagePointService getUsagePointService() {
-		return this.usagePointService;
-	}
-
-	public void setRetailCustomerService(
-			RetailCustomerService retailCustomerService) {
-		this.retailCustomerService = retailCustomerService;
-	}
-
-	public RetailCustomerService getRetailCustomerService() {
-		return this.retailCustomerService;
-	}
-
-	public void setResourceService(ResourceService resourceService) {
-		this.resourceService = resourceService;
-	}
-
-	public ResourceService getResourceService() {
-		return this.resourceService;
-	}
-
-	public void setEntryProcessorService(
-			EntryProcessorService entryProcessorService) {
-		this.entryProcessorService = entryProcessorService;
-	}
-
-	public EntryProcessorService getEntryProcessorService() {
-		return this.entryProcessorService;
-	}
 
 }

src/main/java/org/greenbuttonalliance/espi/common/service/impl/ReadingTypeServiceImpl.java

@@ -39,14 +39,22 @@
 @Service
 public class ReadingTypeServiceImpl implements ReadingTypeService {
 
-	@Autowired
-	private ReadingTypeRepository readingTypeRepository;
-
-	@Autowired
-	private ResourceService resourceService;
+	private final ReadingTypeRepository readingTypeRepository;
+	private final ResourceService resourceService;
+	private final ImportService importService;
+
+	public ReadingTypeServiceImpl(ReadingTypeRepository readingTypeRepository,
+								  ResourceService resourceService,
+								  ImportService importService) {
+		this.readingTypeRepository = readingTypeRepository;
+		this.resourceService = resourceService;
+		this.importService = importService;
+	}
 
-	@Autowired
-	private ImportService importService;
+	@Override
+	public void setReadingTypeRepository(ReadingTypeRepository readingTypeRepository) {
+		// No-op: constructor injection used, but interface requires this method  
+	}
 
 	@Override
 	public ReadingType findByUUID(UUID uuid) {
@@ -144,28 +152,5 @@ public ReadingType importResource(InputStream stream) {
 		}
 	}
 
-	public void setReadingTypeRepository(ReadingTypeRepository repository) {
-		this.readingTypeRepository = repository;
-	}
-
-	public ReadingTypeRepository getReadingTypeRepository() {
-		return this.readingTypeRepository;
-	}
-
-	public void setResourceService(ResourceService resourceService) {
-		this.resourceService = resourceService;
-	}
-
-	public ResourceService getResourceService() {
-		return this.resourceService;
-	}
-
-	public void setImportService(ImportService importService) {
-		this.importService = importService;
-	}
-
-	public ImportService getImportService() {
-		return this.importService;
-	}
 
 }

src/main/java/org/greenbuttonalliance/espi/common/service/impl/ResourceServiceImpl.java

@@ -37,8 +37,11 @@
 @Service
 public class ResourceServiceImpl implements ResourceService {
 
-	@Autowired
-	private ResourceRepository repository;
+	private final ResourceRepository repository;
+
+	public ResourceServiceImpl(ResourceRepository repository) {
+		this.repository = repository;
+	}
 
 	/**
 	 * A private Map of Key:Value strings to hold the dynamic configuration.
@@ -230,9 +233,6 @@ public <T extends IdentifiedObject> Long findIdByXPath(Long id1, Long id2,
 		return repository.findIdByXPath(id1, id2, id3, id4, clazz);
 	}
 
-	public void setRepository(ResourceRepository repository) {
-		this.repository = repository;
-	}
 
 	@Override
 	public <T extends IdentifiedObject> EntryTypeIterator findEntryTypeIterator(
@@ -319,13 +319,6 @@ public <T extends IdentifiedObject> T merge(IdentifiedObject resource) {
 
 	}
 
-	public void setResourceRepository(ResourceRepository repository) {
-		this.repository = repository;
-	}
-
-	public ResourceRepository getResourceRepository() {
-		return this.repository;
-	}
 
 	@Override
 	public void setConfigurations(Map<String, String> params) {