Skip to content

better logging, removing updateRuntimeRegistration api after leveraging createOrUpdate #201

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
abhupadh merged 1 commit into from
Jan 12, 2024
+4 −23
Merged

better logging, removing updateRuntimeRegistration api after leveraging createOrUpdate #201

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
2 changes: 1 addition & 1 deletion events_test/src/main/java/com/adobe/aio/event/management/ProviderServiceTester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ private Provider assertProviderResponseAndCreateEventMetadata(ProviderInputModel
Set<EventMetadata> eventMetadataSet, Supplier<Optional<Provider>> providerSupplier) {
Optional<Provider> provider = providerSupplier.get();
assertTrue(provider.isPresent());
logger.info("Created AIO Events Provider: {}", provider);
logger.info("Created/Updated AIO Events Provider: {}", provider);
String providerId = provider.get().getId();
assertTrue(StringUtils.isNotBlank(providerId));
assertTrue(StringUtils.isNotBlank(provider.get().getInstanceId()));
Expand Down
25 changes: 3 additions & 22 deletions events_test/src/main/java/com/adobe/aio/event/management/RegistrationServiceTester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,19 +77,19 @@ public Registration createOrUpdateRuntimeWebhookRegistration(String registration

public Registration createOrUpdateRegistration(
RegistrationCreateModel.Builder registrationInputModelBuilder) {
return assertRegistrationCreatedResponseWithEventsOfInterest(registrationInputModelBuilder,
return assertRegistrationCreatedOrUpdatedResponseWithEventsOfInterest(registrationInputModelBuilder,
() -> registrationService.createOrUpdateRegistration(registrationInputModelBuilder));
}

public Registration assertRegistrationCreatedResponseWithEventsOfInterest(
public Registration assertRegistrationCreatedOrUpdatedResponseWithEventsOfInterest(
RegistrationCreateModel.Builder registrationInputModelBuilder,
Supplier<Optional<Registration>> registrationSupplier) {
RegistrationCreateModel registrationInputModel =
registrationInputModelBuilder.clientId(this.workspace.getApiKey()).build();
Optional<Registration> registrationOptional = registrationSupplier.get();
assertTrue(registrationOptional.isPresent());
Registration registrationCreated = registrationOptional.get();
logger.info("Created AIO Event Registration: {}", registrationOptional.get());
logger.info("Created/Updated AIO Event Registration: {}", registrationOptional.get());

assertNotNull(registrationCreated.getRegistrationId());
assertEquals(registrationInputModel.getDescription(), registrationCreated.getDescription());
Expand Down Expand Up @@ -126,25 +126,6 @@ public Registration assertRegistrationCreatedResponseWithEventsOfInterest(
return registrationOptional.get();
}

public Registration updateRuntimeWebhookRegistration(Registration registrationToUpdate,
String runtimeActionToUpdate) {
EventsOfInterest eventsOfInterest = registrationToUpdate.getEventsOfInterests().iterator().next();
String providerId = eventsOfInterest.getProviderId();
String eventCode = eventsOfInterest.getEventCode();
Optional<Registration> updatedRegistration =
registrationService.updateRegistration(registrationToUpdate.getRegistrationId(),
RegistrationUpdateModel.builder()
.name(registrationToUpdate.getName())
.description(TEST_DESCRIPTION)
.deliveryType(DELIVERY_TYPE_WEBHOOK)
.runtimeAction(runtimeActionToUpdate)
.addEventsOfInterests(getTestEventsOfInterestBuilder(providerId, eventCode).build()));

assertTrue(updatedRegistration.isPresent());
logger.info("Updated AIO Event Registration: {}", updatedRegistration.get());
return updatedRegistration.get();
}

public void deleteRegistration(String registrationId) {
if (registrationService.findById(registrationId).isPresent()) {
registrationService.delete(registrationId);
Expand Down