Skip to content

refactor(#158): collapse NotificationServiceImpl to a single constructor #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dfcoffin merged 1 commit into from
Jun 5, 2026
Merged

refactor(#158): collapse NotificationServiceImpl to a single constructor #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 8 additions & 17 deletions ...c/main/java/org/greenbuttonalliance/espi/common/service/impl/NotificationServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.greenbuttonalliance.espi.common.service.SubscriptionService;
import org.greenbuttonalliance.espi.common.uri.EspiBatchUri;
import org.greenbuttonalliance.espi.common.xml.BatchListXmlCodec;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
Expand All @@ -54,26 +53,18 @@ public class NotificationServiceImpl implements NotificationService {
private final SubscriptionService subscriptionService;

/**
* Production constructor. Builds a standalone {@link RestClient} for posting ESPI
* {@code BatchList} notifications to Third Party {@code thirdPartyNotifyUri} endpoints.
* Replaces the legacy {@code RestTemplate} (#158).
* Builds the {@link RestClient} once from the autoconfigured {@link RestClient.Builder} for
* posting ESPI {@code BatchList} notifications to Third Party {@code thirdPartyNotifyUri}
* endpoints. Replaces the legacy {@code RestTemplate} (#158).
*
* <p>This is the sole constructor, so Spring selects it for injection without {@code @Autowired}.
* Tests pass their own {@code RestClient.builder()} (e.g. pointed at a stub receiver).</p>
*/
@Autowired
public NotificationServiceImpl(AuthorizationRepository authorizationRepository,
AuthorizationService authorizationService,
SubscriptionService subscriptionService) {
this(RestClient.create(), authorizationRepository, authorizationService, subscriptionService);
}

/**
* Test/seam constructor allowing a pre-configured {@link RestClient} (e.g. pointed at a
* stub receiver) to be injected.
*/
public NotificationServiceImpl(RestClient restClient,
public NotificationServiceImpl(RestClient.Builder restClientBuilder,
AuthorizationRepository authorizationRepository,
AuthorizationService authorizationService,
SubscriptionService subscriptionService) {
this.restClient = restClient;
this.restClient = restClientBuilder.build();
this.authorizationRepository = authorizationRepository;
this.authorizationService = authorizationService;
this.subscriptionService = subscriptionService;
Expand Down
2 changes: 1 addition & 1 deletion ...greenbuttonalliance/espi/common/service/impl/NotificationServiceImplWireContractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ void notifyPostsConformantBatchList() throws Exception {

// repositories/services are unused by the subscription notify path
NotificationServiceImpl service =
new NotificationServiceImpl(RestClient.create(), null, null, null);
new NotificationServiceImpl(RestClient.builder(), null, null, null);

service.notify(subscription, start, end);

Expand Down
Loading