use instance method for FlickrApi instead of constructor

kullfar · kullfar · commit 04f69677cd00 · 2017-05-15T15:10:15.000+03:00
diff --git a/scribejava-apis/src/main/java/com/github/scribejava/apis/FlickrApi.java b/scribejava-apis/src/main/java/com/github/scribejava/apis/FlickrApi.java
@@ -25,7 +25,7 @@ protected FlickrApi() {
         permString = null;
     }
 
-    public FlickrApi(FlickrPerm perm) {
+    protected FlickrApi(FlickrPerm perm) {
         permString = perm.name().toLowerCase();
     }
 
@@ -37,6 +37,9 @@ public static FlickrApi instance() {
         return InstanceHolder.INSTANCE;
     }
 
+    public static FlickrApi instance(FlickrPerm perm) {
+        return perm == null ? instance() : new FlickrApi(perm);
+    }
 
     /**
      * {@inheritDoc}
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/FlickrExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/FlickrExample.java
@@ -28,7 +28,7 @@ public static void main(String... args) throws IOException, InterruptedException
         final OAuth10aService service = new ServiceBuilder()
                 .apiKey(apiKey)
                 .apiSecret(apiSecret)
-                .build(new FlickrApi(FlickrApi.FlickrPerm.DELETE));
+                .build(FlickrApi.instance(FlickrApi.FlickrPerm.DELETE));
         final Scanner in = new Scanner(System.in);
 
         System.out.println("=== Flickr's OAuth Workflow ===");

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ protected FlickrApi() {`
`25`	`25`	`permString = null;`
`26`	`26`	`}`
`27`	`27`
`28`		`- public FlickrApi(FlickrPerm perm) {`
	`28`	`+ protected FlickrApi(FlickrPerm perm) {`
`29`	`29`	`permString = perm.name().toLowerCase();`
`30`	`30`	`}`
`31`	`31`
`@@ -37,6 +37,9 @@ public static FlickrApi instance() {`
`37`	`37`	`return InstanceHolder.INSTANCE;`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ public static FlickrApi instance(FlickrPerm perm) {`
	`41`	`+ return perm == null ? instance() : new FlickrApi(perm);`
	`42`	`+ }`
`40`	`43`
`41`	`44`	`/**`
`42`	`45`	`* {@inheritDoc}`