Commit 68471be9 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 82410805 493f1f81

asie-api/pom.xml

+38 −4
Original line number Diff line number Diff line
@@ -15,11 +15,11 @@ 
	<version>1.0.0-asie2</version>

	<packaging>jar</packaging>

	

	<name>ASIE JAX-RS API</name>

	<description>Alfresco Search &amp; Insight Engine JAX-RS API</description>

	<name>ASIE Jakarta RS API</name>

	<description>Alfresco Search &amp; Insight Engine Jakarta RS API</description>

	

	<properties>

		<alfresco.platform.version>6.0.0</alfresco.platform.version>

		<alfresco.platform.version>23.2.0</alfresco.platform.version>

	</properties>



	<dependencyManagement>
@@ -42,7 +42,41 @@ 
		</dependency>

		<dependency>

			<groupId>org.alfresco</groupId>

			<artifactId>alfresco-repository</artifactId>

			<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>

			<artifactId>log4j-slf4j2-impl</artifactId>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>com.inteligr8</groupId>

			<artifactId>common-rest-client</artifactId>

			<version>3.0.2-jersey</version>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>org.glassfish.jersey.inject</groupId>

			<artifactId>jersey-hk2</artifactId>

			<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>

asie-api/src/main/java/com/inteligr8/alfresco/asie/api/CoreAdminApi.java

+15 −14
Original line number Diff line number Diff line 
package com.inteligr8.alfresco.asie.api;



import com.inteligr8.alfresco.asie.model.ActionResponse;

import com.inteligr8.alfresco.asie.model.ActionCoreResponse;

import com.inteligr8.alfresco.asie.model.EmptyResponse;

import com.inteligr8.alfresco.asie.model.core.CheckRequest;

import com.inteligr8.alfresco.asie.model.core.DisableIndexingRequest;

import com.inteligr8.alfresco.asie.model.core.EnableIndexingRequest;

import com.inteligr8.alfresco.asie.model.core.FixAction;

import com.inteligr8.alfresco.asie.model.core.FixRequest;

import com.inteligr8.alfresco.asie.model.core.FixResponseAction;

import com.inteligr8.alfresco.asie.model.core.IndexingStatusAction;

import com.inteligr8.alfresco.asie.model.core.NewCoreRequest;

import com.inteligr8.alfresco.asie.model.core.NewDefaultIndexRequest;
@@ -14,14 +14,15 @@ import com.inteligr8.alfresco.asie.model.core.PurgeRequest; 
import com.inteligr8.alfresco.asie.model.core.ReindexRequest;

import com.inteligr8.alfresco.asie.model.core.ReportRequest;

import com.inteligr8.alfresco.asie.model.core.ReportResponse;

import com.inteligr8.alfresco.asie.model.core.RetryAction;

import com.inteligr8.alfresco.asie.model.core.RetryRequest;

import com.inteligr8.alfresco.asie.model.core.RetryResponseAction;

import com.inteligr8.alfresco.asie.model.core.SummaryRequest;

import com.inteligr8.alfresco.asie.model.core.SummaryResponse;

import com.inteligr8.alfresco.asie.model.core.UpdateCoreRequest;

import com.inteligr8.alfresco.asie.model.core.UpdateLog4jRequest;

import com.inteligr8.alfresco.asie.model.core.UpdateSharedRequest;

import com.inteligr8.solr.model.ResponseAction;

import com.inteligr8.solr.model.Action;

import com.inteligr8.solr.model.ActionResponse;



import jakarta.ws.rs.BeanParam;

import jakarta.ws.rs.GET;
@@ -42,43 +43,43 @@ public interface CoreAdminApi extends com.inteligr8.solr.api.CoreAdminApi { 


	@GET

	@Produces(MediaType.APPLICATION_JSON)

	ActionResponse<ResponseAction> updateCore(@BeanParam UpdateCoreRequest request);

	ActionResponse<Action> updateCore(@BeanParam UpdateCoreRequest request);



	@GET

	@Produces(MediaType.APPLICATION_JSON)

	ActionResponse<ResponseAction> check(@BeanParam CheckRequest request);

	ActionResponse<Action> check(@BeanParam CheckRequest request);



	@GET

	@Produces(MediaType.APPLICATION_JSON)

	ActionResponse<ResponseAction> updateShared(@BeanParam UpdateSharedRequest request);

	ActionResponse<Action> updateShared(@BeanParam UpdateSharedRequest request);



	@GET

	@Produces(MediaType.APPLICATION_JSON)

	ActionResponse<ResponseAction> updateLog4j(@BeanParam UpdateLog4jRequest request);

	ActionResponse<Action> updateLog4j(@BeanParam UpdateLog4jRequest request);



	@GET

	@Produces(MediaType.APPLICATION_JSON)

	ActionResponse<ResponseAction> purge(@BeanParam PurgeRequest request);

	ActionCoreResponse<Action> purge(@BeanParam PurgeRequest request);



	@GET

	@Produces(MediaType.APPLICATION_JSON)

	ActionResponse<ResponseAction> reindex(@BeanParam ReindexRequest request);

	ActionCoreResponse<Action> reindex(@BeanParam ReindexRequest request);



	@GET

	@Produces(MediaType.APPLICATION_JSON)

	ActionResponse<RetryResponseAction> retry(@BeanParam RetryRequest request);

	ActionCoreResponse<RetryAction> retry(@BeanParam RetryRequest request);



	@GET

	@Produces(MediaType.APPLICATION_JSON)

	ActionResponse<FixResponseAction> fix(@BeanParam FixRequest request);

	ActionCoreResponse<FixAction> fix(@BeanParam FixRequest request);



	@GET

	@Produces(MediaType.APPLICATION_JSON)

	ActionResponse<IndexingStatusAction> enableIndexing(@BeanParam EnableIndexingRequest request);

	ActionCoreResponse<IndexingStatusAction> enableIndexing(@BeanParam EnableIndexingRequest request);



	@GET

	@Produces(MediaType.APPLICATION_JSON)

	ActionResponse<IndexingStatusAction> disableIndexing(@BeanParam DisableIndexingRequest request);

	ActionCoreResponse<IndexingStatusAction> disableIndexing(@BeanParam DisableIndexingRequest request);



	@GET

	@Produces(MediaType.APPLICATION_JSON)

asie-api/src/main/java/com/inteligr8/alfresco/asie/model/ActionResponse.java→asie-api/src/main/java/com/inteligr8/alfresco/asie/model/ActionCoreResponse.java

+7 −11
Original line number Diff line number Diff line
@@ -2,21 +2,17 @@ package com.inteligr8.alfresco.asie.model; 


import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import com.fasterxml.jackson.annotation.JsonProperty;

import com.fasterxml.jackson.annotation.JsonProperty.Access;

import com.inteligr8.solr.model.ResponseAction;

import com.inteligr8.solr.model.Action;

import com.inteligr8.solr.model.Cores;



@JsonIgnoreProperties(ignoreUnknown = true)

public class ActionResponse<T extends ResponseAction> extends BaseResponse {

public class ActionCoreResponse<T extends Action> extends BaseResponse {

	

	@JsonProperty(access = Access.READ_ONLY)

	private T action;

	@JsonProperty(value = "action")

	private Cores<T> cores;

	

	public T getAction() {

		return action;

	}

	

	protected void setAction(T action) {

		this.action = action;

	public Cores<T> getCores() {

		return cores;

	}



}

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

+3 −16
Original line number Diff line number Diff line 
package com.inteligr8.alfresco.asie.model;



import com.fasterxml.jackson.annotation.JsonProperty;

import com.fasterxml.jackson.annotation.JsonProperty.Access;



public class BaseResponse extends com.inteligr8.solr.model.BaseResponse {

	

	@JsonProperty(value = "STATUS", access = Access.READ_ONLY)

	@JsonProperty(value = "STATUS")

	private String reason;

	

	@JsonProperty(value = "exception", access = Access.READ_ONLY)

	@JsonProperty(value = "exception")

	private String exception;

	

	@JsonProperty(value = "msg", access = Access.READ_ONLY)

	@JsonProperty(value = "msg")

	private String message;

	

	public String getReason() {

		return reason;

	}

	

	protected void setReason(String reason) {

		this.reason = reason;

	}

	

	public String getException() {

		return exception;

	}

	

	protected void setException(String exception) {

		this.exception = exception;

	}

	

	public String getMessage() {

		return message;

	}



	protected void setMessage(String message) {

		this.message = message;

	}



}

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

0 → 100644
+25 −0
Original line number Diff line number Diff line 
package com.inteligr8.alfresco.asie.model.core;



import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import com.fasterxml.jackson.annotation.JsonProperty;

import com.inteligr8.solr.model.Action;

import com.inteligr8.solr.model.TransactionStatus;



@JsonIgnoreProperties(ignoreUnknown = true)

public class FixAction extends Action {

	

	@JsonProperty(value = "txToReindex")

	private TransactionStatus transactionStatus;

	

	@JsonProperty(value = "aclChangeSetToReindex")

	private TransactionStatus aclStatus;

	

	public TransactionStatus getTransactionStatus() {

		return transactionStatus;

	}

	

	public TransactionStatus getAclStatus() {

		return aclStatus;

	}



}