Merge pull request #1219 from stormpath/issue/1174

Issue/1174

Author: dogeared

examples/spring-boot-default/src/main/java/com/stormpath/spring/boot/examples/HelloController.java

@@ -32,6 +32,9 @@ public class HelloController {
     @Autowired
     private HelloService helloService;
 
+    @Autowired
+    AccountResolver accountResolver;
+
     @RequestMapping("/")
     String home(HttpServletRequest request) {
         return "home";
@@ -40,7 +43,7 @@ String home(HttpServletRequest request) {
     @RequestMapping("/restricted")
     String restricted(HttpServletRequest request, Model model) {
         String msg = helloService.sayHello(
-            AccountResolver.INSTANCE.getAccount(request)
+            accountResolver.getAccount(request)
         );
         model.addAttribute("msg", msg);
         return "restricted";

examples/spring-boot-webmvc-angular/src/main/java/com/stormpath/spring/boot/examples/ProfileController.java

@@ -17,6 +17,7 @@
 
 import com.stormpath.sdk.account.Account;
 import com.stormpath.sdk.servlet.account.AccountResolver;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,10 +31,13 @@
 @Controller
 public class ProfileController {
 
+    @Autowired
+    AccountResolver accountResolver;
+
     @RequestMapping(path = "/profile", method = POST)
     public void profile(HttpServletRequest req, HttpServletResponse res, @RequestBody Map<String, String> params) {
 
-        Account account = AccountResolver.INSTANCE.getAccount(req);
+        Account account = accountResolver.getAccount(req);
 
         if (account != null) {
             account.setGivenName(params.get("givenName"));

examples/spring-boot-webmvc/src/main/java/com/stormpath/spring/boot/examples/HelloController.java

@@ -17,6 +17,7 @@
 
 import com.stormpath.sdk.account.Account;
 import com.stormpath.sdk.servlet.account.AccountResolver;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,12 +27,15 @@
 @Controller
 public class HelloController {
 
+    @Autowired
+    AccountResolver accountResolver;
+
     @RequestMapping("/")
     public String home(HttpServletRequest request, Model model) {
 
         String name = "World";
 
-        Account account = AccountResolver.INSTANCE.getAccount(request);
+        Account account = accountResolver.getAccount(request);
         if (account != null) {
             name = account.getGivenName();
             model.addAttribute(account);

examples/spring-security-spring-boot-webmvc/src/main/java/com/stormpath/spring/boot/examples/HelloController.java

@@ -33,12 +33,15 @@ public class HelloController {
     @Autowired
     private HelloService helloService;
 
+    @Autowired
+    AccountResolver accountResolver;
+
     @RequestMapping("/")
     public String home(HttpServletRequest request, Model model) {
 
         String name = "World";
 
-        Account account = AccountResolver.INSTANCE.getAccount(request);
+        Account account = accountResolver.getAccount(request);
         if (account != null) {
             name = account.getGivenName();
             model.addAttribute(account);
@@ -51,7 +54,7 @@ public String home(HttpServletRequest request, Model model) {
 
     @RequestMapping("/restricted")
     String restricted(HttpServletRequest request, Model model) {
-        Account account = AccountResolver.INSTANCE.getAccount(request);
+        Account account = accountResolver.getAccount(request);
         String msg = helloService.sayHello(account);
         model.addAttribute("msg", msg);
 

examples/spring-security-webmvc/src/main/java/com/stormpath/spring/examples/HelloController.java

@@ -33,12 +33,15 @@ public class HelloController {
     @Autowired
     private HelloService helloService;
 
+    @Autowired
+    AccountResolver accountResolver;
+
     @RequestMapping("/")
     ModelAndView home(HttpServletRequest request) {
 
         String name = "World";
 
-        Account account = AccountResolver.INSTANCE.getAccount(request);
+        Account account = accountResolver.getAccount(request);
         if (account != null) {
             name = account.getGivenName();
         }
@@ -50,7 +53,7 @@ ModelAndView home(HttpServletRequest request) {
 
     @RequestMapping("/restricted")
     ModelAndView restricted(HttpServletRequest request) {
-        String helloMessage = helloService.sayHello(AccountResolver.INSTANCE.getAccount(request));
+        String helloMessage = helloService.sayHello(accountResolver.getAccount(request));
         ModelAndView mav = new ModelAndView("restricted");
         mav.addObject("message", helloMessage);
         return mav;

examples/spring-webmvc/src/main/java/com/stormpath/spring/examples/HelloController.java

@@ -17,6 +17,7 @@
 
 import com.stormpath.sdk.account.Account;
 import com.stormpath.sdk.servlet.account.AccountResolver;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
@@ -26,12 +27,15 @@
 @RestController
 public class HelloController {
 
+    @Autowired
+    AccountResolver accountResolver;
+
     @RequestMapping("/")
     ModelAndView home(HttpServletRequest request) {
 
         String name = "World";
 
-        Account account = AccountResolver.INSTANCE.getAccount(request);
+        Account account = accountResolver.getAccount(request);
         if (account != null) {
             name = account.getGivenName();
         }

tutorials/pom.xml

@@ -30,6 +30,7 @@
 
     <modules>
         <module>spring-boot</module>
+        <module>spring</module>
     </modules>
 
     <build>

tutorials/spring-boot/00-the-basics/src/main/java/com/stormpath/tutorial/controller/HelloController.java

@@ -1,7 +1,22 @@
+/*
+ * Copyright 2017 Stormpath, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.stormpath.tutorial.controller;
 
 import com.stormpath.sdk.application.Application;
-import com.stormpath.sdk.servlet.application.ApplicationResolver;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -10,9 +25,11 @@
 @RestController
 public class HelloController {
 
+    @Autowired
+    Application app;
+
     @RequestMapping("/")
     public String hello(HttpServletRequest req) {
-        Application app = ApplicationResolver.INSTANCE.getApplication(req);
         return "Hello, " + app.getName();
     }
 }

tutorials/spring-boot/01-some-access-controls/src/main/java/com/stormpath/tutorial/controller/HelloController.java

@@ -16,8 +16,10 @@
 package com.stormpath.tutorial.controller;
 
 import com.stormpath.sdk.servlet.account.AccountResolver;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import javax.servlet.http.HttpServletRequest;
@@ -28,6 +30,14 @@
 @Controller
 public class HelloController {
 
+    private AccountResolver accountResolver;
+
+    @Autowired
+    public HelloController(AccountResolver accountResolver) {
+        Assert.notNull(accountResolver);
+        this.accountResolver = accountResolver;
+    }
+
     @RequestMapping("/")
     String home(HttpServletRequest req, Model model) {
         model.addAttribute("status", req.getParameter("status"));
@@ -36,7 +46,7 @@ String home(HttpServletRequest req, Model model) {
 
     @RequestMapping("/restricted")
     String restricted(HttpServletRequest req) {
-        if (AccountResolver.INSTANCE.getAccount(req) != null) {
+        if (accountResolver.getAccount(req) != null) {
             return "restricted";
         }
 

tutorials/spring-boot/02-spring-security-ftw/src/main/java/com/stormpath/tutorial/controller/HelloController.java

@@ -31,11 +31,14 @@
 @Controller
 public class HelloController {
 
+    private AccountResolver accountResolver;
     private HelloService helloService;
 
     @Autowired
-    public HelloController(HelloService helloService) {
+    public HelloController(AccountResolver accountResolver, HelloService helloService) {
+        Assert.notNull(accountResolver);
         Assert.notNull(helloService);
+        this.accountResolver = accountResolver;
         this.helloService = helloService;
     }
 
@@ -48,7 +51,7 @@ String home(HttpServletRequest req, Model model) {
     @RequestMapping("/restricted")
     String restricted(HttpServletRequest req, Model model) {
         String msg = helloService.sayHello(
-            AccountResolver.INSTANCE.getAccount(req)
+            accountResolver.getAccount(req)
         );
         model.addAttribute("msg", msg);
         return "restricted";