From cc54463ac16849ef2108e665d5fadf03672b9dd4 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Mon, 11 Jan 2021 10:22:48 -0500 Subject: [PATCH 1/3] renamed package --- src/main/java/com/inteligr8/github/ApiGateway.java | 4 ++-- .../java/com/inteligr8/{ => github}/http/BaseResponse.java | 2 +- .../{ => github}/http/PreemptiveAuthInterceptor.java | 2 +- .../java/com/inteligr8/github/model/CreatePullRequest.java | 2 +- src/main/java/com/inteligr8/github/model/CreateReference.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename src/main/java/com/inteligr8/{ => github}/http/BaseResponse.java (94%) rename src/main/java/com/inteligr8/{ => github}/http/PreemptiveAuthInterceptor.java (97%) diff --git a/src/main/java/com/inteligr8/github/ApiGateway.java b/src/main/java/com/inteligr8/github/ApiGateway.java index c5121fe..2fbc796 100644 --- a/src/main/java/com/inteligr8/github/ApiGateway.java +++ b/src/main/java/com/inteligr8/github/ApiGateway.java @@ -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 { diff --git a/src/main/java/com/inteligr8/http/BaseResponse.java b/src/main/java/com/inteligr8/github/http/BaseResponse.java similarity index 94% rename from src/main/java/com/inteligr8/http/BaseResponse.java rename to src/main/java/com/inteligr8/github/http/BaseResponse.java index 7d748ab..ed0c387 100644 --- a/src/main/java/com/inteligr8/http/BaseResponse.java +++ b/src/main/java/com/inteligr8/github/http/BaseResponse.java @@ -1,4 +1,4 @@ -package com.inteligr8.http; +package com.inteligr8.github.http; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/com/inteligr8/http/PreemptiveAuthInterceptor.java b/src/main/java/com/inteligr8/github/http/PreemptiveAuthInterceptor.java similarity index 97% rename from src/main/java/com/inteligr8/http/PreemptiveAuthInterceptor.java rename to src/main/java/com/inteligr8/github/http/PreemptiveAuthInterceptor.java index 64eced7..d48ddb3 100644 --- a/src/main/java/com/inteligr8/http/PreemptiveAuthInterceptor.java +++ b/src/main/java/com/inteligr8/github/http/PreemptiveAuthInterceptor.java @@ -1,4 +1,4 @@ -package com.inteligr8.http; +package com.inteligr8.github.http; import java.io.IOException; diff --git a/src/main/java/com/inteligr8/github/model/CreatePullRequest.java b/src/main/java/com/inteligr8/github/model/CreatePullRequest.java index 6f1e6ca..0235ea0 100644 --- a/src/main/java/com/inteligr8/github/model/CreatePullRequest.java +++ b/src/main/java/com/inteligr8/github/model/CreatePullRequest.java @@ -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 { diff --git a/src/main/java/com/inteligr8/github/model/CreateReference.java b/src/main/java/com/inteligr8/github/model/CreateReference.java index 000ae92..c384ac3 100644 --- a/src/main/java/com/inteligr8/github/model/CreateReference.java +++ b/src/main/java/com/inteligr8/github/model/CreateReference.java @@ -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 { From f5abc63adf6d347e6a91d14f0139f3efc048e99d Mon Sep 17 00:00:00 2001 From: Brian Long Date: Mon, 11 Jan 2021 10:22:56 -0500 Subject: [PATCH 2/3] added DeleteReference --- .../inteligr8/github/model/DeleteReference.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/main/java/com/inteligr8/github/model/DeleteReference.java diff --git a/src/main/java/com/inteligr8/github/model/DeleteReference.java b/src/main/java/com/inteligr8/github/model/DeleteReference.java new file mode 100644 index 0000000..c4fe628 --- /dev/null +++ b/src/main/java/com/inteligr8/github/model/DeleteReference.java @@ -0,0 +1,14 @@ +package com.inteligr8.github.model; + +public class DeleteReference { + + private DeleteReference() { + } + + public static String constructRequestPath(String repoName, String ref) { + return "/repos/" + repoName + "/" + httpPath + "/" + ref; + } + + public static String httpPath = "git/refs"; + +} From cd6f36f41d400b2cf25f307090535ea36bdd6ef3 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Mon, 11 Jan 2021 10:51:56 -0500 Subject: [PATCH 3/3] fixed after delete tests --- .../java/com/inteligr8/github/ApiGateway.java | 22 ++++++++++++------- .../github/model/DeleteReference.java | 6 ++++- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/inteligr8/github/ApiGateway.java b/src/main/java/com/inteligr8/github/ApiGateway.java index 2fbc796..3b684c1 100644 --- a/src/main/java/com/inteligr8/github/ApiGateway.java +++ b/src/main/java/com/inteligr8/github/ApiGateway.java @@ -84,15 +84,21 @@ public class ApiGateway { if (this.logger.isDebugEnabled()) this.logger.debug("Received response from " + method + ": " + response.getStatusLine().getStatusCode()); - 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; - } finally { - istream.close(); + Response responseObject = null; + if (response.getEntity() != null) { + InputStream istream = response.getEntity().getContent(); + try { + 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; } } diff --git a/src/main/java/com/inteligr8/github/model/DeleteReference.java b/src/main/java/com/inteligr8/github/model/DeleteReference.java index c4fe628..2a599b6 100644 --- a/src/main/java/com/inteligr8/github/model/DeleteReference.java +++ b/src/main/java/com/inteligr8/github/model/DeleteReference.java @@ -9,6 +9,10 @@ public class DeleteReference { return "/repos/" + repoName + "/" + httpPath + "/" + ref; } - public static String httpPath = "git/refs"; + public static String constructRequestPathByBranch(String repoName, String branchName) { + return constructRequestPath(repoName, "refs/heads/" + branchName); + } + + public static String httpPath = "git"; }