remove any Google+ mention (switch to clean Google OAuth2) (thanks to https://github.com/fvasco)

kullfar · kullfar · commit 584080faf09e · 2019-02-06T15:45:11.000+03:00
diff --git a/changelog b/changelog
@@ -1,5 +1,6 @@
 [SNAPSHOT]
  * fix Muplipart request model and implement it for a jdk HTTP client (thanks to https://github.com/NTPape)
+ * remove any Google+ mention (switch to clean Google OAuth2) (thanks to https://github.com/fvasco)
 
 [6.2.0]
  * add new API Microsoft Azure Active Directory (Azure AD) 2.0 (thanks to https://github.com/rzukow and https://github.com/dgrudenic)
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Google20AsyncAHCExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Google20AsyncAHCExample.java
@@ -19,8 +19,8 @@
 
 public class Google20AsyncAHCExample {
 
-    private static final String NETWORK_NAME = "G+ Async";
-    private static final String PROTECTED_RESOURCE_URL = "https://www.googleapis.com/plus/v1/people/me";
+    private static final String NETWORK_NAME = "Google Async";
+    private static final String PROTECTED_RESOURCE_URL = "https://www.googleapis.com/oauth2/v3/userinfo";
 
     private Google20AsyncAHCExample() {
     }
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Google20Example.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Google20Example.java
@@ -16,8 +16,8 @@
 
 public class Google20Example {
 
-    private static final String NETWORK_NAME = "G+";
-    private static final String PROTECTED_RESOURCE_URL = "https://www.googleapis.com/plus/v1/people/me";
+    private static final String NETWORK_NAME = "Google";
+    private static final String PROTECTED_RESOURCE_URL = "https://www.googleapis.com/oauth2/v3/userinfo";
 
     private Google20Example() {
     }
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Google20RevokeExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Google20RevokeExample.java
@@ -16,8 +16,8 @@
 
 public class Google20RevokeExample {
 
-    private static final String NETWORK_NAME = "G+";
-    private static final String PROTECTED_RESOURCE_URL = "https://www.googleapis.com/plus/v1/people/me";
+    private static final String NETWORK_NAME = "Google";
+    private static final String PROTECTED_RESOURCE_URL = "https://www.googleapis.com/oauth2/v3/userinfo";
 
     private Google20RevokeExample() {
     }
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Google20WithPKCEExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Google20WithPKCEExample.java
@@ -17,8 +17,8 @@
 
 public class Google20WithPKCEExample {
 
-    private static final String NETWORK_NAME = "G+";
-    private static final String PROTECTED_RESOURCE_URL = "https://www.googleapis.com/plus/v1/people/me";
+    private static final String NETWORK_NAME = "Google";
+    private static final String PROTECTED_RESOURCE_URL = "https://www.googleapis.com/oauth2/v3/userinfo";
 
     private Google20WithPKCEExample() {
     }

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@`
`19`	`19`
`20`	`20`	`public class Google20AsyncAHCExample {`
`21`	`21`
`22`		`- private static final String NETWORK_NAME = "G+ Async";`
`23`		`- private static final String PROTECTED_RESOURCE_URL = "https://www.googleapis.com/plus/v1/people/me";`
	`22`	`+ private static final String NETWORK_NAME = "Google Async";`
	`23`	`+ private static final String PROTECTED_RESOURCE_URL = "https://www.googleapis.com/oauth2/v3/userinfo";`
`24`	`24`
`25`	`25`	`private Google20AsyncAHCExample() {`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@`
`16`	`16`
`17`	`17`	`public class Google20Example {`
`18`	`18`
`19`		`- private static final String NETWORK_NAME = "G+";`
`20`		`- private static final String PROTECTED_RESOURCE_URL = "https://www.googleapis.com/plus/v1/people/me";`
	`19`	`+ private static final String NETWORK_NAME = "Google";`
	`20`	`+ private static final String PROTECTED_RESOURCE_URL = "https://www.googleapis.com/oauth2/v3/userinfo";`
`21`	`21`
`22`	`22`	`private Google20Example() {`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@`
`17`	`17`
`18`	`18`	`public class Google20WithPKCEExample {`
`19`	`19`
`20`		`- private static final String NETWORK_NAME = "G+";`
`21`		`- private static final String PROTECTED_RESOURCE_URL = "https://www.googleapis.com/plus/v1/people/me";`
	`20`	`+ private static final String NETWORK_NAME = "Google";`
	`21`	`+ private static final String PROTECTED_RESOURCE_URL = "https://www.googleapis.com/oauth2/v3/userinfo";`
`22`	`22`
`23`	`23`	`private Google20WithPKCEExample() {`
`24`	`24`	`}`