Remove references to WithBridgeMethods annotation
GitHubMyselfWrapper is a delegate of GHMyself but does not
need to use JVM byte-code generation for his methods,
because the base class is already doing the job.
Update also Kohsuke's GitHub API to 1.116 and add the required
bridge-method-injector dependency.
Change-Id: Iad892f9e7a7850511a20e5844b34a6844a504f96
diff --git a/github-oauth/pom.xml b/github-oauth/pom.xml
index 92f7e2a..258d15f 100644
--- a/github-oauth/pom.xml
+++ b/github-oauth/pom.xml
@@ -107,7 +107,12 @@
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>github-api</artifactId>
- <version>1.70</version>
+ <version>1.116</version>
+ </dependency>
+ <dependency>
+ <groupId>com.infradna.tool</groupId>
+ <artifactId>bridge-method-injector</artifactId>
+ <version>1.18</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubMyselfWrapper.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubMyselfWrapper.java
index 2336521..247d6a6 100644
--- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubMyselfWrapper.java
+++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubMyselfWrapper.java
@@ -14,7 +14,6 @@
package com.googlesource.gerrit.plugins.github.oauth;
-import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
import java.io.IOException;
import java.net.URL;
import java.util.Date;
@@ -111,13 +110,11 @@
}
@Override
- @WithBridgeMethods({Set.class})
public GHPersonSet<GHUser> getFollows() throws IOException {
return wrapped.getFollows();
}
@Override
- @WithBridgeMethods({Set.class})
public GHPersonSet<GHUser> getFollowers() throws IOException {
return wrapped.getFollowers();
}
@@ -143,7 +140,6 @@
}
@Override
- @WithBridgeMethods({Set.class})
public GHPersonSet<GHOrganization> getOrganizations() throws IOException {
try {
return wrapped.getOrganizations();
@@ -269,18 +265,12 @@
}
@Override
- @WithBridgeMethods(
- value = {String.class},
- adapterMethod = "urlToString")
public URL getUrl() {
return wrapped.getUrl();
}
@Override
- @WithBridgeMethods(
- value = {String.class},
- adapterMethod = "intToString")
- public int getId() {
+ public long getId() {
return wrapped.getId();
}
}
