diff --git a/src/main/java/org/gcube/smartgears/handlers/application/lifecycle/ApplicationProfileManager.java b/src/main/java/org/gcube/smartgears/handlers/application/lifecycle/ApplicationProfileManager.java index 742631b..ec0c9a2 100644 --- a/src/main/java/org/gcube/smartgears/handlers/application/lifecycle/ApplicationProfileManager.java +++ b/src/main/java/org/gcube/smartgears/handlers/application/lifecycle/ApplicationProfileManager.java @@ -120,8 +120,7 @@ public class ApplicationProfileManager extends ApplicationLifecycleHandler { //(we may well have failed there) for (Publisher publisher: publishers) try { - publisher.publishApplication(context, - context.container().configuration().authorizationProvider().getContexts()); + publisher.update(context); }catch (Exception e) { log.error("cannot publish {} with publisher type {} (see details)",context.name(), publisher.getClass().getCanonicalName(), e); @@ -140,7 +139,7 @@ public class ApplicationProfileManager extends ApplicationLifecycleHandler { for (Publisher publisher: publishers) try { log.debug("publishing application in context {}", scope); - publisher.publishApplication(context, + publisher.create(context, Collections.singleton(scope)); }catch (Exception e) { @@ -161,7 +160,7 @@ public class ApplicationProfileManager extends ApplicationLifecycleHandler { for (Publisher publisher: publishers) try { log.debug("unpublishing application from scope {}", scope); - publisher.unpublishApplication(context, + publisher.remove(context, Collections.singleton(scope)); }catch (Exception e) { diff --git a/src/main/java/org/gcube/smartgears/handlers/container/lifecycle/ContainerProfileManager.java b/src/main/java/org/gcube/smartgears/handlers/container/lifecycle/ContainerProfileManager.java index b414098..a15ba64 100644 --- a/src/main/java/org/gcube/smartgears/handlers/container/lifecycle/ContainerProfileManager.java +++ b/src/main/java/org/gcube/smartgears/handlers/container/lifecycle/ContainerProfileManager.java @@ -104,8 +104,7 @@ public class ContainerProfileManager extends ContainerHandler { //(we may well have failed there) for (Publisher publisher: publishers) try { - publisher.publishContainer(context, - context.configuration().authorizationProvider().getContexts()); + publisher.update(context); }catch (Exception e) { log.error("cannot publish containar with publisher type {} (see details)", publisher.getClass().getCanonicalName(), e); @@ -123,7 +122,7 @@ public class ContainerProfileManager extends ContainerHandler { for (Publisher publisher: publishers) try { log.trace("publishing container within new scope"); - publisher.publishContainer(context, + publisher.create(context, Collections.singleton(scope)); }catch (Exception e) { @@ -144,7 +143,7 @@ public class ContainerProfileManager extends ContainerHandler { for (Publisher publisher: publishers) try { log.trace("unpublishing container from context {}", scope); - publisher.unpublishContainer(context, + publisher.remove(context, Collections.singleton(scope)); }catch (Exception e) { diff --git a/src/main/java/org/gcube/smartgears/publishing/Publisher.java b/src/main/java/org/gcube/smartgears/publishing/Publisher.java index d5a5105..8c451f8 100644 --- a/src/main/java/org/gcube/smartgears/publishing/Publisher.java +++ b/src/main/java/org/gcube/smartgears/publishing/Publisher.java @@ -7,11 +7,15 @@ import org.gcube.smartgears.context.container.ContainerContext; public interface Publisher { - boolean publishContainer(ContainerContext container, Set contexts); + boolean create(ContainerContext container, Set contexts); - boolean publishApplication(ApplicationContext application, Set contexts); + boolean create(ApplicationContext application, Set contexts); - boolean unpublishContainer(ContainerContext container, Set contexts); + boolean update(ApplicationContext application); - boolean unpublishApplication(ApplicationContext application, Set contexts); + boolean update(ContainerContext container); + + boolean remove(ApplicationContext application, Set contexts); + + boolean remove(ContainerContext application, Set contexts); }