Skip to content
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

[EJBCLIENT-226] Add configured cluster ServiceURLs to discovery mechanism #269

Merged
merged 1 commit into from
May 16, 2017
Merged

[EJBCLIENT-226] Add configured cluster ServiceURLs to discovery mechanism #269

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
30 changes: 25 additions & 5 deletions src/main/java/org/jboss/ejb/client/legacy/DiscoveryLegacyConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,20 @@

package org.jboss.ejb.client.legacy;

import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;

import org.jboss.ejb._private.Logs;
import org.jboss.ejb.client.ClusterNodeSelector;
import org.jboss.ejb.client.EJBClientContext;
import org.kohsuke.MetaInfServices;
import org.wildfly.common.function.ExceptionSupplier;
import org.wildfly.discovery.AttributeValue;
import org.wildfly.discovery.ServiceRegistration;
import org.wildfly.discovery.ServiceURL;
import org.wildfly.discovery.impl.StaticDiscoveryProvider;
import org.wildfly.discovery.spi.DiscoveryProvider;
Expand All @@ -36,7 +41,10 @@
/**
* The interface to merge EJB properties into the discovery configuration.
*
* We want to make any information concerning configured clustered nodes available via abstract ServiceURLs.
*
* @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
* @author <a href='mailto:rachmato@redhat.com">Richard Achmatowicz</a>
*/
@MetaInfServices
public final class DiscoveryLegacyConfiguration implements ExternalDiscoveryConfigurator {
Expand All @@ -48,17 +56,29 @@ public void configure(final Consumer<DiscoveryProvider> discoveryProviderConsume

final List<ServiceURL> list = new ArrayList<>();

// for each node within a cluster, create a ServiceURL representing that cluster node
// service:ejb.jboss:node:<node name>;cluster=<cluster name>
for (Map.Entry<String, JBossEJBProperties.ClusterConfiguration> entry : ejbProperties.getClusterConfigurations().entrySet()) {
final String name = entry.getKey();
final String clusterName = entry.getKey();
final JBossEJBProperties.ClusterConfiguration configuration = entry.getValue();
final ExceptionSupplier<ClusterNodeSelector, ReflectiveOperationException> clusterNodeSelectorSupplier = configuration.getClusterNodeSelectorSupplier();
final long maximumAllowedConnectedNodes = configuration.getMaximumAllowedConnectedNodes();

final AttributeValue clusterValue = AttributeValue.fromString(clusterName);
for (JBossEJBProperties.ClusterNodeConfiguration nodeConfiguration : configuration.getNodeConfigurations()) {
final String nodeName = nodeConfiguration.getNodeName();

// construct an abstract ServiceURL mapping cluster -> node
final ServiceURL.Builder abstractBuilder = new ServiceURL.Builder();
abstractBuilder.setAbstractType("ejb");
abstractBuilder.setAbstractTypeAuthority("jboss");
abstractBuilder.addAttribute(EJBClientContext.FILTER_ATTR_CLUSTER, clusterValue);
try {
abstractBuilder.setUri(new URI("node", nodeName, null));
} catch (URISyntaxException e) {
Logs.REMOTING.trace("Ignoring cluster node " + nodeName + " because the URI failed to be built", e);
continue;
}
// add the new ServiceURL to our provider
list.add(abstractBuilder.create());
}
// todo: construct URI and map cluster:name to it
}

if (! list.isEmpty()) {
Expand Down