Make HttpClientGitHubConnector the default connector for Java 11

hub4j · Nov 21, 2021 · 84b6b64 · 84b6b64
1 parent 742ce54
commit 84b6b64
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -287,8 +287,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.1</version>
         <configuration>
-          <source>11</source>
-          <target>11</target>
+          <source>1.8</source>
+          <target>1.8</target>
           <annotationProcessorPaths>
             <annotationProcessorPath>
               <groupId>org.jenkins-ci</groupId>

diff --git a/src/main/java/org/kohsuke/github/internal/DefaultGitHubConnector.java b/src/main/java/org/kohsuke/github/internal/DefaultGitHubConnector.java
@@ -50,11 +50,11 @@ static GitHubConnector create(String defaultConnectorProperty) {
         } else if (defaultConnectorProperty.equalsIgnoreCase("httpclient")) {
             return new HttpClientGitHubConnector();
         } else if (defaultConnectorProperty.equalsIgnoreCase("default")) {
-            // try {
-            // return new HttpClientGitHubConnector();
-            // } catch (UnsupportedOperationException | LinkageError e) {
-            return new GitHubConnectorHttpConnectorAdapter(HttpConnector.DEFAULT);
-            // }
+            try {
+                return new HttpClientGitHubConnector();
+            } catch (UnsupportedOperationException | LinkageError e) {
+                return new GitHubConnectorHttpConnectorAdapter(HttpConnector.DEFAULT);
+            }
         } else {
             throw new IllegalStateException(
                     "Property 'test.github.connector' must reference a valid built-in connector - okhttp, okhttpconnector, urlconnection, or default.");

diff --git a/src/test/java/org/kohsuke/github/internal/DefaultGitHubConnectorTest.java b/src/test/java/org/kohsuke/github/internal/DefaultGitHubConnectorTest.java
@@ -37,8 +37,6 @@ public void testCreate() throws Exception {
 
         connector = DefaultGitHubConnector.create("default");
 
-        // Current implementation never uses httpclient for default.
-        usingHttpClient = false;
         if (usingHttpClient) {
             assertThat(connector, instanceOf(HttpClientGitHubConnector.class));
         } else {