fix Type resolution for builder pattern in ServiceBuilderOAuth10a (thanks to https://github.com/mgyucht)

kullfar · kullfar · commit c9dfa62d8209 · 2019-08-20T15:48:50.000+03:00
diff --git a/changelog b/changelog
@@ -1,5 +1,6 @@
 [SNAPSHOT]
  * make Response implements Closeable (thanks to https://github.com/omaric)
+ * fix Type resolution for builder pattern in ServiceBuilderOAuth10a (thanks to https://github.com/mgyucht)
 
 [6.8.0]
  * Add debug output to OAuth2Service (thanks to https://github.com/rbarbey)
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/builder/ServiceBuilderCommon.java b/scribejava-core/src/main/java/com/github/scribejava/core/builder/ServiceBuilderCommon.java
@@ -3,6 +3,7 @@
 import com.github.scribejava.core.httpclient.HttpClient;
 import com.github.scribejava.core.httpclient.HttpClientConfig;
 import com.github.scribejava.core.oauth.OAuthService;
+import java.io.OutputStream;
 
 /**
  * Implementation of the Builder pattern, with a fluent interface that creates a {@link OAuthService}
@@ -45,4 +46,8 @@ public interface ServiceBuilderCommon {
     ServiceBuilderCommon httpClient(HttpClient httpClient);
 
     ServiceBuilderCommon userAgent(String userAgent);
+
+    ServiceBuilderCommon debugStream(OutputStream debugStream);
+
+    ServiceBuilderCommon debug();
 }
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/builder/ServiceBuilderOAuth10a.java b/scribejava-core/src/main/java/com/github/scribejava/core/builder/ServiceBuilderOAuth10a.java
@@ -26,8 +26,10 @@ public interface ServiceBuilderOAuth10a extends ServiceBuilderCommon {
     @Override
     ServiceBuilderOAuth10a userAgent(String userAgent);
 
+    @Override
     ServiceBuilderOAuth10a debugStream(OutputStream debugStream);
 
+    @Override
     ServiceBuilderOAuth10a debug();
 
     /**
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/builder/ServiceBuilderOAuth20.java b/scribejava-core/src/main/java/com/github/scribejava/core/builder/ServiceBuilderOAuth20.java
@@ -4,6 +4,7 @@
 import com.github.scribejava.core.httpclient.HttpClient;
 import com.github.scribejava.core.httpclient.HttpClientConfig;
 import com.github.scribejava.core.oauth.OAuth20Service;
+import java.io.OutputStream;
 
 public interface ServiceBuilderOAuth20 extends ServiceBuilderCommon {
 
@@ -25,6 +26,12 @@ public interface ServiceBuilderOAuth20 extends ServiceBuilderCommon {
     @Override
     ServiceBuilderOAuth20 userAgent(String userAgent);
 
+    @Override
+    ServiceBuilderOAuth20 debugStream(OutputStream debugStream);
+
+    @Override
+    ServiceBuilderOAuth20 debug();
+
     ServiceBuilderOAuth20 responseType(String responseType);
 
     /**
