Commit ce92fc5b authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 4b7fd352 cd6f36f4

src/main/java/com/inteligr8/github/ApiGateway.java

+16 −10
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ import org.slf4j.Logger; 
import org.slf4j.LoggerFactory;



import com.fasterxml.jackson.databind.ObjectMapper;

import com.inteligr8.http.BaseResponse;

import com.inteligr8.http.PreemptiveAuthInterceptor;

import com.inteligr8.github.http.BaseResponse;

import com.inteligr8.github.http.PreemptiveAuthInterceptor;



public class ApiGateway {
@@ -84,15 +84,21 @@ public class ApiGateway { 
		if (this.logger.isDebugEnabled())

			this.logger.debug("Received response from " + method + ": " + response.getStatusLine().getStatusCode());

		

		Response responseObject = null;

		if (response.getEntity() != null) {

			InputStream istream = response.getEntity().getContent();

			try {

			Response responseObject = this.omapper.readerFor(responseType).readValue(istream);

			responseObject.setHttpStatusCode(response.getStatusLine().getStatusCode());

			responseObject.setHttpStatusReason(response.getStatusLine().getReasonPhrase());

			return responseObject;

				responseObject = this.omapper.readerFor(responseType).readValue(istream);

			} finally {

				istream.close();

			}

		} else {

			responseObject = this.omapper.readerFor(responseType).readValue("{}");

		}



		responseObject.setHttpStatusCode(response.getStatusLine().getStatusCode());

		responseObject.setHttpStatusReason(response.getStatusLine().getReasonPhrase());

		return responseObject;

	}



}

src/main/java/com/inteligr8/http/BaseResponse.java→src/main/java/com/inteligr8/github/http/BaseResponse.java

+1 −1
Original line number Diff line number Diff line 
package com.inteligr8.http;

package com.inteligr8.github.http;



import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

src/main/java/com/inteligr8/http/PreemptiveAuthInterceptor.java→src/main/java/com/inteligr8/github/http/PreemptiveAuthInterceptor.java

+1 −1
Original line number Diff line number Diff line 
package com.inteligr8.http;

package com.inteligr8.github.http;



import java.io.IOException;

src/main/java/com/inteligr8/github/model/CreatePullRequest.java

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ package com.inteligr8.github.model; 


import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import com.fasterxml.jackson.annotation.JsonProperty;

import com.inteligr8.http.BaseResponse;

import com.inteligr8.github.http.BaseResponse;



public class CreatePullRequest {

src/main/java/com/inteligr8/github/model/CreateReference.java

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ package com.inteligr8.github.model; 


import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import com.fasterxml.jackson.annotation.JsonProperty;

import com.inteligr8.http.BaseResponse;

import com.inteligr8.github.http.BaseResponse;



public class CreateReference {