cleanup deprecates methods

kullfar · kullfar · commit c3c19f2390a0 · 2019-03-25T10:59:14.000+03:00
diff --git a/changelog b/changelog
@@ -1,3 +1,6 @@
+[SNAPSHOT]
+ * cleanup deprecates methods
+
 [6.5.0]
  * separate OAuth1.0a and OAuth2.0 ServiceBuilders,
    introduce AuthorizationUrlBuilder (along with deprecation of AuthorizationUrlWithPKCE)
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/builder/ServiceBuilder.java b/scribejava-core/src/main/java/com/github/scribejava/core/builder/ServiceBuilder.java
@@ -51,26 +51,20 @@ public ServiceBuilder apiSecret(String apiSecret) {
         return this;
     }
 
-    /**
-     * @deprecated use {@link ServiceBuilderOAuth20#defaultScope(java.lang.String)} or
-     * {@link ServiceBuilderOAuth10a#withScope(java.lang.String)}
-     */
-    @Override
-    @Deprecated
-    public ServiceBuilder scope(String scope) {
+    private ServiceBuilder setScope(String scope) {
         Preconditions.checkEmptyString(scope, "Invalid OAuth scope");
         this.scope = scope;
         return this;
     }
 
     @Override
     public ServiceBuilderOAuth20 defaultScope(String defaultScope) {
-        return scope(defaultScope);
+        return setScope(defaultScope);
     }
 
     @Override
     public ServiceBuilderOAuth10a withScope(String scope) {
-        return scope(scope);
+        return setScope(scope);
     }
 
     @Override
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
@@ -34,17 +34,6 @@ public interface ServiceBuilderCommon {
      */
     ServiceBuilderCommon apiSecret(String apiSecret);
 
-    /**
-     * Configures the OAuth scope. This is only necessary in some APIs (like Google's).
-     *
-     * @param scope The OAuth scope
-     * @return the {@link ServiceBuilder} instance for method chaining
-     * @deprecated use {@link ServiceBuilderOAuth20#defaultScope(java.lang.String)} or
-     * {@link ServiceBuilderOAuth10a#withScope(java.lang.String)}
-     */
-    @Deprecated
-    ServiceBuilderCommon scope(String scope);
-
     ServiceBuilderCommon httpClientConfig(HttpClientConfig httpClientConfig);
 
     /**
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
@@ -17,13 +17,6 @@ public interface ServiceBuilderOAuth10a extends ServiceBuilderCommon {
     @Override
     ServiceBuilderOAuth20 apiSecret(String apiSecret);
 
-    /**
-     * @deprecated use {@link #withScope(java.lang.String) }
-     */
-    @Override
-    @Deprecated
-    ServiceBuilderOAuth20 scope(String scope);
-
     @Override
     ServiceBuilderOAuth20 httpClientConfig(HttpClientConfig httpClientConfig);
 
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
@@ -16,13 +16,6 @@ public interface ServiceBuilderOAuth20 extends ServiceBuilderCommon {
     @Override
     ServiceBuilderOAuth20 apiSecret(String apiSecret);
 
-    /**
-     * @deprecated use {@link #defaultScope(java.lang.String) }
-     */
-    @Override
-    @Deprecated
-    ServiceBuilderOAuth20 scope(String scope);
-
     @Override
     ServiceBuilderOAuth20 httpClientConfig(HttpClientConfig httpClientConfig);
 
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth20Service.java b/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth20Service.java
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/pkce/AuthorizationUrlWithPKCE.java b/scribejava-core/src/main/java/com/github/scribejava/core/pkce/AuthorizationUrlWithPKCE.java
