Merge pull request #1 from stormpath/peer-review

Code formatting and bug fixes

Author: mraible

.gitignore

@@ -0,0 +1,38 @@
+# Created by .ignore support plugin (hsz.mobi)
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/
+
+## File-based project format:
+*.iml
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+### Maven template
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties

pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.4.0.RELEASE</version>
+        <version>1.4.1.RELEASE</version>
     </parent>
 
     <dependencies>
@@ -40,10 +40,10 @@
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
         </dependency>
-         <dependency>
+        <dependency>
             <groupId>com.stormpath.spring</groupId>
             <artifactId>stormpath-default-spring-boot-starter</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.2</version>
         </dependency>
     </dependencies>
 
@@ -58,5 +58,4 @@
             </plugin>
         </plugins>
     </build>
-    
-</project>
+</project>

src/main/java/tutorial/Application.java

@@ -6,7 +6,7 @@
 @SpringBootApplication
 public class Application {
 
-	public static void main(String[] args) {
-		SpringApplication.run(Application.class, args);
-	}
-}
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+}

src/main/java/tutorial/DatabaseLoader.java

@@ -1,24 +1,24 @@
 package tutorial;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
 
 @Component
 public class DatabaseLoader implements CommandLineRunner {
 
-	private final EmployeeRepository repository;
+    private final EmployeeRepository repository;
 
-	@Autowired
-	public DatabaseLoader(EmployeeRepository repository) {
-		this.repository = repository;
-	}
+    @Autowired
+    public DatabaseLoader(EmployeeRepository repository) {
+        this.repository = repository;
+    }
 
-	@Override
-	public void run(String... strings) throws Exception {
-		this.repository.save(new Employee("Joe Biden", 45, 5));
-		this.repository.save(new Employee("President Obama", 54, 8));
-		this.repository.save(new Employee("Crystal Mac", 34, 12));
-		this.repository.save(new Employee("James Henry", 33, 2));
-	}
-}
+    @Override
+    public void run(String... strings) throws Exception {
+        this.repository.save(new Employee("Joe Biden", 45, 5));
+        this.repository.save(new Employee("President Obama", 54, 8));
+        this.repository.save(new Employee("Crystal Mac", 34, 12));
+        this.repository.save(new Employee("James Henry", 33, 2));
+    }
+}

src/main/java/tutorial/Employee.java

@@ -1,8 +1,11 @@
 package tutorial;
 
-import javax.persistence.*;
 import lombok.Data;
 
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
 @Data
 @Entity
 public class Employee {
@@ -19,4 +22,4 @@ public Employee(String name, int age, int years) {
 		this.age = age;
 		this.years = years;
 	}
-}
+}

src/main/java/tutorial/EmployeeRepository.java

@@ -1,11 +1,12 @@
 package tutorial;
 
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.security.access.prepost.PreAuthorize;
 
 public interface EmployeeRepository extends CrudRepository<Employee, Long> {
 
-	@PreAuthorize("hasAuthority('ROLE_ADMIN')")
-  	@Override
-  	void delete(Long aLong);
+    @PreAuthorize("hasAuthority('ROLE_ADMIN')")
+    @Override
+    void delete(Long aLong);
 
-}
+}

src/main/java/tutorial/HomeController.java

@@ -7,8 +7,8 @@
 public class HomeController {
 
     @RequestMapping(value = "/")
-	public String index() {
-		return "index";
-	}
+    public String index() {
+        return "index";
+    }
 
-}
+}

src/main/java/tutorial/Security.java

@@ -7,10 +7,9 @@
 import static com.stormpath.spring.config.StormpathWebSecurityConfigurer.stormpath;
 
 @Configuration
-public class Security  extends WebSecurityConfigurerAdapter {
+public class Security extends WebSecurityConfigurerAdapter {
     @Override
     protected void configure(HttpSecurity http) throws Exception {
-        http
-            .apply(stormpath());
+        http.apply(stormpath());
     }
-}
+}

src/main/resources/application.properties

@@ -1,5 +1,5 @@
-spring.data.rest.base-path=/api
+spring.data.rest.basePath=/api
 
-stormpath.application.href = 
-stormpath.client.apiKey.id = 
-stormpath.client.apiKey.secret = 
+stormpath.application.href =
+stormpath.client.apiKey.id =
+stormpath.client.apiKey.secret =

src/main/resources/templates/index.html

@@ -20,12 +20,11 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.3/toastr.min.js"></script>
 
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.3/toastr.min.css"></link>
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"></link>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.3/toastr.min.css"/>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"/>
 
     <script type="text/babel" src="/public/app.js"></script>
 
-    
 </body>
 
 </html>