added some new constructors for simpler restTemplate injection

rocketbase-io · Jul 5, 2018 · b58f820 · b58f820
1 parent 1de3c68
commit b58f820
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/commons-auth-api/src/main/java/io/rocketbase/commons/resource/ForgotPasswordResource.java b/commons-auth-api/src/main/java/io/rocketbase/commons/resource/ForgotPasswordResource.java
@@ -5,16 +5,23 @@
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.Assert;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 
 public class ForgotPasswordResource implements BaseRestResource {
 
-    private String baseAuthApiUrl;
-    private RestTemplate restTemplate;
+    protected String baseAuthApiUrl;
+    protected RestTemplate restTemplate;
 
     public ForgotPasswordResource(String baseAuthApiUrl) {
+        this(baseAuthApiUrl, null);
+    }
+
+    public ForgotPasswordResource(String baseAuthApiUrl, RestTemplate restTemplate) {
+        Assert.hasText(baseAuthApiUrl, "baseAuthApiUrl is required");
         this.baseAuthApiUrl = baseAuthApiUrl;
+        this.restTemplate = restTemplate;
     }
 
     protected RestTemplate getRestTemplate() {

diff --git a/commons-auth-api/src/main/java/io/rocketbase/commons/resource/RegistrationResource.java b/commons-auth-api/src/main/java/io/rocketbase/commons/resource/RegistrationResource.java
@@ -6,16 +6,23 @@
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.Assert;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 
 public class RegistrationResource implements BaseRestResource {
 
-    private String baseAuthApiUrl;
-    private RestTemplate restTemplate;
+    protected String baseAuthApiUrl;
+    protected RestTemplate restTemplate;
 
     public RegistrationResource(String baseAuthApiUrl) {
+        this(baseAuthApiUrl, null);
+    }
+
+    public RegistrationResource(String baseAuthApiUrl, RestTemplate restTemplate) {
+        Assert.hasText(baseAuthApiUrl, "baseAuthApiUrl is required");
         this.baseAuthApiUrl = baseAuthApiUrl;
+        this.restTemplate = restTemplate;
     }
 
     protected RestTemplate getRestTemplate() {

diff --git a/commons-auth-api/src/main/java/io/rocketbase/commons/resource/ValidationResource.java b/commons-auth-api/src/main/java/io/rocketbase/commons/resource/ValidationResource.java
@@ -8,16 +8,23 @@
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.Assert;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 
 public class ValidationResource implements BaseRestResource {
 
-    private String baseAuthApiUrl;
-    private RestTemplate restTemplate;
+    protected String baseAuthApiUrl;
+    protected RestTemplate restTemplate;
 
     public ValidationResource(String baseAuthApiUrl) {
+        this(baseAuthApiUrl, null);
+    }
+
+    public ValidationResource(String baseAuthApiUrl, RestTemplate restTemplate) {
+        Assert.hasText(baseAuthApiUrl, "baseAuthApiUrl is required");
         this.baseAuthApiUrl = baseAuthApiUrl;
+        this.restTemplate = restTemplate;
     }
 
     protected RestTemplate getRestTemplate() {