Merge branch 'develop' into stable

Conflicts:
	pom.xml

.gitignore

@@ -1,5 +1,6 @@
 # Maven
 target
+pom.xml.versionsBackup
 
 # Eclipse
 .project

pom.xml

@@ -2,10 +2,10 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>me.brianlong</groupId>
+	<groupId>com.inteligr8</groupId>
 	<artifactId>github-api</artifactId>
 	<packaging>jar</packaging>
-	<version>1.0-SNAPSHOT</version>
+	<version>1.1.1</version>
 
 	<name>GitHub API &amp; Utilities</name>
 
@@ -16,16 +16,6 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.eclipse.jgit</groupId>
-			<artifactId>org.eclipse.jgit</artifactId>
-			<version>5.9.0.202009080501-r</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jgit</groupId>
-			<artifactId>org.eclipse.jgit.ssh.jsch</artifactId>
-			<version>5.9.0.202009080501-r</version>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
@@ -41,6 +31,11 @@
 			<artifactId>jackson-datatype-jsr310</artifactId>
 			<version>2.11.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.30</version>
+		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -86,4 +81,13 @@
 			</plugin>
 		</plugins>
 	</build>
+	
+	<distributionManagement>
+		<repository>
+			<id>inteligr8-releases</id>
+			<name>Inteligr8 Releases</name>
+			<url>http://repos.yateslong.us/nexus/repository/inteligr8-public</url>
+			<layout>default</layout>
+		</repository>
+	</distributionManagement>
 </project>

src/jetty/log4j2.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN">
-  <Appenders>
-    <Console name="STDOUT" target="SYSTEM_OUT">
-      <PatternLayout pattern="[%t] %-5level %logger{36} - %msg%n"/>
-    </Console>
-  </Appenders>
-  <Loggers>
-  	<Logger name="me.brianlong" level="trace" additivity="false">
-  	  <AppenderRef ref="STDOUT" />
-  	</Logger>
-    <Root level="trace">
-      <AppenderRef ref="STDOUT"/>
-    </Root>
-  </Loggers>
-</Configuration>

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

@@ -1,4 +1,4 @@
-package me.brianlong.github;
+package com.inteligr8.github;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -19,13 +19,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-
-import me.brianlong.http.BaseResponse;
-import me.brianlong.http.PreemptiveAuthInterceptor;
+import com.inteligr8.github.http.BaseResponse;
+import com.inteligr8.github.http.PreemptiveAuthInterceptor;
 
 public class ApiGateway {
 
 	private final Logger logger = LoggerFactory.getLogger(ApiGateway.class);
+	private final String baseUrl = "https://api.github.com";
 	private ObjectMapper omapper = new ObjectMapper();
 	private CredentialsProvider credProvider;
 	
@@ -33,29 +33,29 @@ public class ApiGateway {
 		this.credProvider = credProvider;
 	}
 	
-	public <Response extends BaseResponse> Response get(String uri, Map<String, Object> paramMap, Class<Response> responseType) throws IOException {
-		return this.execute(HttpGet.METHOD_NAME, uri, paramMap, null, responseType);
+	public <Response extends BaseResponse> Response get(String uriPath, Map<String, Object> paramMap, Class<Response> responseType) throws IOException {
+		return this.execute(HttpGet.METHOD_NAME, uriPath, paramMap, null, responseType);
 	}
 	
-	public <Request, Response extends BaseResponse> Response post(String uri, Request requestObject, Class<Response> responseType) throws IOException {
-		return this.execute(HttpPost.METHOD_NAME, uri, null, requestObject, responseType);
+	public <Request, Response extends BaseResponse> Response post(String uriPath, Request requestObject, Class<Response> responseType) throws IOException {
+		return this.execute(HttpPost.METHOD_NAME, uriPath, null, requestObject, responseType);
 	}
 	
-	public <Request, Response extends BaseResponse> Response put(String uri, Request requestObject, Class<Response> responseType) throws IOException {
-		return this.execute(HttpPost.METHOD_NAME, uri, null, requestObject, responseType);
+	public <Request, Response extends BaseResponse> Response put(String uriPath, Request requestObject, Class<Response> responseType) throws IOException {
+		return this.execute(HttpPost.METHOD_NAME, uriPath, null, requestObject, responseType);
 	}
 	
-	public <Response extends BaseResponse> Response delete(String uri, Map<String, Object> paramMap, Class<Response> responseType) throws IOException {
-		return this.execute(HttpDelete.METHOD_NAME, uri, paramMap, null, responseType);
+	public <Response extends BaseResponse> Response delete(String uriPath, Map<String, Object> paramMap, Class<Response> responseType) throws IOException {
+		return this.execute(HttpDelete.METHOD_NAME, uriPath, paramMap, null, responseType);
 	}
 	
-	private <Request, Response extends BaseResponse> Response execute(String method, String uri, Map<String, Object> paramMap, Request requestObject, Class<Response> responseType) throws IOException {
+	private <Request, Response extends BaseResponse> Response execute(String method, String uriPath, Map<String, Object> paramMap, Request requestObject, Class<Response> responseType) throws IOException {
 		if (this.logger.isTraceEnabled())
-			this.logger.trace("execute('" + method + "', '" + uri + "')");
+			this.logger.trace("execute('" + method + "', '" + uriPath + "')");
 
 		RequestBuilder builder = RequestBuilder
 				.create(method)
-				.setUri(uri);
+				.setUri(this.baseUrl + uriPath);
 		
 		if (paramMap != null) {
 			for (Entry<String, Object> param : paramMap.entrySet())
@@ -66,14 +66,14 @@ public class ApiGateway {
 		if (requestObject != null) {
 			String requestJson = this.omapper.writeValueAsString(requestObject);
 			if (this.logger.isTraceEnabled())
-				this.logger.trace("execute('" + method + "', '" + uri + "'): " + requestJson);
+				this.logger.trace("execute('" + method + "', '" + uriPath + "'): " + requestJson);
 
 			builder.setEntity(new StringEntity(requestJson, ContentType.APPLICATION_JSON));
 		}
 		
 		HttpUriRequest request = builder.build();
 		if (this.logger.isDebugEnabled())
-			this.logger.debug("Prepared request for " + method + " to: " + uri);
+			this.logger.debug("Prepared request for " + method + " to: " + uriPath);
 		
 		HttpResponse response = HttpClientBuilder
 				.create()
@@ -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;
 	}
 
 }

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

@@ -1,4 +1,4 @@
-package me.brianlong.http;
+package com.inteligr8.github.http;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 

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

@@ -1,4 +1,4 @@
-package me.brianlong.http;
+package com.inteligr8.github.http;
 
 import java.io.IOException;
 

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

@@ -1,15 +1,18 @@
-package me.brianlong.github.model;
+package com.inteligr8.github.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import me.brianlong.http.BaseResponse;
+import com.inteligr8.github.http.BaseResponse;
 
 public class CreatePullRequest {
 	
 	private CreatePullRequest() {
 	}
 	
+	public static String constructRequestPath(String repoName) {
+		return "/repos/" + repoName + "/" + httpPath;
+	}
+	
 	public static String httpPath = "pulls";
 	
 	@JsonIgnoreProperties(ignoreUnknown = true)

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

@@ -1,15 +1,18 @@
-package me.brianlong.github.model;
+package com.inteligr8.github.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import me.brianlong.http.BaseResponse;
+import com.inteligr8.github.http.BaseResponse;
 
 public class CreateReference {
 	
 	private CreateReference() {
 	}
 	
+	public static String constructRequestPath(String repoName) {
+		return "/repos/" + repoName + "/" + httpPath;
+	}
+	
 	public static String httpPath = "git/refs";
 	
 	@JsonIgnoreProperties(ignoreUnknown = true)

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

@@ -0,0 +1,18 @@
+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 constructRequestPathByBranch(String repoName, String branchName) {
+		return constructRequestPath(repoName, "refs/heads/" + branchName);
+	}
+	
+	public static String httpPath = "git";
+
+}