From 37530bb0cb3d1b48f5db2bd01be13ba790d406fb Mon Sep 17 00:00:00 2001 From: Rajmund Bocsi Date: Mon, 19 Apr 2021 15:53:16 +0200 Subject: [PATCH] adjust skeletons to changes in constants and enums --- .../skeleton/consumer/ConsumerApplicationInitListener.java | 2 +- .../skeleton/provider/ProviderApplicationInitListener.java | 2 +- .../publisher/PublisherApplicationInitListener.java | 6 +++--- .../subscriber/SubscriberApplicationInitListener.java | 6 +++--- .../security/SubscriberNotificationAccessControlFilter.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client-skeleton-consumer/src/main/java/eu/arrowhead/client/skeleton/consumer/ConsumerApplicationInitListener.java b/client-skeleton-consumer/src/main/java/eu/arrowhead/client/skeleton/consumer/ConsumerApplicationInitListener.java index 74158b6..0789f4d 100644 --- a/client-skeleton-consumer/src/main/java/eu/arrowhead/client/skeleton/consumer/ConsumerApplicationInitListener.java +++ b/client-skeleton-consumer/src/main/java/eu/arrowhead/client/skeleton/consumer/ConsumerApplicationInitListener.java @@ -29,7 +29,7 @@ public class ConsumerApplicationInitListener extends ApplicationInitListener { protected void customInit(final ContextRefreshedEvent event) { //Checking the availability of necessary core systems - checkCoreSystemReachability(CoreSystem.SERVICE_REGISTRY); + checkCoreSystemReachability(CoreSystem.SERVICEREGISTRY); checkCoreSystemReachability(CoreSystem.ORCHESTRATOR); diff --git a/client-skeleton-provider/src/main/java/eu/arrowhead/client/skeleton/provider/ProviderApplicationInitListener.java b/client-skeleton-provider/src/main/java/eu/arrowhead/client/skeleton/provider/ProviderApplicationInitListener.java index f92a44b..7c80394 100644 --- a/client-skeleton-provider/src/main/java/eu/arrowhead/client/skeleton/provider/ProviderApplicationInitListener.java +++ b/client-skeleton-provider/src/main/java/eu/arrowhead/client/skeleton/provider/ProviderApplicationInitListener.java @@ -52,7 +52,7 @@ public class ProviderApplicationInitListener extends ApplicationInitListener { protected void customInit(final ContextRefreshedEvent event) { //Checking the availability of necessary core systems - checkCoreSystemReachability(CoreSystem.SERVICE_REGISTRY); + checkCoreSystemReachability(CoreSystem.SERVICEREGISTRY); if (sslEnabled && tokenSecurityFilterEnabled) { checkCoreSystemReachability(CoreSystem.AUTHORIZATION); diff --git a/client-skeleton-publisher/src/main/java/eu/arrowhead/client/skeleton/publisher/PublisherApplicationInitListener.java b/client-skeleton-publisher/src/main/java/eu/arrowhead/client/skeleton/publisher/PublisherApplicationInitListener.java index ec3b239..b8a553f 100644 --- a/client-skeleton-publisher/src/main/java/eu/arrowhead/client/skeleton/publisher/PublisherApplicationInitListener.java +++ b/client-skeleton-publisher/src/main/java/eu/arrowhead/client/skeleton/publisher/PublisherApplicationInitListener.java @@ -67,7 +67,7 @@ public class PublisherApplicationInitListener extends ApplicationInitListener { @Override protected void customInit(final ContextRefreshedEvent event) { //Checking the availability of necessary core systems - checkCoreSystemReachability(CoreSystem.SERVICE_REGISTRY); + checkCoreSystemReachability(CoreSystem.SERVICEREGISTRY); if (sslEnabled && tokenSecurityFilterEnabled) { checkCoreSystemReachability(CoreSystem.AUTHORIZATION); @@ -80,8 +80,8 @@ protected void customInit(final ContextRefreshedEvent event) { logger.info("TokenSecurityFilter in not active"); } - if (arrowheadService.echoCoreSystem(CoreSystem.EVENT_HANDLER)) { - arrowheadService.updateCoreServiceURIs(CoreSystem.EVENT_HANDLER); + if (arrowheadService.echoCoreSystem(CoreSystem.EVENTHANDLER)) { + arrowheadService.updateCoreServiceURIs(CoreSystem.EVENTHANDLER); publishInitStartedEvent(); } diff --git a/client-skeleton-subscriber/src/main/java/eu/arrowhead/client/skeleton/subscriber/SubscriberApplicationInitListener.java b/client-skeleton-subscriber/src/main/java/eu/arrowhead/client/skeleton/subscriber/SubscriberApplicationInitListener.java index 7b097f0..e725161 100644 --- a/client-skeleton-subscriber/src/main/java/eu/arrowhead/client/skeleton/subscriber/SubscriberApplicationInitListener.java +++ b/client-skeleton-subscriber/src/main/java/eu/arrowhead/client/skeleton/subscriber/SubscriberApplicationInitListener.java @@ -67,7 +67,7 @@ public class SubscriberApplicationInitListener extends ApplicationInitListener { @Override protected void customInit(final ContextRefreshedEvent event) { //Checking the availability of necessary core systems - checkCoreSystemReachability(CoreSystem.SERVICE_REGISTRY); + checkCoreSystemReachability(CoreSystem.SERVICEREGISTRY); checkCoreSystemReachability(CoreSystem.ORCHESTRATOR); arrowheadService.updateCoreServiceURIs(CoreSystem.ORCHESTRATOR); @@ -87,8 +87,8 @@ protected void customInit(final ContextRefreshedEvent event) { setNotificationFilter(); } - if (arrowheadService.echoCoreSystem(CoreSystem.EVENT_HANDLER)) { - arrowheadService.updateCoreServiceURIs(CoreSystem.EVENT_HANDLER); + if (arrowheadService.echoCoreSystem(CoreSystem.EVENTHANDLER)) { + arrowheadService.updateCoreServiceURIs(CoreSystem.EVENTHANDLER); subscribeToPresetEvents(); } diff --git a/client-skeleton-subscriber/src/main/java/eu/arrowhead/client/skeleton/subscriber/security/SubscriberNotificationAccessControlFilter.java b/client-skeleton-subscriber/src/main/java/eu/arrowhead/client/skeleton/subscriber/security/SubscriberNotificationAccessControlFilter.java index e4b1a7a..762b437 100644 --- a/client-skeleton-subscriber/src/main/java/eu/arrowhead/client/skeleton/subscriber/security/SubscriberNotificationAccessControlFilter.java +++ b/client-skeleton-subscriber/src/main/java/eu/arrowhead/client/skeleton/subscriber/security/SubscriberNotificationAccessControlFilter.java @@ -26,7 +26,7 @@ public class SubscriberNotificationAccessControlFilter extends ArrowheadFilter { //================================================================================================= // members - private static final CoreSystem[] allowedCoreSystemsForSendingNotification = { CoreSystem.EVENT_HANDLER }; + private static final CoreSystem[] allowedCoreSystemsForSendingNotification = { CoreSystem.EVENTHANDLER }; private Map eventTypeMap; private String serverCN;