v1.3.5 poms

asie-api/pom.xml

@@ -6,16 +6,21 @@
 	<parent>
 		<groupId>com.inteligr8.alfresco</groupId>
 		<artifactId>asie-platform-module-parent</artifactId>
-		<version>1.3-SNAPSHOT</version>
+		<version>1.3.5</version>
 		<relativePath>../</relativePath>
 	</parent>
 
+	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>asie-api</artifactId>
-	<version>1.2-SNAPSHOT-asie2</version>
+	<version>1.1.1-asie2</version>
 	<packaging>jar</packaging>
 	
 	<name>ASIE Jakarta RS API</name>
 	<description>Alfresco Search &amp; Insight Engine Jakarta RS API</description>
+	
+	<properties>
+		<alfresco.platform.version>23.2.0</alfresco.platform.version>
+	</properties>
 
 	<dependencyManagement>
 		<dependencies>
@@ -33,11 +38,22 @@
 		<dependency>
 			<groupId>com.inteligr8</groupId>
 			<artifactId>solr-api</artifactId>
-			<version>1.2-SNAPSHOT-solr6</version>
+			<version>1.1.0-solr6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.alfresco</groupId>
 			<artifactId>alfresco-data-model</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>*</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.17.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
@@ -47,44 +63,27 @@
 		<dependency>
 			<groupId>com.inteligr8</groupId>
 			<artifactId>common-rest-client</artifactId>
-			<version>${commom-rest-client.base.version}-jersey</version>
+			<version>3.0.2-jersey</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.inject</groupId>
 			<artifactId>jersey-hk2</artifactId>
-			<version>4.0.2</version>
+			<version>3.1.10</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
+			<version>5.11.2</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>io.repaint.maven</groupId>
-				<artifactId>tiles-maven-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<tiles>
-						<!-- Documentation: https://git.inteligr8.com/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-webapp-tile -->
-						<!-- TODO spin up just ASIE
-						<tile>com.inteligr8.ootbee:beedk-acs-platform-webapp-tile:[1.1.6,2.0.0)</tile>
-						-->
-					</tiles>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 	
 	<repositories>
 		<repository>
 			<id>alfresco-public</id>
-			<url>https://artifacts.alfresco.com/nexus/repository/releases/</url>
+			<url>https://artifacts.alfresco.com/nexus/repository/public/</url>
 		</repository>
 	</repositories>
 </project>

asie-api/src/main/java/com/inteligr8/alfresco/asie/model/core/IndexRequest.java

@@ -24,7 +24,7 @@ public class IndexRequest extends JsonFormattedResponseRequest<IndexRequest> {
 	@QueryParam("acltxid")
 	private Long aclTransactionId;
 	
-	@QueryParam("nodeid")
+	@QueryParam("nodeId")
 	private Long nodeId;
 	
 	@QueryParam("aclid")

asie-api/src/main/java/com/inteligr8/alfresco/asie/model/core/NewCoreRequest.java

@@ -3,7 +3,7 @@ package com.inteligr8.alfresco.asie.model.core;
 import java.util.Collection;
 
 import org.alfresco.service.cmr.repository.StoreRef;
-import org.springframework.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.inteligr8.solr.model.JsonFormattedResponseRequest;
 
@@ -89,7 +89,7 @@ public class NewCoreRequest extends JsonFormattedResponseRequest<NewCoreRequest>
 	}
 	
 	public NewCoreRequest withShardIds(Collection<String> shardIds) {
-		this.shardIds = StringUtils.collectionToDelimitedString(shardIds, ",");
+		this.shardIds = StringUtils.join(shardIds, ",");
 		return this;
 	}
 	

asie-api/src/main/java/com/inteligr8/alfresco/asie/model/core/PurgeRequest.java

@@ -24,7 +24,7 @@ public class PurgeRequest extends JsonFormattedResponseRequest<PurgeRequest> {
 	@QueryParam("acltxid")
 	private Long aclTransactionId;
 	
-	@QueryParam("nodeid")
+	@QueryParam("nodeId")
 	private Long nodeId;
 	
 	@QueryParam("aclid")

asie-api/src/main/java/com/inteligr8/alfresco/asie/model/core/ReindexRequest.java

@@ -24,7 +24,7 @@ public class ReindexRequest extends JsonFormattedResponseRequest<ReindexRequest>
 	@QueryParam("acltxid")
 	private Long aclTransactionId;
 	
-	@QueryParam("nodeid")
+	@QueryParam("nodeId")
 	private Long nodeId;
 	
 	@QueryParam("aclid")

asie-api/src/test/java/com/inteligr8/alfresco/asie/api/AbstractApiUnitTest.java

@@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory;
 
 import com.inteligr8.alfresco.asie.AsieClient;
 
-public class AbstractApiIT {
+public class AbstractApiUnitTest {
 	
 	protected Logger logger = LoggerFactory.getLogger(this.getClass());
 	

asie-api/src/test/java/com/inteligr8/alfresco/asie/api/CoreAdminReindexUnitTest.java

@@ -11,7 +11,7 @@ import com.inteligr8.solr.model.Action.Status;
 import com.inteligr8.solr.model.Cores;
 import com.inteligr8.solr.model.ResponseHeader;
 
-public class CoreAdminReindexIT extends AbstractApiIT {
+public class CoreAdminReindexUnitTest extends AbstractApiUnitTest {
 	
 	@Test
 	public void reindex() {

asie-api/src/test/java/com/inteligr8/alfresco/asie/api/CoreAdminStatusUnitTest.java

@@ -19,7 +19,7 @@ import com.inteligr8.solr.model.core.StatusResponse;
 
 import jakarta.ws.rs.ProcessingException;
 
-public class CoreAdminStatusIT extends AbstractApiIT {
+public class CoreAdminStatusUnitTest extends AbstractApiUnitTest {
 	
 	@Test
 	public void noHost() {

community-module/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.inteligr8.alfresco</groupId>
 		<artifactId>asie-platform-module-parent</artifactId>
-		<version>1.3-SNAPSHOT</version>
+		<version>1.2.2</version>
 		<relativePath>../</relativePath>
 	</parent>
 
@@ -16,10 +16,10 @@
 	<name>ASIE Platform Module for ACS Community</name>
 
 	<properties>
-		<alfresco.sdk.version>4.16.0</alfresco.sdk.version>
-		<alfresco.platform.version>26.1.0</alfresco.platform.version>
-		<alfresco.platform.war.version>26.1.0.61</alfresco.platform.war.version>
-		<tomcat-rad.version>2.3-tomcat-11.0.22</tomcat-rad.version>
+		<alfresco.sdk.version>4.9.0</alfresco.sdk.version>
+		<alfresco.platform.version>23.3.0</alfresco.platform.version>
+		<alfresco.platform.war.version>23.3.0.98</alfresco.platform.war.version>
+		<tomcat-rad.version>10-2.1</tomcat-rad.version>
 		
 		<beedk.rad.acs-search.enabled>true</beedk.rad.acs-search.enabled>
 	</properties>
@@ -59,7 +59,7 @@
 		<dependency>
 			<groupId>com.inteligr8.alfresco</groupId>
 			<artifactId>cxf-jaxrs-platform-module</artifactId>
-			<version>1.4.0-acs-v26.1</version>
+			<version>1.3.1-acs-v23.3</version>
 			<type>amp</type>
 		</dependency>
 
@@ -81,6 +81,7 @@
 			<plugin>
 				<groupId>io.repaint.maven</groupId>
 				<artifactId>tiles-maven-plugin</artifactId>
+				<version>2.40</version>
 				<extensions>true</extensions>
 				<configuration>
 					<tiles>
@@ -99,7 +100,7 @@
 	<repositories>
 		<repository>
 			<id>alfresco-public</id>
-			<url>https://artifacts.alfresco.com/nexus/repository/releases/</url>
+			<url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
 		</repository>
 	</repositories>
 </project>

enterprise-module/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.inteligr8.alfresco</groupId>
 		<artifactId>asie-platform-module-parent</artifactId>
-		<version>1.3-SNAPSHOT</version>
+		<version>1.3.5</version>
 		<relativePath>../</relativePath>
 	</parent>
 
@@ -16,10 +16,10 @@
 	<name>ASIE Platform Module for ACS Enterprise</name>
 
 	<properties>
-		<alfresco.platform.version>26.1.0</alfresco.platform.version>
-		<alfresco.platform.war.version>26.1.0.61</alfresco.platform.war.version>
-		<tomcat-rad.version>2.3-tomcat-11.0.22</tomcat-rad.version>
-		<jackson.version>2.17.2</jackson.version>
+		<alfresco.sdk.version>4.9.0</alfresco.sdk.version>
+		<alfresco.platform.version>23.3.0</alfresco.platform.version>
+		<alfresco.platform.war.version>23.3.0.98</alfresco.platform.war.version>
+		<tomcat-rad.version>10-2.1</tomcat-rad.version>
 		
 		<beedk.rad.acs-search.enabled>true</beedk.rad.acs-search.enabled>
 	</properties>
@@ -37,13 +37,10 @@
 	</dependencyManagement>
 
 	<dependencies>
-		<!-- Alfresco Modules required to use this module -->
 		<dependency>
 			<groupId>com.inteligr8.alfresco</groupId>
-			<artifactId>cxf-jaxrs-platform-module</artifactId>
-			<version>1.4.0-acs-v26.1</version>
-			<type>amp</type>
-			<scope>provided</scope>
+			<artifactId>asie-shared</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		
 		<!-- Needed by this module, but provided by ACS -->
@@ -53,11 +50,19 @@
 			<scope>provided</scope>
 		</dependency>
 		
-		<!-- core dependency, but dependencies of provided ones above should override -->
+		<!-- Alfresco Modules required to use this module -->
 		<dependency>
 			<groupId>com.inteligr8.alfresco</groupId>
-			<artifactId>asie-shared</artifactId>
-			<version>${project.version}</version>
+			<artifactId>cxf-jaxrs-platform-module</artifactId>
+			<version>1.3.2-acs-v23.3</version>
+			<type>amp</type>
+		</dependency>
+			
+		<!-- Provided by cxf-jaxrs-platform-module, but packaged due to shared -->
+		<dependency>
+			<groupId>com.inteligr8</groupId>
+			<artifactId>common-rest-client</artifactId>
+			<scope>provided</scope>
 		</dependency>
 			
 		<!-- Provided by cxf-jaxrs-platform-module, but packaged due to solr-api -->
@@ -75,13 +80,13 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-jsr310</artifactId>
-			<version>${jackson.version}</version>
+			<version>2.17.3</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.module</groupId>
 			<artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
-			<version>${jackson.version}</version>
+			<version>2.17.2</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -103,6 +108,7 @@
 			<plugin>
 				<groupId>io.repaint.maven</groupId>
 				<artifactId>tiles-maven-plugin</artifactId>
+				<version>2.40</version>
 				<extensions>true</extensions>
 				<configuration>
 					<tiles>

enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise/service/ShardDiscoveryService.java

@@ -264,7 +264,7 @@ public class ShardDiscoveryService implements com.inteligr8.alfresco.asie.spi.Sh
 				ShardInstanceState nodeShardState = ShardInstanceState.from(shardState);
 				
 				Pair<SolrHost, ShardInstanceState> pair = new Pair<>(node, nodeShardState);
-				if (!shardNodeStates.containsKey(shardId) || comparator.compare(pair, shardNodeStates.get(shardId)) < 0)
+				if (comparator.compare(pair, shardNodeStates.get(shardId)) < 0)
 					shardNodeStates.put(shardId, pair);
 			}
 		}

pom.xml

@@ -5,7 +5,7 @@
 	
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>asie-platform-module-parent</artifactId>
-	<version>1.3-SNAPSHOT</version>
+	<version>1.3.5</version>
 	<packaging>pom</packaging>
 	
 	<name>ASIE Platform Module Parent</name>
@@ -43,21 +43,15 @@
 		<maven.compiler.target>17</maven.compiler.target>
 		<maven.compiler.release>17</maven.compiler.release>
 		<maven.deploy.skip>true</maven.deploy.skip>
-		
-		<!-- must be aligned with the target ACS platform junit -->
-		<junit.version>5.12.2</junit.version>
-		
-		<commom-rest-client.base.version>3.0.4</commom-rest-client.base.version>
-		
-		<alfresco.platform.version>26.1.0</alfresco.platform.version>
 	</properties>
-	
+
 	<dependencyManagement>
 		<dependencies>
+			<!-- Provided by cxf-jaxrs-platform-module, but packaged due to shared -->
 			<dependency>
-				<groupId>org.junit.jupiter</groupId>
-				<artifactId>junit-jupiter-api</artifactId>
-				<version>${junit.version}</version>
+				<groupId>com.inteligr8</groupId>
+				<artifactId>common-rest-client</artifactId>
+				<version>3.0.3-cxf</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
@@ -65,48 +59,43 @@
 	<build>
 		<pluginManagement>
 			<plugins>
-				<!-- helps avoid vulnerable dependencies -->
-				<plugin>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.22.0</version>
-				</plugin>
+				<!-- avoids log4j dependency -->
 				<plugin>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.15.0</version>
+					<version>3.14.1</version>
 				</plugin>
+				<!-- avoids struts dependency -->
+				<plugin>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.21.0</version>
+				</plugin>
+				<!-- Force use of a new maven-dependency-plugin that doesn't download struts dependency -->
 				<plugin>
 					<artifactId>maven-dependency-plugin</artifactId>
-					<version>3.11.0</version>
+					<version>3.9.0</version>
 				</plugin>
-				
 				<plugin>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.5.6</version>
+					<version>3.5.4</version>
 					<dependencies>
 						<dependency>
 							<groupId>org.junit.jupiter</groupId>
 							<artifactId>junit-jupiter-engine</artifactId>
-							<version>${junit.version}</version>
+							<version>5.14.0</version>
 						</dependency>
 					</dependencies>
 				</plugin>
 				<plugin>
 					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>3.5.6</version>
+					<version>3.5.4</version>
 					<dependencies>
 						<dependency>
 							<groupId>org.junit.jupiter</groupId>
 							<artifactId>junit-jupiter-engine</artifactId>
-							<version>${junit.version}</version>
+							<version>5.14.0</version>
 						</dependency>
 					</dependencies>
 				</plugin>
-
-				<plugin>
-					<groupId>io.repaint.maven</groupId>
-					<artifactId>tiles-maven-plugin</artifactId>
-					<version>2.45</version>
-				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>
@@ -162,7 +151,7 @@
 					<plugin>
 						<groupId>org.sonatype.central</groupId>
 						<artifactId>central-publishing-maven-plugin</artifactId>
-						<version>0.10.0</version>
+						<version>0.8.0</version>
 						<extensions>true</extensions>
 						<configuration>
 							<publishingServerId>central</publishingServerId>

shared/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.inteligr8.alfresco</groupId>
 		<artifactId>asie-platform-module-parent</artifactId>
-		<version>1.3-SNAPSHOT</version>
+		<version>1.3.5</version>
 		<relativePath>../</relativePath>
 	</parent>
 
@@ -16,9 +16,8 @@
 	<name>ASIE Shared Library for Platform Modules</name>
 
 	<properties>
-		<alfresco.sdk.version>4.16.0</alfresco.sdk.version>
-		
-		<common-rest-client.version>${commom-rest-client.base.version}-cxf</common-rest-client.version>
+		<alfresco.sdk.version>4.9.0</alfresco.sdk.version>
+		<alfresco.platform.version>23.3.0</alfresco.platform.version>
 	</properties>
 
 	<dependencyManagement>
@@ -37,12 +36,11 @@
 		<dependency>
 			<groupId>com.inteligr8.alfresco</groupId>
 			<artifactId>asie-api</artifactId>
-			<version>1.2-SNAPSHOT-asie2</version>
+			<version>1.1.1-asie2</version>
 		</dependency>
 		<dependency>
 			<groupId>com.inteligr8</groupId>
 			<artifactId>common-rest-client</artifactId>
-			<version>${common-rest-client.version}</version>
 		</dependency>
 		
 		<!-- Needed by this module, but provided by ACS -->
@@ -73,7 +71,7 @@
 	<repositories>
 		<repository>
 			<id>alfresco-public</id>
-			<url>https://artifacts.alfresco.com/nexus/repository/releases/</url>
+			<url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
 		</repository>
 	</repositories>
 </project>

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

@@ -44,10 +44,10 @@ public class ReconcileAcsNodesWebScript extends AbstractAsieWebScript {
 			public void reconciled(long nodeDbId) {
 				if (includeReconciled) {
 					@SuppressWarnings("unchecked")
-					List<Long> reconciledNodeDbIds = (List<Long>) responseMap.get("reconciled");
-					if (reconciledNodeDbIds == null)
-						responseMap.put("reconciled", reconciledNodeDbIds = new LinkedList<>());
-					reconciledNodeDbIds.add(nodeDbId);
+					List<Long> unreconciledNodeDbIds = (List<Long>) responseMap.get("reconciled");
+					if (unreconciledNodeDbIds == null)
+						responseMap.put("reconciled", unreconciledNodeDbIds = new LinkedList<>());
+					unreconciledNodeDbIds.add(nodeDbId);
 				}
 			}
 			

shared/src/main/java/com/inteligr8/alfresco/asie/service/AbstractNodeActionService.java

@@ -13,12 +13,15 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import org.alfresco.model.ContentModel;
 import org.alfresco.repo.index.shard.Floc;
 import org.alfresco.repo.index.shard.Shard;
 import org.alfresco.repo.index.shard.ShardInstance;
 import org.alfresco.repo.index.shard.ShardRegistry;
 import org.alfresco.repo.index.shard.ShardState;
 import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.slf4j.Logger;
@@ -148,10 +151,7 @@ public abstract class AbstractNodeActionService implements DisposableBean {
 		}
 	}
 	
-	private Future<Void> _action(
-			final long nodeDbId,
-			final ActionCallback callback,
-			Long fullQueueExpireTimeMillis) throws TimeoutException, InterruptedException {
+	private Future<Void> _action(long nodeDbId, ActionCallback callback, Long fullQueueExpireTimeMillis) throws TimeoutException, InterruptedException {
 		List<com.inteligr8.alfresco.asie.model.ShardInstance> eligibleInstances = this.findPossibleShardInstances(nodeDbId);
 		this.logger.debug("Will attempt to {} ACS node against {} shard instances: {}", this.getActionName(), eligibleInstances.size(), nodeDbId);
 		
@@ -164,12 +164,49 @@ public abstract class AbstractNodeActionService implements DisposableBean {
 			Callable<Void> callable = new Callable<>() {
 				@Override
 				public Void call() {
+					String core = instance.extractShard().getCoreName();
+					SolrHost host = instance.extractNode();
+					URL url = host.toUrl(apiService.isSecure() ? "https" : "http");
+					CoreAdminApi api = apiService.createApi(url.toString(), CoreAdminApi.class);
+					
 					try {
-						actionToShard(nodeDbId, callback, instance);
+						logger.debug("Performing {} of ACS node against shard instance: {}: {}", getActionName(), nodeDbId, instance);
+						BaseResponse apiResponse = execute(api, core, nodeDbId);
+						logger.trace("Performed {} of ACS node against shard instance: {}: {}", getActionName(), nodeDbId, instance);
+						
+						Action action = null;
+						if (apiResponse instanceof ActionCoreResponse<?>) {
+							action = ((ActionCoreResponse<Action>) apiResponse).getCores().getByCore(core);
+						} else if (apiResponse instanceof ActionResponse<?>) {
+							action = ((ActionResponse<Action>) apiResponse).getAction();
+						}
+						
+						if (action == null) {
+							callback.unknownResult(instance);
+						} else {
+							switch (action.getStatus()) {
+								case Scheduled:
+									callback.scheduled(instance);
+									break;
+								case Success:
+									callback.success(instance);
+									break;
+						    	default:
+						    		if (apiResponse instanceof com.inteligr8.alfresco.asie.model.BaseResponse) {
+						    			com.inteligr8.alfresco.asie.model.BaseResponse asieResponse = (com.inteligr8.alfresco.asie.model.BaseResponse) apiResponse;
+										logger.debug("Performance of {} of ACS node against shard instance failed: {}: {}: {}", getActionName(), nodeDbId, instance, asieResponse.getException());
+										callback.error(instance, asieResponse.getException());
+						    		} else {
+										logger.debug("Performance of {} of ACS node against shard instance failed: {}: {}: {}", getActionName(), nodeDbId, instance, apiResponse.getResponseHeader().getStatus());
+										callback.error(instance, String.valueOf(apiResponse.getResponseHeader().getStatus()));
+						    		}
+							}
+						}
 					} catch (Exception e) {
-						logger.error("An unexpected exception occurred", e);
+						logger.error("An exception occurred", e);
 						callback.error(instance, e.getMessage());
 					}
+					
 					return null;
 				}
 			};
@@ -184,54 +221,15 @@ public abstract class AbstractNodeActionService implements DisposableBean {
 		return future;
 	}
 	
-	@SuppressWarnings("unchecked")
-	protected void actionToShard(long nodeDbId, ActionCallback callback, com.inteligr8.alfresco.asie.model.ShardInstance instance) {
-		String core = instance.extractShard().getCoreName();
-		SolrHost host = instance.extractNode();
-		URL url = host.toUrl(this.apiService.isSecure() ? "https" : "http");
-		CoreAdminApi api = this.apiService.createApi(url.toString(), CoreAdminApi.class);
-		
-		this.logger.debug("Performing {} of ACS node against shard instance: {}: {}", this.getActionName(), nodeDbId, instance);
-		BaseResponse apiResponse = execute(api, core, nodeDbId);
-		this.logger.trace("Performed {} of ACS node against shard instance: {}: {}", this.getActionName(), nodeDbId, instance);
-		
-		Action action = null;
-		if (apiResponse instanceof ActionCoreResponse<?>) {
-			action = ((ActionCoreResponse<Action>) apiResponse).getCores().getByCore(core);
-		} else if (apiResponse instanceof ActionResponse<?>) {
-			action = ((ActionResponse<Action>) apiResponse).getAction();
-		}
-		
-		if (action == null) {
-			callback.unknownResult(instance);
-		} else {
-			switch (action.getStatus()) {
-				case Scheduled:
-					callback.scheduled(instance);
-					break;
-				case Success:
-					callback.success(instance);
-					break;
-		    	default:
-		    		if (apiResponse instanceof com.inteligr8.alfresco.asie.model.BaseResponse) {
-		    			com.inteligr8.alfresco.asie.model.BaseResponse asieResponse = (com.inteligr8.alfresco.asie.model.BaseResponse) apiResponse;
-		    			this.logger.debug("Performance of {} of ACS node against shard instance failed: {}: {}: {}",
-		    					this.getActionName(), nodeDbId, instance, asieResponse.getException());
-						callback.error(instance, asieResponse.getException());
-		    		} else {
-		    			this.logger.debug("Performance of {} of ACS node against shard instance failed: {}: {}: {}",
-		    					this.getActionName(), nodeDbId, instance, apiResponse.getResponseHeader().getStatus());
-						callback.error(instance, String.valueOf(apiResponse.getResponseHeader().getStatus()));
-		    		}
-			}
-		}
-	}
-	
 	protected abstract BaseResponse execute(CoreAdminApi api, String core, long nodeDbId);
 	
 	private List<com.inteligr8.alfresco.asie.model.ShardInstance> findPossibleShardInstances(long nodeDbId) {
 		if (this.shardRegistry == null)
 			throw new UnsupportedOperationException("ACS instances without a sharding configuration are not yet implemented");
+		
+		SearchParameters searchParams = new SearchParameters();
+		searchParams.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
+		searchParams.setQuery("@" + this.formatForFts(ContentModel.PROP_NODE_DBID) + ":" + nodeDbId);
 
 		List<com.inteligr8.alfresco.asie.model.ShardInstance> instances = new LinkedList<>();
 		

shared/src/main/java/com/inteligr8/alfresco/asie/service/AcsReconcileService.java

@@ -59,7 +59,7 @@ public class AcsReconcileService implements DisposableBean {
 	
 	@Autowired
 	private ReindexService reindexService;
-
+	
 	@Autowired
 	private ExecutorManager executorManager;
 	
@@ -75,12 +75,6 @@ public class AcsReconcileService implements DisposableBean {
 	@Value("${inteligr8.asie.reconciliation.concurrency}")
 	private int concurrency;
 	
-	@Value("${inteligr8.asie.reconciliation.waitAfterSolrNodeActionMillis}")
-	private long waitAfterSolrNodeActionMillis;
-
-	@Value("${inteligr8.asie.reconciliation.waitAfterSolrNodeReconcileMillis}")
-	private long waitAfterSolrNodeReconcileMillis;
-	
 	@Override
 	public void destroy() {
 		ExecutorService executor = this.executorManager.get("solr-reconcile");
@@ -106,7 +100,7 @@ public class AcsReconcileService implements DisposableBean {
 	 * 
 	 * There are two sets of parameters regarding timeouts.  The queue timeouts
 	 * are for how long the requesting thread should wait for a full queue to
-	 * open up space for new reconcile executions.  The execution timeouts are
+	 * open up space for new re-index executions.  The execution timeouts are
 	 * for how long the execution should be allowed to take once dequeued.
 	 * There is no timeout for how long the execution is queued.
 	 * 
@@ -117,10 +111,10 @@ public class AcsReconcileService implements DisposableBean {
 	 * @param callback A callback to process multiple returned values from the re-index.
 	 * @param queueTimeout A timeout for how long the calling thread should wait for space on the queue.
 	 * @param queueUnit The time units for the `queueTimeout`.
-	 * @param execTimeout A timeout for the elapsed time the reconcile execution should take when dequeued.
+	 * @param execTimeout A timeout for the elapsed time the reindex execution should take when dequeued.
 	 * @param execUnit The time units for the `execTimeout`.
 	 * @throws TimeoutException Either the queue or execution timeout lapsed. 
-	 * @throws InterruptedException The reconciliation was interrupted (server shutdown).
+	 * @throws InterruptedException The re-index was interrupted (server shutdown).
 	 */
 	public void reconcile(
 			long fromDbId, long toDbId, Integer nodesChunkSize,
@@ -129,10 +123,18 @@ public class AcsReconcileService implements DisposableBean {
 			ReconcileCallback callback,
 			long queueTimeout, TimeUnit queueUnit,
 			long execTimeout, TimeUnit execUnit) throws InterruptedException, TimeoutException {
+		if (nodesChunkSize == null)
+			nodesChunkSize = this.nodesChunkSize;
 		if (this.logger.isTraceEnabled())
 			this.logger.trace("reconcile({}, {}, {}, {}, {}, {}, {})", fromDbId, toDbId, nodesChunkSize, indexUnreconciled, reindexReconciled, queueUnit.toMillis(queueTimeout), execUnit.toMillis(execTimeout));
+
+		CompositeFuture<Void> future = new CompositeFuture<>();
 		
-		Future<Void> future = this._reconcile(fromDbId, toDbId, nodesChunkSize, indexUnreconciled, reindexReconciled, callback, queueTimeout, queueUnit, execTimeout, execUnit);
+		for (long startDbId = fromDbId; startDbId < toDbId; startDbId += nodesChunkSize) {
+			long endDbId = Math.min(toDbId, startDbId + nodesChunkSize);
+			future.combine(this.reconcileChunk(startDbId, endDbId, indexUnreconciled, reindexReconciled, callback, queueTimeout, queueUnit, execTimeout, execUnit));
+			future.purge(true);
+		}
 		
 		try {
 			future.get(execTimeout, execUnit);
@@ -141,52 +143,27 @@ public class AcsReconcileService implements DisposableBean {
 		}
 	}
 	
-	/**
-	 * This method reconciles the specified node range between ACS and Solr.
-	 * The node range is specified using the ACS unique database identifiers.
-	 * There is no other reasonably efficient attack vector.  The callback
-	 * handles all the return values.  This is the synchronous alternative to
-	 * the other `reconcile` method.
-	 * 
-	 * @param fromDbId A node database ID, inclusive.
-	 * @param toDbId A node database ID, exclusive.
-	 * @param indexUnreconciled For nodes not found in Solr, attempt to index against all applicable Solr instances.
-	 * @param reindexReconciled For nodes found in Solr, attempt to re-index against all applicable Solr instances.
-	 * @param callback A callback to process multiple returned values from the re-index.
-	 * @throws InterruptedException The reconciliation was interrupted (server shutdown).
-	 */
 	public Future<Void> reconcile(
 			long fromDbId, long toDbId, Integer nodesChunkSize,
 			boolean indexUnreconciled,
 			boolean reindexReconciled,
 			ReconcileCallback callback) throws InterruptedException {
+		if (nodesChunkSize == null)
+			nodesChunkSize = this.nodesChunkSize;
 		this.logger.trace("reconcile({}, {}, {}, {}, {})", fromDbId, toDbId, nodesChunkSize, indexUnreconciled, reindexReconciled);
 
+		CompositeFuture<Void> future = new CompositeFuture<>();
+		
 		try {
-			return this._reconcile(fromDbId, toDbId, nodesChunkSize, indexUnreconciled, reindexReconciled, callback, -1L, null, -1L, null);
+			for (long startDbId = fromDbId; startDbId < toDbId; startDbId += nodesChunkSize) {
+				long endDbId = Math.min(toDbId, startDbId + nodesChunkSize);
+				future.combine(this.reconcileChunk(startDbId, endDbId, indexUnreconciled, reindexReconciled, callback, -1L, null, -1L, null));
+				future.purge(true);
+			}
 		} catch (TimeoutException te) {
 			throw new RuntimeException("This should never happen: " + te.getMessage(), te);
 		}
-	}
-
-	protected Future<Void> _reconcile(
-			long fromDbId, long toDbId, Integer nodesChunkSize,
-			boolean indexUnreconciled,
-			boolean reindexReconciled,
-			ReconcileCallback callback,
-			long queueTimeout, TimeUnit queueUnit,
-			long execTimeout, TimeUnit execUnit) throws InterruptedException, TimeoutException {
-		if (nodesChunkSize == null)
-			nodesChunkSize = this.nodesChunkSize;
 		
-		CompositeFuture<Void> future = new CompositeFuture<>();
-		
-		for (long startDbId = fromDbId; startDbId < toDbId; startDbId += nodesChunkSize) {
-			long endDbId = Math.min(toDbId, startDbId + nodesChunkSize);
-			future.combine(this.reconcileChunk(startDbId, endDbId, indexUnreconciled, reindexReconciled, callback, queueTimeout, queueUnit, execTimeout, execUnit));
-			future.purge(true);
-		}
-
 		return future;
 	}
 	
@@ -239,7 +216,6 @@ public class AcsReconcileService implements DisposableBean {
 			this.logger.trace("Attempting to reconcile ACS node: {}", nodeDbId);
 
 			Callable<Void> callable;
-			boolean callingSolr = false;
 
 			final int dbIdIndex = (int) (nodeDbId - fromDbId);
 			if (nodeRefs[dbIdIndex] != null) {
@@ -259,8 +235,6 @@ public class AcsReconcileService implements DisposableBean {
 						return null;
 					}
 				};
-				if (reindexReconciled)
-					callingSolr = true;
 			} else {
 				callable = new Callable<Void>() {
 					@Override
@@ -269,7 +243,6 @@ public class AcsReconcileService implements DisposableBean {
 						return null;
 					}
 				};
-				callingSolr = true;
 			}
 			
 			if (queueTimeout < 0L) {
@@ -277,42 +250,36 @@ public class AcsReconcileService implements DisposableBean {
 			} else {
 				future.combine(executor.submit(callable, queueTimeout, queueUnit));
 			}
-
-			if (callingSolr && this.waitAfterSolrNodeReconcileMillis > 0L) {
-				this.logger.trace("Waiting between each node reconcile");
-				Thread.sleep(this.waitAfterSolrNodeReconcileMillis);
-			}
 		}
 		
 		return future;
 	}
 	
-	public boolean reconcile(long nodeDbId,
+	public void reconcile(long nodeDbId,
 			boolean index,
 			ReconcileCallback callback) throws InterruptedException, TimeoutException {
 		NodeRef nodeRef = this.nodeService.getNodeRef(nodeDbId);
 		if (nodeRef == null) {
 			this.logger.trace("No such ACS node: {}; skipping ...", nodeDbId);
-			return false;
+			return;
 		}
 		
 		if (!StoreRef.STORE_REF_WORKSPACE_SPACESSTORE.equals(nodeRef.getStoreRef())) {
 			this.logger.trace("A deliberately ignored store in the DB is not indexed in Solr: {}: {}", nodeDbId, nodeRef);
-			return false;
+			return;
 		}
 
 		Set<QName> aspects = this.nodeService.getAspects(nodeRef);
 		aspects.retainAll(this.ignoreNodesWithAspects);
 		if (!aspects.isEmpty()) {
 			this.logger.trace("A deliberately ignored node in the DB is not indexed in Solr: {}: {}: {}", nodeDbId, nodeRef, aspects);
-			return false;
+			return;
 		}
 		
 		if (!index) {
 			this.logger.debug("A node in the DB is not indexed in Solr: {}: {}", nodeDbId, nodeRef);
 			this.reconcileLogger.info("UNRECONCILED: {} <=> {}", nodeDbId, nodeRef);
 			callback.unreconciled(nodeDbId);
-			return false;
 		} else {
 			this.logger.debug("A node in the DB is not indexed in Solr; attempt to index: {}: {}", nodeDbId, nodeRef);
 			this.index(nodeDbId, nodeRef, callback);
@@ -320,7 +287,6 @@ public class AcsReconcileService implements DisposableBean {
 			// its results will be logged
 			// the reconcile thread will continue independently
 			// the callback will lag
-			return true;
 		}
 	}
 	
@@ -355,13 +321,7 @@ public class AcsReconcileService implements DisposableBean {
 			}
 		};
 		
-		Future<Void> future = this.indexService.index(nodeDbId, indexCallback);
-		
-		if (this.waitAfterSolrNodeActionMillis > 0L) {
-			Thread.sleep(this.waitAfterSolrNodeActionMillis);
-		}
-
-		return future;
+		return this.indexService.index(nodeDbId, indexCallback);
 	}
 	
 	public Future<Void> reindex(long nodeDbId, NodeRef nodeRef, ReconcileCallback callback) throws InterruptedException {
@@ -395,13 +355,7 @@ public class AcsReconcileService implements DisposableBean {
 			}
 		};
 
-		Future<Void> future = this.reindexService.reindex(nodeDbId, reindexCallback);
-		
-		if (this.waitAfterSolrNodeActionMillis > 0L) {
-			Thread.sleep(this.waitAfterSolrNodeActionMillis);
-		}
-
-		return future;
+		return this.reindexService.reindex(nodeDbId, reindexCallback);
 	}
 	
 	private String formatForFts(QName qname) {

shared/src/main/java/com/inteligr8/alfresco/asie/service/ExecutorManager.java

@@ -32,7 +32,7 @@ import com.inteligr8.alfresco.asie.util.ThrottledThreadPoolExecutor;
  */
 @Component
 public class ExecutorManager implements InitializingBean, DisposableBean, RemovalListener<String, ExecutorService> {
-
+	
 	private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
 	@Value("${inteligr8.asie.executors.expireTimeInMinutes}")

shared/src/main/java/com/inteligr8/alfresco/asie/service/SolrShardHashService.java

@@ -1,9 +1,6 @@
 package com.inteligr8.alfresco.asie.service;
 
 import java.nio.charset.Charset;
-import java.time.Instant;
-import java.time.temporal.TemporalAccessor;
-import java.util.Date;
 import java.util.regex.Matcher;
 
 import org.alfresco.error.AlfrescoRuntimeException;
@@ -12,7 +9,6 @@ import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.apache.commons.codec.digest.MurmurHash3;
-import org.joda.time.ReadablePartial;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,22 +68,9 @@ public class SolrShardHashService {
 					this.logger.debug("Unable to determine shard instance ID because property does not exist on node: {}: {}", nodeRef, hashableProperty);
 					return -1;
 				}
-
-				this.logger.trace("Discovered node property for sharding: {} => {}", nodeRef, fullPropertyValue);
-
-				String hashableValue = null;
-				if (fullPropertyValue instanceof TemporalAccessor) {
-					Instant instant = Instant.from((TemporalAccessor) fullPropertyValue);
-					hashableValue = instant.toString();
-				} else if (fullPropertyValue instanceof ReadablePartial) {
-					hashableValue = ((ReadablePartial) fullPropertyValue).toString();
-				} else if (fullPropertyValue instanceof Date) {
-					Instant instant = ((Date) fullPropertyValue).toInstant();
-					hashableValue = instant.toString();
-				} else {
-					hashableValue = fullPropertyValue.toString();
-				}
 				
+				this.logger.trace("Discovered node property for sharding: {} => {}", nodeRef, fullPropertyValue);
+				String hashableValue = fullPropertyValue.toString();
 				if (shardset.getRegex() != null) {
 					Matcher matcher = shardset.getRegex().matcher(hashableValue);
 					if (!matcher.find()) {
@@ -101,7 +84,6 @@ public class SolrShardHashService {
 				int shardHash = this.hash(hashableValue, shardset.getShards().intValue());
 				this.logger.debug("Hash shardable value to shard instance ID: {}: {} => {}", nodeRef, hashableValue, shardHash);
 				return shardHash;
-			// TODO replicate hash algorithm for other shard methods 
 			default:
 				this.logger.trace("Unable to determine shard instance ID due to shard method: {}", shardset.getMethod());
 				return -1;

shared/src/main/java/com/inteligr8/alfresco/asie/spi/ShardDiscoveryService.java

@@ -125,9 +125,7 @@ public interface ShardDiscoveryService {
 	public class ShardedNodeShardStateComparator implements Comparator<Pair<SolrHost, ShardInstanceState>> {
 		@Override
 		public int compare(Pair<SolrHost, ShardInstanceState> p1, Pair<SolrHost, ShardInstanceState> p2) {
-			if (p1 == null) return 1;
-			else if (p2 == null) return -1;
-			else return - Long.compare(p1.getSecond().getLastIndexedTxId(), p2.getSecond().getLastIndexedTxId());
+			return - Long.compare(p1.getSecond().getLastIndexedTxId(), p2.getSecond().getLastIndexedTxId());
 		}
 	}
 

shared/src/main/java/com/inteligr8/alfresco/asie/util/CompositeFuture.java

@@ -79,14 +79,12 @@ public class CompositeFuture<T> implements Future<T> {
 		List<T> results = new ArrayList<>(this.futures.size());
 		for (Future<T> future : this.futures) {
 			if (future instanceof RunnableFuture<?>) {
-				this.logger.trace("Waiting {} ms since the start of the exectuion of the future to complete", unit.toMillis(timeout));
+				this.logger.debug("Waiting {} ms since the start of the execution of the future to complete", unit.toMillis(timeout));
 				results.add(((RunnableFuture<T>) future).get(timeout, unit));
-				this.logger.trace("Exectuion completed", unit.toMillis(timeout));
 			} else {
 				long remainingTimeMillis = expireTimeMillis - System.currentTimeMillis();
-				this.logger.trace("Waiting {} ms for the future to complete", remainingTimeMillis);
+				this.logger.debug("Waiting {} ms for the future to complete", remainingTimeMillis);
 				results.add(future.get(remainingTimeMillis, TimeUnit.MILLISECONDS));
-				this.logger.trace("Exectuion completed", unit.toMillis(timeout));
 			}
 		}
 		
@@ -133,24 +131,14 @@ public class CompositeFuture<T> implements Future<T> {
 			Future<T> future = i.next();
 			if (future.isCancelled()) {
 				if (includeCancelled) {
-					this.logger.trace("Removing cancelled future");
 					removedCancelled++;
 					i.remove();
 				} else {
 					remain++;
 				}
 			} else if (future.isDone()) {
-				try {
-					future.get();
-				} catch (InterruptedException ie) {
-					this.logger.trace("Future completed because it was interrupted");
-				} catch (ExecutionException ee) {
-					this.logger.error(ee.getMessage(), ee);
-				} finally {
-					this.logger.trace("Removing completed future");
-					removedDone++;
-					i.remove();
-				}
+				removedDone++;
+				i.remove();
 			} else if (future instanceof CompositeFuture<?>) {
 				cfutures.add((CompositeFuture<?>) future);
 			} else {

shared/src/main/resources/alfresco/module/com_inteligr8_alfresco_asie-shared/alfresco-global.properties

@@ -19,8 +19,6 @@ inteligr8.asie.reconciliation.nodesChunkSize=250
 inteligr8.asie.reconciliation.nodeTimeoutSeconds=10
 inteligr8.asie.reconciliation.concurrentQueueSize=32
 inteligr8.asie.reconciliation.concurrency=2
-inteligr8.asie.reconciliation.waitAfterSolrNodeActionMillis=0
-inteligr8.asie.reconciliation.waitAfterSolrNodeReconcileMillis=0
 
 # Action (like indexing and re-indexing) configuration
 inteligr8.asie.default.concurrentQueueSize=32

solr-api/pom.xml

@@ -6,31 +6,31 @@
 	<parent>
 		<groupId>com.inteligr8.alfresco</groupId>
 		<artifactId>asie-platform-module-parent</artifactId>
-		<version>1.3-SNAPSHOT</version>
+		<version>1.3.5</version>
 		<relativePath>../</relativePath>
 	</parent>
 
 	<groupId>com.inteligr8</groupId>
 	<artifactId>solr-api</artifactId>
-	<version>1.2-SNAPSHOT-solr6</version>
+	<version>1.1.0-solr6</version>
 	<packaging>jar</packaging>
 	
 	<name>Apache Solr Jakarta RS API</name>
 
 	<properties>
-		<jackson.version>2.22.1</jackson.version>
+		<jackson.version>2.18.0</jackson.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>jakarta.annotation</groupId>
 			<artifactId>jakarta.annotation-api</artifactId>
-			<version>3.0.0</version>
+			<version>2.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.ws.rs</groupId>
 			<artifactId>jakarta.ws.rs-api</artifactId>
-			<version>4.0.0</version>
+			<version>3.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.module</groupId>