[SYNCOPE-1968] Map each SRA and WA instance to a single Domain

client/am/console/src/main/java/org/apache/syncope/client/console/authprofiles/AuthProfileWizardBuilder.java

@@ -20,6 +20,7 @@
 
 import java.util.List;
 import org.apache.commons.lang3.SerializationUtils;
+import org.apache.syncope.client.console.SyncopeConsoleSession;
 import org.apache.syncope.client.console.panels.BeanPanel;
 import org.apache.syncope.client.console.rest.AuthProfileRestClient;
 import org.apache.syncope.client.console.wicket.markup.html.form.JsonEditorPanel;
@@ -104,7 +105,7 @@ protected class ConsentAttributes extends WizardStep {
             String attributes = "{}";
             try {
                 attributes = authProfileRestClient.readConsentAttributes(
-                        serviceOps.get(NetworkService.Type.WA),
+                        serviceOps.get(NetworkService.Type.WA, SyncopeConsoleSession.get().getDomain()),
                         consentDecision.getPrincipal(),
                         consentDecision.getId());
             } catch (Exception e) {

client/am/console/src/main/java/org/apache/syncope/client/console/pages/SRA.java

@@ -60,7 +60,8 @@ public SRA(final PageParameters parameters) {
         body.add(BookmarkablePageLinkBuilder.build("dashboard", "dashboardBr", Dashboard.class));
         body.setOutputMarkupId(true);
 
-        List<NetworkService> instances = serviceOps.list(NetworkService.Type.SRA);
+        List<NetworkService> instances = serviceOps.list(
+                NetworkService.Type.SRA, SyncopeConsoleSession.get().getDomain());
 
         AjaxLink<?> push = new AjaxLink<>("push") {
 

client/am/console/src/main/java/org/apache/syncope/client/console/pages/WA.java

@@ -110,7 +110,8 @@ public WA(final PageParameters parameters) {
         body.add(BookmarkablePageLinkBuilder.build("dashboard", "dashboardBr", Dashboard.class));
         body.setOutputMarkupId(true);
 
-        List<NetworkService> instances = serviceOps.list(NetworkService.Type.WA);
+        List<NetworkService> instances = serviceOps.list(
+                NetworkService.Type.WA, SyncopeConsoleSession.get().getDomain());
 
         modal = new BaseModal<>("push-modal");
         modal.setWindowClosedCallback(target -> modal.show(false));

client/am/enduser/src/main/java/org/apache/syncope/client/enduser/pages/AuthProfile.java

@@ -20,6 +20,7 @@
 
 import java.util.List;
 import java.util.stream.Collectors;
+import org.apache.syncope.client.enduser.SyncopeEnduserSession;
 import org.apache.syncope.client.enduser.rest.AuthProfileRestClient;
 import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.ui.commons.annotations.AMPage;
@@ -237,7 +238,7 @@ public void populateItem(final Item<WAConsentDecision> item) {
                 String attributes = "{}";
                 try {
                     attributes = restClient.readConsentAttributes(
-                            serviceOps.get(NetworkService.Type.WA),
+                            serviceOps.get(NetworkService.Type.WA, SyncopeEnduserSession.get().getDomain()),
                             item.getModelObject().getPrincipal(),
                             item.getModelObject().getId());
                 } catch (Exception e) {

client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java

@@ -125,13 +125,13 @@ public SyncopeCoreHealthIndicator syncopeCoreHealthIndicator(
             prefix = "keymaster", name = "enableAutoRegistration", havingValue = "true", matchIfMissing = true)
     @Bean
     public KeymasterStart keymasterStart() {
-        return new KeymasterStart(NetworkService.Type.CONSOLE);
+        return new KeymasterStart.Builder(NetworkService.Type.CONSOLE).build();
     }
 
     @ConditionalOnProperty(
             prefix = "keymaster", name = "enableAutoRegistration", havingValue = "true", matchIfMissing = true)
     @Bean
     public KeymasterStop keymasterStop() {
-        return new KeymasterStop(NetworkService.Type.CONSOLE);
+        return new KeymasterStop.Builder(NetworkService.Type.CONSOLE).build();
     }
 }

client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/Logs.java

@@ -25,6 +25,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
+import org.apache.syncope.client.console.SyncopeConsoleSession;
 import org.apache.syncope.client.console.panels.LogsPanel;
 import org.apache.syncope.client.console.rest.LoggerConf;
 import org.apache.syncope.client.console.rest.LoggerConfOp;
@@ -123,7 +124,8 @@ public Panel getPanel(final String panelId) {
             });
         }
 
-        List<NetworkService> waInstances = serviceOps.list(NetworkService.Type.WA);
+        List<NetworkService> waInstances = serviceOps.list(
+                NetworkService.Type.WA, SyncopeConsoleSession.get().getDomain());
         if (!waInstances.isEmpty()) {
             tabs.add(new AbstractTab(Model.of(NetworkService.Type.WA.name())) {
 
@@ -136,7 +138,8 @@ public Panel getPanel(final String panelId) {
             });
         }
 
-        List<NetworkService> sraInstances = serviceOps.list(NetworkService.Type.SRA);
+        List<NetworkService> sraInstances = serviceOps.list(
+                NetworkService.Type.SRA, SyncopeConsoleSession.get().getDomain());
         if (!sraInstances.isEmpty()) {
             tabs.add(new AbstractTab(Model.of(NetworkService.Type.SRA.name())) {
 

client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/NetworkServiceDirectoryPanel.java

@@ -40,6 +40,7 @@
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
 import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
@@ -58,12 +59,10 @@ public NetworkServiceDirectoryPanel(
             final NetworkService.Type type,
             final SyncopeRestClient syncopeRestClient,
             final PageReference pageRef) {
+
         super(id, syncopeRestClient, pageRef, true);
         this.type = type;
 
-        NetworkService service = new NetworkService();
-        service.setType(type);
-
         disableCheckBoxes();
 
         modal.size(Modal.Size.Large);
@@ -80,6 +79,10 @@ protected List<IColumn<NetworkService, String>> getColumns() {
 
         columns.add(new PropertyColumn<>(new StringResourceModel("address", this), "address", "address"));
 
+        if (type == NetworkService.Type.SRA || type == NetworkService.Type.WA) {
+            columns.add(new PropertyColumn<>(new StringResourceModel("domain", this), "domain", "domain"));
+        }
+
         return columns;
     }
 
@@ -145,15 +148,7 @@ public long size() {
 
         @Override
         public IModel<NetworkService> model(final NetworkService service) {
-            return new IModel<>() {
-
-                private static final long serialVersionUID = 999513782683391483L;
-
-                @Override
-                public NetworkService getObject() {
-                    return service;
-                }
-            };
+            return Model.of(service);
         }
     }
 }

client/idrepo/console/src/main/resources/org/apache/syncope/client/console/panels/NetworkServiceDirectoryPanel.properties

@@ -17,3 +17,4 @@
 any.edit=Edit implementation ${key}
 any.new=New ${type} implementation
 address=Address
+domain=Domain

client/idrepo/console/src/main/resources/org/apache/syncope/client/console/panels/NetworkServiceDirectoryPanel_it.properties

@@ -17,3 +17,4 @@
 any.edit=Modifica implementazione ${key}
 any.new=Nuova implementazione di ${type}
 address=Indirizzo
+domain=Dominio

client/idrepo/console/src/main/resources/org/apache/syncope/client/console/panels/NetworkServiceDirectoryPanel_ja.properties

@@ -17,3 +17,4 @@
 any.edit=\u5c0e\u5165 ${key} \u3092\u7de8\u96c6
 any.new=\u65b0\u3057\u3044 ${type} \u5c0e\u5165
 address=\u30a2\u30c9\u30ec\u30b9
+domain=Domain

client/idrepo/console/src/main/resources/org/apache/syncope/client/console/panels/NetworkServiceDirectoryPanel_pt_BR.properties

@@ -17,3 +17,4 @@
 any.edit=Edit implementation ${key}
 any.new=New ${type} implementation
 address=Address
+domain=Domain

client/idrepo/console/src/main/resources/org/apache/syncope/client/console/panels/NetworkServiceDirectoryPanel_ru.properties

@@ -18,3 +18,4 @@
 any.edit=Edit implementation ${key}
 any.new=New ${type} implementation
 address=Address
+domain=Domain

client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java

@@ -86,13 +86,13 @@ public SyncopeCoreHealthIndicator syncopeCoreHealthIndicator(
             prefix = "keymaster", name = "enableAutoRegistration", havingValue = "true", matchIfMissing = true)
     @Bean
     public KeymasterStart keymasterStart() {
-        return new KeymasterStart(NetworkService.Type.ENDUSER);
+        return new KeymasterStart.Builder(NetworkService.Type.ENDUSER).build();
     }
 
     @ConditionalOnProperty(
             prefix = "keymaster", name = "enableAutoRegistration", havingValue = "true", matchIfMissing = true)
     @Bean
     public KeymasterStop keymasterStop() {
-        return new KeymasterStop(NetworkService.Type.ENDUSER);
+        return new KeymasterStop.Builder(NetworkService.Type.ENDUSER).build();
     }
 }

common/keymaster/client-api/src/main/java/org/apache/syncope/common/keymaster/client/api/ServiceOps.java

@@ -32,11 +32,22 @@ public interface ServiceOps {
 
     List<NetworkService> list(NetworkService.Type serviceType);
 
+    List<NetworkService> list(NetworkService.Type serviceType, String domain);
+
     /**
      * Returns the service instance to invoke, for the given type.
      *
      * @param serviceType service type
      * @return service instance to invoke, for the given type
      */
     NetworkService get(NetworkService.Type serviceType);
+
+    /**
+     * Returns the service instance to invoke, for the given type and domain.
+     *
+     * @param serviceType service type
+     * @param domain domain
+     * @return service instance to invoke, for the given type and domain
+     */
+    NetworkService get(NetworkService.Type serviceType, String domain);
 }

common/keymaster/client-api/src/main/java/org/apache/syncope/common/keymaster/client/api/model/NetworkService.java

@@ -39,6 +39,8 @@ public enum Type {
 
     private String address;
 
+    private String domain;
+
     public Type getType() {
         return type;
     }
@@ -55,11 +57,20 @@ public void setAddress(final String address) {
         this.address = address;
     }
 
+    public String getDomain() {
+        return domain;
+    }
+
+    public void setDomain(final String domain) {
+        this.domain = domain;
+    }
+
     @Override
     public int hashCode() {
         return new HashCodeBuilder().
                 append(type).
                 append(address).
+                append(domain).
                 build();
     }
 
@@ -78,6 +89,7 @@ public boolean equals(final Object obj) {
         return new EqualsBuilder().
                 append(type, other.type).
                 append(address, other.address).
+                append(domain, other.domain).
                 build();
     }
 
@@ -86,6 +98,7 @@ public String toString() {
         return "NetworkService{"
                 + "type=" + type
                 + ", address=" + address
+                + ", domain=" + domain
                 + '}';
     }
 }

common/keymaster/client-api/src/main/java/org/apache/syncope/common/keymaster/client/api/startstop/KeymasterStart.java

@@ -24,7 +24,19 @@
 
 public class KeymasterStart extends KeymasterStartStop implements ApplicationListener<ContextRefreshedEvent> {
 
-    public KeymasterStart(final NetworkService.Type networkServiceType) {
+    public static class Builder extends KeymasterStartStop.Builder<KeymasterStart, Builder> {
+
+        public Builder(final NetworkService.Type networkServiceType) {
+            super(networkServiceType);
+        }
+
+        @Override
+        protected KeymasterStart newInstance(final NetworkService.Type networkServiceType) {
+            return new KeymasterStart(networkServiceType);
+        }
+    }
+
+    protected KeymasterStart(final NetworkService.Type networkServiceType) {
         super(networkServiceType);
     }
 

common/keymaster/client-api/src/main/java/org/apache/syncope/common/keymaster/client/api/startstop/KeymasterStartStop.java

@@ -25,22 +25,50 @@
 
 abstract class KeymasterStartStop {
 
+    protected abstract static class Builder<S extends KeymasterStartStop, B extends Builder<S, B>> {
+
+        protected final S instance;
+
+        Builder(final NetworkService.Type networkServiceType) {
+            instance = newInstance(networkServiceType);
+        }
+
+        protected abstract S newInstance(NetworkService.Type networkServiceType);
+
+        @SuppressWarnings("unchecked")
+        public B domain(final String domain) {
+            instance.setDomain(domain);
+            return (B) this;
+        }
+
+        public S build() {
+            return instance;
+        }
+    }
+
     @Autowired
     protected ServiceOps serviceOps;
 
     protected final NetworkService.Type networkServiceType;
 
+    private String domain;
+
+    @Value("${service.discovery.address}")
+    private String address;
+
     protected KeymasterStartStop(final NetworkService.Type networkServiceType) {
         this.networkServiceType = networkServiceType;
     }
 
-    @Value("${service.discovery.address}")
-    private String address;
+    protected void setDomain(final String domain) {
+        this.domain = domain;
+    }
 
     protected NetworkService getNetworkService() {
         NetworkService ns = new NetworkService();
         ns.setType(networkServiceType);
         ns.setAddress(address);
+        ns.setDomain(domain);
         return ns;
     }
 }

common/keymaster/client-api/src/main/java/org/apache/syncope/common/keymaster/client/api/startstop/KeymasterStop.java

@@ -24,7 +24,19 @@
 
 public class KeymasterStop extends KeymasterStartStop implements ApplicationListener<ContextClosedEvent> {
 
-    public KeymasterStop(final NetworkService.Type networkServiceType) {
+    public static class Builder extends KeymasterStartStop.Builder<KeymasterStop, Builder> {
+
+        public Builder(final NetworkService.Type networkServiceType) {
+            super(networkServiceType);
+        }
+
+        @Override
+        protected KeymasterStop newInstance(final NetworkService.Type networkServiceType) {
+            return new KeymasterStop(networkServiceType);
+        }
+    }
+
+    protected KeymasterStop(final NetworkService.Type networkServiceType) {
         super(networkServiceType);
     }