From 8ee7e3278699fee95448693b123edf2ab35ee48f Mon Sep 17 00:00:00 2001 From: abhupadh <> Date: Fri, 12 Jan 2024 16:28:31 +0530 Subject: [PATCH] better logging, removing updateRuntimeRegistration api after leveraging createOrUpdate --- .../management/ProviderServiceTester.java | 2 +- .../management/RegistrationServiceTester.java | 25 +++---------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/events_test/src/main/java/com/adobe/aio/event/management/ProviderServiceTester.java b/events_test/src/main/java/com/adobe/aio/event/management/ProviderServiceTester.java index 9774769f..888bc86e 100644 --- a/events_test/src/main/java/com/adobe/aio/event/management/ProviderServiceTester.java +++ b/events_test/src/main/java/com/adobe/aio/event/management/ProviderServiceTester.java @@ -81,7 +81,7 @@ private Provider assertProviderResponseAndCreateEventMetadata(ProviderInputModel Set eventMetadataSet, Supplier> providerSupplier) { Optional 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())); diff --git a/events_test/src/main/java/com/adobe/aio/event/management/RegistrationServiceTester.java b/events_test/src/main/java/com/adobe/aio/event/management/RegistrationServiceTester.java index a18e95ef..a492ce65 100644 --- a/events_test/src/main/java/com/adobe/aio/event/management/RegistrationServiceTester.java +++ b/events_test/src/main/java/com/adobe/aio/event/management/RegistrationServiceTester.java @@ -77,11 +77,11 @@ 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> registrationSupplier) { RegistrationCreateModel registrationInputModel = @@ -89,7 +89,7 @@ public Registration assertRegistrationCreatedResponseWithEventsOfInterest( Optional 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()); @@ -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 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);