Skip to content

Commit e57d815

Browse files
authored
Merge pull request #18 from GreenButtonAlliance/feature/fix-compilation-errors
fix: resolve compilation errors from Spring Boot 3.5 migration
2 parents 7bd3be8 + c0da5f0 commit e57d815

File tree

3 files changed

+9
-67
lines changed

3 files changed

+9
-67
lines changed

openespi-common/src/main/java/org/greenbuttonalliance/espi/common/service/UsagePointService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
package org.greenbuttonalliance.espi.common.service;
2121

2222

23-
import com.sun.syndication.io.FeedException;
23+
import jakarta.xml.bind.JAXBException;
2424
import org.greenbuttonalliance.espi.common.domain.usage.RetailCustomerEntity;
2525
import org.greenbuttonalliance.espi.common.domain.usage.SubscriptionEntity;
2626
import org.greenbuttonalliance.espi.common.domain.usage.UsagePointEntity;
@@ -48,15 +48,15 @@ public interface UsagePointService {
4848

4949
List<Long> findAllIdsForRetailCustomer(Long id);
5050

51-
String feedFor(List<UsagePointEntity> usagePoints) throws FeedException;
51+
String feedFor(List<UsagePointEntity> usagePoints) throws JAXBException;
5252

5353
String entryFor(UsagePointEntity usagePoint);
5454

5555
List<UsagePointEntity> findAllByRetailCustomer(Long retailCustomerId);
5656

5757
void setRepository(UsagePointRepository usagePointRepository);
5858

59-
void setResourceService(ResourceService resourceService);
59+
// void setResourceService(ResourceService resourceService); // Removed for Spring Boot 3.5 migration
6060

6161
UsagePointEntity save(UsagePointEntity usagePoint);
6262

openespi-common/src/main/java/org/greenbuttonalliance/espi/common/service/impl/UpdateServiceImpl.java

Lines changed: 0 additions & 58 deletions
This file was deleted.

openespi-common/src/main/java/org/greenbuttonalliance/espi/common/service/impl/UsagePointServiceImpl.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.greenbuttonalliance.espi.common.service.impl;
2121

22-
import com.sun.syndication.io.FeedException;
22+
import jakarta.xml.bind.JAXBException;
2323
import org.greenbuttonalliance.espi.common.domain.usage.RetailCustomerEntity;
2424
import org.greenbuttonalliance.espi.common.domain.usage.SubscriptionEntity;
2525
import org.greenbuttonalliance.espi.common.domain.usage.UsagePointEntity;
@@ -63,10 +63,10 @@ public void setRepository(UsagePointRepository usagePointRepository) {
6363
// Repository is injected via constructor
6464
}
6565

66-
@Override
67-
public void setResourceService(ResourceService resourceService) {
68-
// ResourceService is no longer used - method kept for interface compatibility
69-
}
66+
// @Override
67+
// public void setResourceService(ResourceService resourceService) {
68+
// // ResourceService is no longer used - removed for Spring Boot 3.5 migration
69+
// }
7070

7171
@Override
7272
public List<UsagePointEntity> findAllByRetailCustomer(RetailCustomerEntity customer) {
@@ -141,7 +141,7 @@ public List<Long> findAllIdsForRetailCustomer(Long id) {
141141
}
142142

143143
@Override
144-
public String feedFor(List<UsagePointEntity> usagePoints) throws FeedException {
144+
public String feedFor(List<UsagePointEntity> usagePoints) throws JAXBException {
145145
// TODO: Implement modern feed generation using DTOs
146146
logger.info("Generating feed for " + usagePoints.size() + " usage points");
147147
return null;

0 commit comments

Comments
 (0)