Commit 75e25577 authored by Brian Long's avatar Brian Long
Browse files

fix Solr response model

parent 35bae428

solr-api/pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ 
	<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</groupId>

	<artifactId>solr-api</artifactId>

	<version>1.0-SNAPSHOT-solr6</version>

	<version>1.1-SNAPSHOT-solr6</version>

	<packaging>jar</packaging>

	

	<name>Apache Solr JAX-RS API</name>

solr-api/src/main/java/com/inteligr8/solr/api/CollectionAdminApi.java

+2 −2
Original line number Diff line number Diff line 
package com.inteligr8.solr.api;



import com.inteligr8.solr.model.ActionResponse;

import com.inteligr8.solr.model.ResponseAction;

import com.inteligr8.solr.model.Action;

import com.inteligr8.solr.model.collection.AliasesResponse;

import com.inteligr8.solr.model.collection.GetAliasesRequest;

import com.inteligr8.solr.model.core.ReloadRequest;
@@ -17,7 +17,7 @@ public interface CollectionAdminApi { 


	@GET

	@Produces(MediaType.APPLICATION_JSON)

	ActionResponse<ResponseAction> reload(@BeanParam ReloadRequest request);

	ActionResponse<Action> reload(@BeanParam ReloadRequest request);



	@GET

	@Produces(MediaType.APPLICATION_JSON)

solr-api/src/main/java/com/inteligr8/solr/model/ResponseAction.java→solr-api/src/main/java/com/inteligr8/solr/model/Action.java

+3 −12
Original line number Diff line number Diff line
@@ -2,10 +2,9 @@ package com.inteligr8.solr.model; 


import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import com.fasterxml.jackson.annotation.JsonProperty;

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



@JsonIgnoreProperties(ignoreUnknown = true)

public class ResponseAction {

public class Action {

	

	public enum Status {

		@JsonProperty("success")
@@ -16,26 +15,18 @@ public class ResponseAction { 
		Error,

	}

	

	@JsonProperty(access = Access.READ_ONLY)

	@JsonProperty

	private Status status;

	

	@JsonProperty(access = Access.READ_ONLY)

	@JsonProperty

	private String errorMessage;

	

	public Status getStatus() {

		return status;

	}

	

	protected void setStatus(Status status) {

		this.status = status;

	}

	

	public String getErrorMessage() {

		return errorMessage;

	}



	protected void setErrorMessage(String errorMessage) {

		this.errorMessage = errorMessage;

	}



}

solr-api/src/main/java/com/inteligr8/solr/model/ActionResponse.java

+2 −3
Original line number Diff line number Diff line
@@ -2,12 +2,11 @@ package com.inteligr8.solr.model; 


import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import com.fasterxml.jackson.annotation.JsonProperty;

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



@JsonIgnoreProperties(ignoreUnknown = true)

public class ActionResponse<T extends ResponseAction> extends BaseResponse {

public class ActionResponse<T extends Action> extends BaseResponse {

	

	@JsonProperty(access = Access.READ_ONLY)

	@JsonProperty

	private T action;

	

	public T getAction() {

solr-api/src/main/java/com/inteligr8/solr/model/BaseResponse.java

+1 −6
Original line number Diff line number Diff line
@@ -2,20 +2,15 @@ package com.inteligr8.solr.model; 


import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import com.fasterxml.jackson.annotation.JsonProperty;

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



@JsonIgnoreProperties(ignoreUnknown = true)

public class BaseResponse {

	

	@JsonProperty(access = Access.READ_ONLY)

	@JsonProperty(required = true)

	private ResponseHeader responseHeader;

	

	public ResponseHeader getResponseHeader() {

		return responseHeader;

	}



	protected void setResponseHeader(ResponseHeader responseHeader) {

		this.responseHeader = responseHeader;

	}



}