fix node shard unload

asie-api/pom.xml

@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>com.inteligr8.alfresco</groupId>
 		<artifactId>asie-platform-module-parent</artifactId>
-		<version>1.2.2</version>
+		<version>1.3-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>asie-api</artifactId>
-	<version>1.1.0-asie2</version>
+	<version>1.1-SNAPSHOT-asie2</version>
 	<packaging>jar</packaging>
 	
 	<name>ASIE Jakarta RS API</name>
@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>com.inteligr8</groupId>
 			<artifactId>solr-api</artifactId>
-			<version>1.1.0-solr6</version>
+			<version>1.1-SNAPSHOT-solr6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.alfresco</groupId>

community-module/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.inteligr8.alfresco</groupId>
 		<artifactId>asie-platform-module-parent</artifactId>
-		<version>1.2.2</version>
+		<version>1.3-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

enterprise-module/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.inteligr8.alfresco</groupId>
 		<artifactId>asie-platform-module-parent</artifactId>
-		<version>1.2.2</version>
+		<version>1.3-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise/rest/UnloadNodeShardWebScript.java

@@ -1,21 +1,33 @@
 package com.inteligr8.alfresco.asie.enterprise.rest;
 
 import org.alfresco.repo.index.shard.ShardState;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.extensions.webscripts.WebScriptException;
 import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 
 import com.inteligr8.alfresco.asie.model.ShardSet;
 import com.inteligr8.alfresco.asie.rest.model.NodeShardParameterSet;
+import com.inteligr8.alfresco.asie.spi.ShardDiscoveryService;
 
 @Component(value = "webscript.com.inteligr8.alfresco.asie.nodeShard.delete")
 public class UnloadNodeShardWebScript extends AbstractUnregisterNodeWebScript<NodeShardParameterSet> {
+    
+    @Autowired
+    private ShardDiscoveryService sds;
 	
 	@Override
 	protected NodeShardParameterSet createParameters(WebScriptRequest req, String nodeHostname, int nodePort) {
-		ShardSet shardSet = this.getRequiredPathParameter(req, "shardSet", ShardSet.class);
+		String coreName = this.getRequiredPathParameter(req, "shardCore");
 		int shardId = this.getRequiredPathParameter(req, "shardId", Integer.class);
 		
-		return new NodeShardParameterSet(nodeHostname, nodePort, shardSet, shardId);
+		try {
+			ShardSet shardSet = this.sds.findSetByCore(coreName);
+			return new NodeShardParameterSet(nodeHostname, nodePort, shardSet, shardId);
+		} catch (IllegalArgumentException iae) {
+    		throw new WebScriptException(HttpStatus.BAD_REQUEST.value(), iae.getMessage());
+		}
 	}
 	
 	@Override

pom.xml

@@ -5,7 +5,7 @@
 	
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>asie-platform-module-parent</artifactId>
-	<version>1.2.2</version>
+	<version>1.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<name>ASIE Platform Module Parent</name>

shared/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.inteligr8.alfresco</groupId>
 		<artifactId>asie-platform-module-parent</artifactId>
-		<version>1.2.2</version>
+		<version>1.3-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
@@ -36,7 +36,7 @@
 		<dependency>
 			<groupId>com.inteligr8.alfresco</groupId>
 			<artifactId>asie-api</artifactId>
-			<version>1.0.0-asie2</version>
+			<version>1.1-SNAPSHOT-asie2</version>
 		</dependency>
 		<dependency>
 			<groupId>com.inteligr8</groupId>

shared/src/main/java/com/inteligr8/alfresco/asie/rest/AbstractAsieNodeShardWebScript.java

@@ -7,8 +7,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.extensions.webscripts.WebScriptRequest;
 import org.springframework.extensions.webscripts.WebScriptResponse;
 
-import com.inteligr8.alfresco.asie.model.ShardSet;
-
 public abstract class AbstractAsieNodeShardWebScript extends AbstractAsieShardableWebScript {
     
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -22,14 +20,14 @@ public abstract class AbstractAsieNodeShardWebScript extends AbstractAsieShardab
 		String nodeHostname = colon < 0 ? nodeEndpoint : nodeEndpoint.substring(0, colon);
 		int nodePort = colon < 0 ? this.getApiService().getDefaultSolrPort() : Integer.parseInt(nodeEndpoint.substring(colon+1));
 
-		ShardSet shardSet = this.getRequiredPathParameter(req, "shardSet", ShardSet.class);
+		String shardCore = this.getRequiredPathParameter(req, "shardCore", String.class);
 		int shardId = this.getRequiredPathParameter(req, "shardId", Integer.class);
 		
-		this.execute(req, res, nodeHostname, nodePort, shardSet, shardId);
+		this.execute(req, res, nodeHostname, nodePort, shardCore, shardId);
     }
     
     protected abstract void execute(WebScriptRequest req, WebScriptResponse res,
-    		String nodeHostname, int nodePort, ShardSet shardSet, int shardId)
+    		String nodeHostname, int nodePort, String shardCore, int shardId)
     				throws IOException;
     
 }

solr-api/pom.xml

@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>com.inteligr8.alfresco</groupId>
 		<artifactId>asie-platform-module-parent</artifactId>
-		<version>1.2.2</version>
+		<version>1.3-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
 	<groupId>com.inteligr8</groupId>
 	<artifactId>solr-api</artifactId>
-	<version>1.1.0-solr6</version>
+	<version>1.1-SNAPSHOT-solr6</version>
 	<packaging>jar</packaging>
 	
 	<name>Apache Solr Jakarta RS API</name>