fix ASIE response model
This commit is contained in:
@@ -6,20 +6,20 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.alfresco</groupId>
|
||||
<artifactId>asie-platform-module-parent</artifactId>
|
||||
<version>1.2-SNAPSHOT</version>
|
||||
<version>1.3-SNAPSHOT</version>
|
||||
<relativePath>../</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>com.inteligr8.alfresco</groupId>
|
||||
<artifactId>asie-api</artifactId>
|
||||
<version>1.0-SNAPSHOT-asie2</version>
|
||||
<version>1.1-SNAPSHOT-asie2</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>ASIE JAX-RS API</name>
|
||||
<description>Alfresco Search & Insight Engine JAX-RS API</description>
|
||||
<name>ASIE Jakarta RS API</name>
|
||||
<description>Alfresco Search & 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>
|
||||
@@ -38,11 +38,45 @@
|
||||
<dependency>
|
||||
<groupId>com.inteligr8</groupId>
|
||||
<artifactId>solr-api</artifactId>
|
||||
<version>1.0-SNAPSHOT-solr6</version>
|
||||
<version>1.1-SNAPSHOT-solr6</version>
|
||||
</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>
|
||||
|
||||
|
@@ -1,12 +1,12 @@
|
||||
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)
|
||||
|
@@ -0,0 +1,18 @@
|
||||
package com.inteligr8.alfresco.asie.model;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import com.inteligr8.solr.model.Action;
|
||||
import com.inteligr8.solr.model.Cores;
|
||||
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class ActionCoreResponse<T extends Action> extends BaseResponse {
|
||||
|
||||
@JsonProperty(value = "action")
|
||||
private Cores<T> cores;
|
||||
|
||||
public Cores<T> getCores() {
|
||||
return cores;
|
||||
}
|
||||
|
||||
}
|
@@ -1,22 +0,0 @@
|
||||
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;
|
||||
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class ActionResponse<T extends ResponseAction> extends BaseResponse {
|
||||
|
||||
@JsonProperty(access = Access.READ_ONLY)
|
||||
private T action;
|
||||
|
||||
public T getAction() {
|
||||
return action;
|
||||
}
|
||||
|
||||
protected void setAction(T action) {
|
||||
this.action = action;
|
||||
}
|
||||
|
||||
}
|
@@ -1,41 +1,28 @@
|
||||
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;
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -0,0 +1,25 @@
|
||||
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;
|
||||
}
|
||||
|
||||
}
|
@@ -1,34 +0,0 @@
|
||||
package com.inteligr8.alfresco.asie.model.core;
|
||||
|
||||
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.TransactionResponseStatus;
|
||||
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class FixResponseAction extends ResponseAction {
|
||||
|
||||
@JsonProperty(value = "txToReindex", access = Access.READ_ONLY)
|
||||
private TransactionResponseStatus transactionStatus;
|
||||
|
||||
@JsonProperty(value = "aclChangeSetToReindex", access = Access.READ_ONLY)
|
||||
private TransactionResponseStatus aclStatus;
|
||||
|
||||
public TransactionResponseStatus getTransactionStatus() {
|
||||
return transactionStatus;
|
||||
}
|
||||
|
||||
protected void setTransactionStatus(TransactionResponseStatus transactionStatus) {
|
||||
this.transactionStatus = transactionStatus;
|
||||
}
|
||||
|
||||
public TransactionResponseStatus getAclStatus() {
|
||||
return aclStatus;
|
||||
}
|
||||
|
||||
protected void setAclStatus(TransactionResponseStatus aclStatus) {
|
||||
this.aclStatus = aclStatus;
|
||||
}
|
||||
|
||||
}
|
@@ -1,25 +1,43 @@
|
||||
package com.inteligr8.alfresco.asie.model.core;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonAnyGetter;
|
||||
import com.fasterxml.jackson.annotation.JsonAnySetter;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import com.inteligr8.solr.model.ResponseAction;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import com.inteligr8.solr.model.Action;
|
||||
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class IndexingStatusAction extends ResponseAction {
|
||||
public class IndexingStatusAction extends Action {
|
||||
|
||||
private Map<String, IndexingStatusMetadata> cores;
|
||||
|
||||
@JsonAnyGetter
|
||||
public Map<String, IndexingStatusMetadata> getCores() {
|
||||
return cores;
|
||||
@JsonProperty(value = "ACL")
|
||||
private Boolean aclIndexed;
|
||||
|
||||
@JsonProperty(value = "CONTENT")
|
||||
private Boolean contentIndexed;
|
||||
|
||||
@JsonProperty(value = "METADATA")
|
||||
private Boolean metadataIndexed;
|
||||
|
||||
public boolean isAclIndexed() {
|
||||
return Boolean.TRUE.equals(this.aclIndexed);
|
||||
}
|
||||
|
||||
@JsonAnySetter
|
||||
public void setCores(Map<String, IndexingStatusMetadata> cores) {
|
||||
this.cores = cores;
|
||||
public Boolean getAclIndexed() {
|
||||
return aclIndexed;
|
||||
}
|
||||
|
||||
public boolean isContentIndexed() {
|
||||
return Boolean.TRUE.equals(this.contentIndexed);
|
||||
}
|
||||
|
||||
public Boolean getContentIndexed() {
|
||||
return contentIndexed;
|
||||
}
|
||||
|
||||
public boolean isMetadataIndexed() {
|
||||
return Boolean.TRUE.equals(this.metadataIndexed);
|
||||
}
|
||||
|
||||
public Boolean getMetadataIndexed() {
|
||||
return metadataIndexed;
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -1,56 +0,0 @@
|
||||
package com.inteligr8.alfresco.asie.model.core;
|
||||
|
||||
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;
|
||||
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class IndexingStatusMetadata extends ResponseAction {
|
||||
|
||||
@JsonProperty(value = "ACL", access = Access.READ_ONLY)
|
||||
private Boolean aclIndexed;
|
||||
|
||||
@JsonProperty(value = "CONTENT", access = Access.READ_ONLY)
|
||||
private Boolean contentIndexed;
|
||||
|
||||
@JsonProperty(value = "METADATA", access = Access.READ_ONLY)
|
||||
private Boolean metadataIndexed;
|
||||
|
||||
public boolean isAclIndexed() {
|
||||
return Boolean.TRUE.equals(this.aclIndexed);
|
||||
}
|
||||
|
||||
public Boolean getAclIndexed() {
|
||||
return aclIndexed;
|
||||
}
|
||||
|
||||
protected void setAclIndexed(Boolean aclIndexed) {
|
||||
this.aclIndexed = aclIndexed;
|
||||
}
|
||||
|
||||
public boolean isContentIndexed() {
|
||||
return Boolean.TRUE.equals(this.contentIndexed);
|
||||
}
|
||||
|
||||
public Boolean getContentIndexed() {
|
||||
return contentIndexed;
|
||||
}
|
||||
|
||||
protected void setContentIndexed(Boolean contentIndexed) {
|
||||
this.contentIndexed = contentIndexed;
|
||||
}
|
||||
|
||||
public boolean isMetadataIndexed() {
|
||||
return Boolean.TRUE.equals(this.metadataIndexed);
|
||||
}
|
||||
|
||||
public Boolean getMetadataIndexed() {
|
||||
return metadataIndexed;
|
||||
}
|
||||
|
||||
protected void setMetadataIndexed(Boolean metadataIndexed) {
|
||||
this.metadataIndexed = metadataIndexed;
|
||||
}
|
||||
|
||||
}
|
@@ -19,16 +19,16 @@ public class PurgeRequest extends JsonFormattedResponseRequest<PurgeRequest> {
|
||||
private String core;
|
||||
|
||||
@QueryParam("txid")
|
||||
private Integer transactionId;
|
||||
private Long transactionId;
|
||||
|
||||
@QueryParam("acltxid")
|
||||
private Integer aclTransactionId;
|
||||
private Long aclTransactionId;
|
||||
|
||||
@QueryParam("nodeId")
|
||||
private Integer nodeId;
|
||||
private Long nodeId;
|
||||
|
||||
@QueryParam("aclid")
|
||||
private Integer aclId;
|
||||
private Long aclId;
|
||||
|
||||
public String getAction() {
|
||||
return action;
|
||||
@@ -51,54 +51,54 @@ public class PurgeRequest extends JsonFormattedResponseRequest<PurgeRequest> {
|
||||
return this;
|
||||
}
|
||||
|
||||
public Integer getTransactionId() {
|
||||
public Long getTransactionId() {
|
||||
return transactionId;
|
||||
}
|
||||
|
||||
public void setTransactionId(Integer transactionId) {
|
||||
public void setTransactionId(Long transactionId) {
|
||||
this.transactionId = transactionId;
|
||||
}
|
||||
|
||||
public PurgeRequest withTransactionId(Integer transactionId) {
|
||||
public PurgeRequest withTransactionId(Long transactionId) {
|
||||
this.transactionId = transactionId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Integer getAclTransactionId() {
|
||||
public Long getAclTransactionId() {
|
||||
return aclTransactionId;
|
||||
}
|
||||
|
||||
public void setAclTransactionId(Integer aclTransactionId) {
|
||||
public void setAclTransactionId(Long aclTransactionId) {
|
||||
this.aclTransactionId = aclTransactionId;
|
||||
}
|
||||
|
||||
public PurgeRequest withAclTransactionId(Integer aclTransactionId) {
|
||||
public PurgeRequest withAclTransactionId(Long aclTransactionId) {
|
||||
this.aclTransactionId = aclTransactionId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Integer getNodeId() {
|
||||
public Long getNodeId() {
|
||||
return nodeId;
|
||||
}
|
||||
|
||||
public void setNodeId(Integer nodeId) {
|
||||
public void setNodeId(Long nodeId) {
|
||||
this.nodeId = nodeId;
|
||||
}
|
||||
|
||||
public PurgeRequest withNodeId(Integer nodeId) {
|
||||
public PurgeRequest withNodeId(Long nodeId) {
|
||||
this.nodeId = nodeId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Integer getAclId() {
|
||||
public Long getAclId() {
|
||||
return aclId;
|
||||
}
|
||||
|
||||
public void setAclId(Integer aclId) {
|
||||
public void setAclId(Long aclId) {
|
||||
this.aclId = aclId;
|
||||
}
|
||||
|
||||
public PurgeRequest withAclId(Integer aclId) {
|
||||
public PurgeRequest withAclId(Long aclId) {
|
||||
this.aclId = aclId;
|
||||
return this;
|
||||
}
|
||||
|
@@ -19,16 +19,16 @@ public class ReindexRequest extends JsonFormattedResponseRequest<ReindexRequest>
|
||||
private String core;
|
||||
|
||||
@QueryParam("txid")
|
||||
private Integer transactionId;
|
||||
private Long transactionId;
|
||||
|
||||
@QueryParam("acltxid")
|
||||
private Integer aclTransactionId;
|
||||
private Long aclTransactionId;
|
||||
|
||||
@QueryParam("nodeId")
|
||||
private Integer nodeId;
|
||||
private Long nodeId;
|
||||
|
||||
@QueryParam("aclid")
|
||||
private Integer aclId;
|
||||
private Long aclId;
|
||||
|
||||
@QueryParam("query")
|
||||
private String query;
|
||||
@@ -54,54 +54,54 @@ public class ReindexRequest extends JsonFormattedResponseRequest<ReindexRequest>
|
||||
return this;
|
||||
}
|
||||
|
||||
public Integer getTransactionId() {
|
||||
public Long getTransactionId() {
|
||||
return transactionId;
|
||||
}
|
||||
|
||||
public void setTransactionId(Integer transactionId) {
|
||||
public void setTransactionId(Long transactionId) {
|
||||
this.transactionId = transactionId;
|
||||
}
|
||||
|
||||
public ReindexRequest withTransactionId(Integer transactionId) {
|
||||
public ReindexRequest withTransactionId(Long transactionId) {
|
||||
this.transactionId = transactionId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Integer getAclTransactionId() {
|
||||
public Long getAclTransactionId() {
|
||||
return aclTransactionId;
|
||||
}
|
||||
|
||||
public void setAclTransactionId(Integer aclTransactionId) {
|
||||
public void setAclTransactionId(Long aclTransactionId) {
|
||||
this.aclTransactionId = aclTransactionId;
|
||||
}
|
||||
|
||||
public ReindexRequest withAclTransactionId(Integer aclTransactionId) {
|
||||
public ReindexRequest withAclTransactionId(Long aclTransactionId) {
|
||||
this.aclTransactionId = aclTransactionId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Integer getNodeId() {
|
||||
public Long getNodeId() {
|
||||
return nodeId;
|
||||
}
|
||||
|
||||
public void setNodeId(Integer nodeId) {
|
||||
public void setNodeId(Long nodeId) {
|
||||
this.nodeId = nodeId;
|
||||
}
|
||||
|
||||
public ReindexRequest withNodeId(Integer nodeId) {
|
||||
public ReindexRequest withNodeId(Long nodeId) {
|
||||
this.nodeId = nodeId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Integer getAclId() {
|
||||
public Long getAclId() {
|
||||
return aclId;
|
||||
}
|
||||
|
||||
public void setAclId(Integer aclId) {
|
||||
public void setAclId(Long aclId) {
|
||||
this.aclId = aclId;
|
||||
}
|
||||
|
||||
public ReindexRequest withAclId(Integer aclId) {
|
||||
public ReindexRequest withAclId(Long aclId) {
|
||||
this.aclId = aclId;
|
||||
return this;
|
||||
}
|
||||
|
@@ -1,24 +1,9 @@
|
||||
package com.inteligr8.alfresco.asie.model.core;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonAnyGetter;
|
||||
import com.fasterxml.jackson.annotation.JsonAnySetter;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import com.inteligr8.solr.model.Metadata;
|
||||
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class Report {
|
||||
|
||||
private Map<String, Map<String, Object>> report;
|
||||
|
||||
@JsonAnyGetter
|
||||
public Map<String, Map<String, Object>> getReport() {
|
||||
return report;
|
||||
}
|
||||
|
||||
@JsonAnySetter
|
||||
protected void setReport(Map<String, Map<String, Object>> report) {
|
||||
this.report = report;
|
||||
}
|
||||
public class Report extends Metadata {
|
||||
|
||||
}
|
||||
|
@@ -25,10 +25,10 @@ public class ReportRequest extends JsonFormattedResponseRequest<ReportRequest> {
|
||||
private Long toTime;
|
||||
|
||||
@QueryParam("fromTx")
|
||||
private Integer fromTransactionId;
|
||||
private Long fromTransactionId;
|
||||
|
||||
@QueryParam("toTx")
|
||||
private Integer toTransactionId;
|
||||
private Long toTransactionId;
|
||||
|
||||
public String getAction() {
|
||||
return action;
|
||||
@@ -77,28 +77,28 @@ public class ReportRequest extends JsonFormattedResponseRequest<ReportRequest> {
|
||||
return this;
|
||||
}
|
||||
|
||||
public Integer getFromTransactionId() {
|
||||
public Long getFromTransactionId() {
|
||||
return fromTransactionId;
|
||||
}
|
||||
|
||||
public void setFromTransactionId(Integer fromTransactionId) {
|
||||
public void setFromTransactionId(Long fromTransactionId) {
|
||||
this.fromTransactionId = fromTransactionId;
|
||||
}
|
||||
|
||||
public ReportRequest fromTransactionId(Integer fromTransactionId) {
|
||||
public ReportRequest fromTransactionId(Long fromTransactionId) {
|
||||
this.fromTransactionId = fromTransactionId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Integer getToTransactionId() {
|
||||
public Long getToTransactionId() {
|
||||
return toTransactionId;
|
||||
}
|
||||
|
||||
public void setToTransactionId(Integer toTransactionId) {
|
||||
public void setToTransactionId(Long toTransactionId) {
|
||||
this.toTransactionId = toTransactionId;
|
||||
}
|
||||
|
||||
public ReportRequest toTransactionId(Integer toTransactionId) {
|
||||
public ReportRequest toTransactionId(Long toTransactionId) {
|
||||
this.toTransactionId = toTransactionId;
|
||||
return this;
|
||||
}
|
||||
|
@@ -2,21 +2,17 @@ package com.inteligr8.alfresco.asie.model.core;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty.Access;
|
||||
import com.inteligr8.alfresco.asie.model.BaseResponse;
|
||||
import com.inteligr8.solr.model.Cores;
|
||||
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class ReportResponse extends BaseResponse {
|
||||
|
||||
@JsonProperty(access = Access.READ_ONLY)
|
||||
private Report report;
|
||||
@JsonProperty(required = true)
|
||||
private Cores<Report> cores;
|
||||
|
||||
public Report getReport() {
|
||||
return report;
|
||||
}
|
||||
|
||||
protected void setReport(Report report) {
|
||||
this.report = report;
|
||||
public Cores<Report> getCores() {
|
||||
return cores;
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -0,0 +1,17 @@
|
||||
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;
|
||||
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class RetryAction extends Action {
|
||||
|
||||
@JsonProperty(value = "alfresco")
|
||||
private int[] nodeIds;
|
||||
|
||||
public int[] getNodeIds() {
|
||||
return nodeIds;
|
||||
}
|
||||
|
||||
}
|
@@ -1,22 +0,0 @@
|
||||
package com.inteligr8.alfresco.asie.model.core;
|
||||
|
||||
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;
|
||||
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class RetryResponseAction extends ResponseAction {
|
||||
|
||||
@JsonProperty(value = "alfresco", access = Access.READ_ONLY)
|
||||
private int[] nodeIds;
|
||||
|
||||
public int[] getNodeIds() {
|
||||
return nodeIds;
|
||||
}
|
||||
|
||||
public void setNodeIds(int[] nodeIds) {
|
||||
this.nodeIds = nodeIds;
|
||||
}
|
||||
|
||||
}
|
@@ -1,24 +1,7 @@
|
||||
package com.inteligr8.alfresco.asie.model.core;
|
||||
|
||||
import java.util.Map;
|
||||
import com.inteligr8.solr.model.Metadata;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonAnyGetter;
|
||||
import com.fasterxml.jackson.annotation.JsonAnySetter;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class Summary {
|
||||
|
||||
private Map<String, Object> summary;
|
||||
|
||||
@JsonAnyGetter
|
||||
public Map<String, Object> getSummary() {
|
||||
return summary;
|
||||
}
|
||||
|
||||
@JsonAnySetter
|
||||
public void setSummary(Map<String, Object> summary) {
|
||||
this.summary = summary;
|
||||
}
|
||||
public class Summary extends Metadata {
|
||||
|
||||
}
|
||||
|
@@ -2,21 +2,17 @@ package com.inteligr8.alfresco.asie.model.core;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty.Access;
|
||||
import com.inteligr8.alfresco.asie.model.BaseResponse;
|
||||
import com.inteligr8.solr.model.Cores;
|
||||
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class SummaryResponse extends BaseResponse {
|
||||
|
||||
@JsonProperty(value = "Summary", access = Access.READ_ONLY)
|
||||
private Summary summary;
|
||||
@JsonProperty(value = "Summary", required = true)
|
||||
private Cores<Summary> cores;
|
||||
|
||||
public Summary getSummary() {
|
||||
return summary;
|
||||
}
|
||||
|
||||
public void setSummary(Summary summary) {
|
||||
this.summary = summary;
|
||||
public Cores<Summary> getCores() {
|
||||
return cores;
|
||||
}
|
||||
|
||||
}
|
||||
|
23
asie-api/src/test/resources/log4j2-test.properties
Normal file
23
asie-api/src/test/resources/log4j2-test.properties
Normal file
@@ -0,0 +1,23 @@
|
||||
rootLogger.level=trace
|
||||
rootLogger.appenderRef.stdout.ref=STDOUT
|
||||
|
||||
logger.inteligr8-rs-request.name=jaxrs.request
|
||||
logger.inteligr8-rs-request.level=trace
|
||||
logger.inteligr8-rs-response.name=jaxrs.response
|
||||
logger.inteligr8-rs-response.level=off
|
||||
|
||||
logger.this.name=com.inteligr8.alfresco.asie
|
||||
logger.this.level=trace
|
||||
|
||||
# hide framework
|
||||
logger.apache-http.name=org.apache.http
|
||||
logger.apache-http.level=debug
|
||||
logger.jersey.name=org.glassfish.jersey
|
||||
logger.jersey.level=trace
|
||||
logger.jersey-client.name=org.glassfish.jersey.client
|
||||
logger.jersey-client.level=trace
|
||||
|
||||
appender.stdout.type=Console
|
||||
appender.stdout.name=STDOUT
|
||||
appender.stdout.layout.type=PatternLayout
|
||||
appender.stdout.layout.pattern=%d{ABSOLUTE_MICROS} %level{length=1} %c{1}: %m%n
|
Reference in New Issue
Block a user