ISPN-7593 Actually use the user-specified context path for the REST e…

…ndpoint

server/integration/endpoint/src/main/java/org/infinispan/server/endpoint/subsystem/RestConnectorResource.java

@@ -19,6 +19,7 @@
 package org.infinispan.server.endpoint.subsystem;
 
 import org.infinispan.rest.configuration.ExtendedHeaders;
+import org.infinispan.rest.configuration.RestServerConfigurationBuilder;
 import org.jboss.as.controller.AttributeDefinition;
 import org.jboss.as.controller.OperationStepHandler;
 import org.jboss.as.controller.PathElement;
@@ -49,10 +50,11 @@ public class RestConnectorResource extends CommonConnectorResource {
 
    static final SimpleAttributeDefinition CONTEXT_PATH =
          new SimpleAttributeDefinitionBuilder(ModelKeys.CONTEXT_PATH, ModelType.STRING, true)
-                 .setAllowExpression(true)
-                 .setXmlName(ModelKeys.CONTEXT_PATH)
-                 .setRestartAllServices()
-                 .build();
+               .setAllowExpression(true)
+               .setXmlName(ModelKeys.CONTEXT_PATH)
+               .setRestartAllServices()
+               .setDefaultValue(new ModelNode().set(RestServerConfigurationBuilder.DEFAULT_CONTEXT_PATH))
+               .build();
 
    static final SimpleAttributeDefinition EXTENDED_HEADERS =
          new SimpleAttributeDefinitionBuilder(ModelKeys.EXTENDED_HEADERS, ModelType.STRING, true)

server/integration/endpoint/src/main/java/org/infinispan/server/endpoint/subsystem/RestService.java

@@ -54,7 +54,6 @@
  * @since 6.0
  */
 public class RestService implements Service<NettyRestServer>, EncryptableService {
-   private static final String DEFAULT_CONTEXT_PATH = "";
    private final InjectedValue<PathManager> pathManagerInjector = new InjectedValue<>();
    private final InjectedValue<EmbeddedCacheManager> cacheManagerInjector = new InjectedValue<>();
    private final InjectedValue<SocketBinding> socketBinding = new InjectedValue<>();
@@ -63,40 +62,26 @@ public class RestService implements Service<NettyRestServer>, EncryptableService
    private final Map<String, InjectedValue<SecurityRealm>> sniDomains = new HashMap<>();
 
    private final RestAuthMethod authMethod;
-   private final ModelNode config;
    private final String serverName;
+   private final String contextPath;
+   private final ExtendedHeaders extendedHeaders;
+   private final Set<String> ignoredCaches;
    private NettyRestServer restServer;
    private boolean clientAuth;
 
-   public RestService(String serverName, ModelNode config, RestAuthMethod authMethod) {
+   public RestService(String serverName, RestAuthMethod authMethod, String contextPath, ExtendedHeaders extendedHeaders, Set<String> ignoredCaches) {
       this.serverName = serverName;
-      this.config = config.clone();
       this.authMethod = authMethod;
-   }
-
-   private String cleanContextPath(String s) {
-      if (s.endsWith("/")) {
-         return s.substring(0, s.length() - 1);
-      } else {
-         return s;
-      }
+      this.contextPath = contextPath;
+      this.extendedHeaders = extendedHeaders;
+      this.ignoredCaches = ignoredCaches;
    }
 
    /** {@inheritDoc} */
    @Override
    public synchronized void start(StartContext startContext) throws StartException {
-      String path = this.config.hasDefined(ModelKeys.CONTEXT_PATH) ? cleanContextPath(this.config.get(ModelKeys.CONTEXT_PATH).asString()) : DEFAULT_CONTEXT_PATH;
-
       RestServerConfigurationBuilder builder = new RestServerConfigurationBuilder();
-      builder.name(serverName);
-      if (config.hasDefined(ModelKeys.IGNORED_CACHES)) {
-         Set<String> ignoredCaches = config.get(ModelKeys.IGNORED_CACHES).asList()
-               .stream().map(ModelNode::asString).collect(Collectors.toSet());
-         builder.ignoredCaches(ignoredCaches);
-      }
-      builder.extendedHeaders(config.hasDefined(ModelKeys.EXTENDED_HEADERS)
-            ? ExtendedHeaders.valueOf(config.get(ModelKeys.EXTENDED_HEADERS).asString())
-            : ExtendedHeaders.ON_DEMAND);
+      builder.name(serverName).extendedHeaders(extendedHeaders).ignoredCaches(ignoredCaches).contextPath(contextPath);
 
       EncryptableServiceHelper.fillSecurityConfiguration(this, builder.ssl());
 
@@ -146,7 +131,7 @@ public synchronized void start(StartContext startContext) throws StartException
 
       try {
          restServer.start();
-         ROOT_LOGGER.httpEndpointStarted(protocolName, path, "rest");
+         ROOT_LOGGER.httpEndpointStarted(protocolName, contextPath, "rest");
       } catch (Exception e) {
          throw ROOT_LOGGER.restContextStartFailed(e);
       }

server/integration/endpoint/src/main/java/org/infinispan/server/endpoint/subsystem/RestSubsystemAdd.java

@@ -18,6 +18,11 @@
  */
 package org.infinispan.server.endpoint.subsystem;
 
+import java.util.Collections;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.infinispan.rest.configuration.ExtendedHeaders;
 import org.jboss.as.controller.AbstractAddStepHandler;
 import org.jboss.as.controller.AttributeDefinition;
 import org.jboss.as.controller.OperationContext;
@@ -51,9 +56,16 @@ protected void performRuntime(OperationContext context, ModelNode operation, Mod
          authConfig = config.get(ModelKeys.AUTHENTICATION, ModelKeys.AUTHENTICATION_NAME);
          restAuthMethod = RestAuthMethod.valueOf(RestAuthenticationResource.AUTH_METHOD.resolveModelAttribute(context, authConfig).asString());
       }
+      String contextPath = RestConnectorResource.CONTEXT_PATH.resolveModelAttribute(context, config).asString();
+      ExtendedHeaders extendedHeaders = ExtendedHeaders.valueOf(RestConnectorResource.EXTENDED_HEADERS.resolveModelAttribute(context, config).asString());
 
+      Set<String> ignoredCaches = Collections.emptySet();
+      if (config.hasDefined(ModelKeys.IGNORED_CACHES)) {
+         ignoredCaches = config.get(ModelKeys.IGNORED_CACHES).asList()
+               .stream().map(ModelNode::asString).collect(Collectors.toSet());
+      }
       // Create the service
-      final RestService service = new RestService(getServiceName(config), config, restAuthMethod);
+      final RestService service = new RestService(getServiceName(config), restAuthMethod, cleanContextPath(contextPath), extendedHeaders, ignoredCaches);
 
       // Setup the various dependencies with injectors and install the service
       ServiceBuilder<?> builder = context.getServiceTarget().addService(EndpointUtils.getServiceName(operation, "rest"), service);
@@ -75,6 +87,14 @@ protected void performRuntime(OperationContext context, ModelNode operation, Mod
       builder.install();
    }
 
+   private static String cleanContextPath(String s) {
+      if (s.endsWith("/")) {
+         return s.substring(0, s.length() - 1);
+      } else {
+         return s;
+      }
+   }
+
    protected String getSocketBindingName(ModelNode config) {
       return config.hasDefined(ModelKeys.SOCKET_BINDING) ? config.get(ModelKeys.SOCKET_BINDING).asString() : null;
    }

server/rest/src/main/java/org/infinispan/rest/configuration/RestServerConfiguration.java

@@ -10,11 +10,13 @@
 public class RestServerConfiguration extends ProtocolServerConfiguration {
    private final ExtendedHeaders extendedHeaders;
    private final boolean startTransport;
+   private final String contextPath;
 
-   RestServerConfiguration(ExtendedHeaders extendedHeaders, String host, int port, Set<String> ignoredCaches, SslConfiguration ssl, boolean startTransport) {
+   RestServerConfiguration(ExtendedHeaders extendedHeaders, String host, int port, Set<String> ignoredCaches, SslConfiguration ssl, boolean startTransport, String contextPath) {
       super(null, null, host, port, -1, -1, -1, ssl, false, -1, ignoredCaches, startTransport);
       this.extendedHeaders = extendedHeaders;
       this.startTransport = startTransport;
+      this.contextPath = contextPath;
    }
 
    public ExtendedHeaders extendedHeaders() {
@@ -32,4 +34,8 @@ public Set<String> getIgnoredCaches() {
    public boolean startTransport() {
       return startTransport;
    }
+
+   public String contextPath() {
+      return contextPath;
+   }
 }

server/rest/src/main/java/org/infinispan/rest/configuration/RestServerConfigurationBuilder.java

@@ -15,11 +15,13 @@ public class RestServerConfigurationBuilder extends ProtocolServerConfigurationB
       Builder<RestServerConfiguration> {
 
    private final static Log logger = LogFactory.getLog(RestServerConfigurationBuilder.class, Log.class);
+   public static final String DEFAULT_CONTEXT_PATH = "rest";
    private boolean startTransport = true;
 
    private static final int DEFAULT_PORT = 8080;
 
    private ExtendedHeaders extendedHeaders = ExtendedHeaders.ON_DEMAND;
+   private String contextPath = DEFAULT_CONTEXT_PATH;
 
    public RestServerConfigurationBuilder() {
       super(DEFAULT_PORT);
@@ -35,14 +37,20 @@ public RestServerConfigurationBuilder startTransport(boolean startTransport) {
       return this;
    }
 
+
+   public RestServerConfigurationBuilder contextPath(String contextPath) {
+      this.contextPath = contextPath;
+      return this;
+   }
+
    @Override
    public void validate() {
       // Nothing to do
    }
 
    @Override
    public RestServerConfiguration create() {
-      return new RestServerConfiguration(extendedHeaders, host, port, ignoredCaches, ssl.create(), startTransport);
+      return new RestServerConfiguration(extendedHeaders, host, port, ignoredCaches, ssl.create(), startTransport, contextPath);
    }
 
    @Override

server/rest/src/main/java/org/infinispan/rest/embedded/netty4/NettyRestServer.java

@@ -28,8 +28,6 @@
 public final class NettyRestServer extends AbstractCacheIgnoreAware implements Lifecycle {
    private final static Log log = LogFactory.getLog(NettyRestServer.class, Log.class);
 
-   private static final String DEFAULT_REST_PATH = "rest";
-
    private final EmbeddedCacheManager cacheManager;
    private final RestServerConfiguration configuration;
    private final Authenticator authenticator;
@@ -94,7 +92,7 @@ public void start() {
          addEncryption(configuration, nettyServer);
          nettyServer.start();
          ResteasyDeployment deployment = nettyServer.getDeployment();
-         deployment.getRegistry().addSingletonResource(server, DEFAULT_REST_PATH);
+         deployment.getRegistry().addSingletonResource(server, configuration.contextPath());
          deployment.getProviderFactory().register(new RestAccessLoggingHandler(), ContainerRequestFilter.class,
                ContainerResponseFilter.class);
          log.startRestServer(configuration.host(), configuration.port());