Merge pull request #50 from TAMULib/sprint4-cleanup

rladdusaw · web-flow · commit 97a0e7e3a1ac · 2018-03-30T11:11:19.000-05:00
formatting and cleanup
diff --git a/.gitignore b/.gitignore
@@ -5,5 +5,6 @@ target/
 .factorypath
 .project
 .settings
+.springBeans
 bin/
 logs/
diff --git a/src/main/java/edu/tamu/app/StatusApplication.java b/src/main/java/edu/tamu/app/StatusApplication.java
@@ -14,7 +14,7 @@
 @EnableScheduling
 @SpringBootApplication
 @ComponentScan(basePackages = { "edu.tamu.*" })
-public class WebServerInit extends SpringBootServletInitializer {
+public class StatusApplication extends SpringBootServletInitializer {
 
     /**
      * Entry point to the application from within servlet.
@@ -24,7 +24,7 @@ public class WebServerInit extends SpringBootServletInitializer {
      *
      */
     public static void main(String[] args) {
-        SpringApplication.run(WebServerInit.class, args);
+        SpringApplication.run(StatusApplication.class, args);
     }
 
     /**
@@ -38,7 +38,7 @@ public static void main(String[] args) {
      */
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(WebServerInit.class);
+        return application.sources(StatusApplication.class);
     }
 
 }
diff --git a/src/main/java/edu/tamu/app/model/repo/impl/FeatureProposalRepoImpl.java b/src/main/java/edu/tamu/app/model/repo/impl/FeatureProposalRepoImpl.java
@@ -49,7 +49,7 @@ public FeatureProposal create(Idea idea) {
         idea.setElevated(true);
         idea = ideaRepo.save(idea);
         simpMessagingTemplate.convertAndSend("/channel/ideas/update", new ApiResponse(SUCCESS, idea));
-        FeatureProposal featureProposal = featureProposalRepo.save(new FeatureProposal(idea));        
+        FeatureProposal featureProposal = featureProposalRepo.save(new FeatureProposal(idea));
         simpMessagingTemplate.convertAndSend("/channel/feature-proposals/create", new ApiResponse(SUCCESS, featureProposal));
         return featureProposal;
     }
diff --git a/src/main/java/edu/tamu/app/model/request/FilteredPageRequest.java b/src/main/java/edu/tamu/app/model/request/FilteredPageRequest.java
@@ -1,4 +1,4 @@
- package edu.tamu.app.model.request;
+package edu.tamu.app.model.request;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/test/java/edu/tamu/app/model/FeatureProposalTest.java b/src/test/java/edu/tamu/app/model/FeatureProposalTest.java
@@ -17,7 +17,7 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import edu.tamu.app.WebServerInit;
+import edu.tamu.app.StatusApplication;
 import edu.tamu.app.enums.Role;
 import edu.tamu.app.enums.Status;
 import edu.tamu.app.exception.UserNotFoundException;
@@ -29,7 +29,7 @@
 
 @ActiveProfiles("test")
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = { WebServerInit.class }, webEnvironment = WebEnvironment.DEFINED_PORT)
+@SpringBootTest(classes = { StatusApplication.class }, webEnvironment = WebEnvironment.DEFINED_PORT)
 public class FeatureProposalTest {
 
     private static final String TEST_FEATURE_PROPOSAL_TITLE = "Feature Proposal Title";
diff --git a/src/test/java/edu/tamu/app/model/IdeaTest.java b/src/test/java/edu/tamu/app/model/IdeaTest.java
@@ -14,7 +14,7 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import edu.tamu.app.WebServerInit;
+import edu.tamu.app.StatusApplication;
 import edu.tamu.app.enums.Role;
 import edu.tamu.app.enums.Status;
 import edu.tamu.app.exception.UserNotFoundException;
@@ -25,7 +25,7 @@
 
 @ActiveProfiles("test")
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = { WebServerInit.class }, webEnvironment = WebEnvironment.DEFINED_PORT)
+@SpringBootTest(classes = { StatusApplication.class }, webEnvironment = WebEnvironment.DEFINED_PORT)
 public class IdeaTest {
 
     private static final String TEST_IDEA_TITLE = "Idea Title";
diff --git a/src/test/java/edu/tamu/app/model/NoteTest.java b/src/test/java/edu/tamu/app/model/NoteTest.java
@@ -14,7 +14,7 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import edu.tamu.app.WebServerInit;
+import edu.tamu.app.StatusApplication;
 import edu.tamu.app.enums.NoteType;
 import edu.tamu.app.enums.Role;
 import edu.tamu.app.enums.Status;
@@ -26,7 +26,7 @@
 
 @ActiveProfiles("test")
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = { WebServerInit.class }, webEnvironment = WebEnvironment.DEFINED_PORT)
+@SpringBootTest(classes = { StatusApplication.class }, webEnvironment = WebEnvironment.DEFINED_PORT)
 public class NoteTest {
 
     private static final String TEST_NOTE_TITLE = "Note Title";
diff --git a/src/test/java/edu/tamu/app/model/NotificationTest.java b/src/test/java/edu/tamu/app/model/NotificationTest.java
@@ -15,13 +15,13 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import edu.tamu.app.WebServerInit;
+import edu.tamu.app.StatusApplication;
 import edu.tamu.app.enums.NotificationLocation;
 import edu.tamu.app.model.repo.NotificationRepo;
 
 @ActiveProfiles("test")
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = { WebServerInit.class }, webEnvironment = WebEnvironment.DEFINED_PORT)
+@SpringBootTest(classes = { StatusApplication.class }, webEnvironment = WebEnvironment.DEFINED_PORT)
 public class NotificationTest {
 
     private static final String TEST_NOTIFICATION_NAME = "Test Notification Name";
diff --git a/src/test/java/edu/tamu/app/model/ServiceTest.java b/src/test/java/edu/tamu/app/model/ServiceTest.java
@@ -15,7 +15,7 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import edu.tamu.app.WebServerInit;
+import edu.tamu.app.StatusApplication;
 import edu.tamu.app.enums.Status;
 import edu.tamu.app.model.repo.NoteRepo;
 import edu.tamu.app.model.repo.ServiceRepo;
@@ -24,7 +24,7 @@
 
 @ActiveProfiles("test")
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = { WebServerInit.class }, webEnvironment = WebEnvironment.DEFINED_PORT)
+@SpringBootTest(classes = { StatusApplication.class }, webEnvironment = WebEnvironment.DEFINED_PORT)
 public class ServiceTest {
 
     private static final String TEST_SERVICE_NAME = "Test Service Name";
diff --git a/src/test/java/edu/tamu/app/model/UserTest.java b/src/test/java/edu/tamu/app/model/UserTest.java
@@ -14,14 +14,14 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import edu.tamu.app.WebServerInit;
+import edu.tamu.app.StatusApplication;
 import edu.tamu.app.enums.Role;
 import edu.tamu.app.model.repo.UserRepo;
 import edu.tamu.weaver.auth.model.Credentials;
 
 @ActiveProfiles("test")
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = { WebServerInit.class }, webEnvironment = WebEnvironment.DEFINED_PORT)
+@SpringBootTest(classes = { StatusApplication.class }, webEnvironment = WebEnvironment.DEFINED_PORT)
 public class UserTest {
 
     private static final Credentials TEST_CREDENTIALS = new Credentials();
diff --git a/src/test/java/edu/tamu/app/model/impl/ShibTest.java b/src/test/java/edu/tamu/app/model/impl/ShibTest.java
@@ -14,12 +14,12 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import edu.tamu.app.WebServerInit;
+import edu.tamu.app.StatusApplication;
 import edu.tamu.weaver.auth.model.Credentials;
 
 @ActiveProfiles("test")
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = { WebServerInit.class }, webEnvironment = WebEnvironment.DEFINED_PORT)
+@SpringBootTest(classes = { StatusApplication.class }, webEnvironment = WebEnvironment.DEFINED_PORT)
 public class ShibTest {
 
     private Map<String, Object> aggieJackToken;
@@ -28,20 +28,17 @@ public class ShibTest {
 
     @Before
     public void setup() {
-
         aggieJackToken = new HashMap<String, Object>();
         aggieJackToken.put("lastName", "Daniels");
         aggieJackToken.put("firstName", "Jack");
         aggieJackToken.put("netid", "aggiejack");
         aggieJackToken.put("uin", "123456789");
         aggieJackToken.put("exp", String.valueOf(timestamp));
         aggieJackToken.put("email", "aggiejack@tamu.edu");
-
     }
 
     @Test
     public void testCreateShib() {
-
         Credentials shib = new Credentials(aggieJackToken);
 
         assertEquals("Last name did not match.", "Daniels", shib.getLastName());
@@ -50,7 +47,6 @@ public void testCreateShib() {
         assertEquals("UIN did not match.", "123456789", shib.getUin());
         assertEquals("Expiration did not match.", String.valueOf(timestamp), shib.getExp());
         assertEquals("Email did not match.", "aggiejack@tamu.edu", shib.getEmail());
-
     }
 
     private Map<String, String> createToken(String uin, String firstName, String lastName, String email, String netid, Long time) {
@@ -62,10 +58,11 @@ private Map<String, String> createToken(String uin, String firstName, String las
         newToken.put("lastName", lastName);
         newToken.put("email", email);
         newToken.put("netid", netid);
-        if (time != null)
+        if (time != null) {
             newToken.put("exp", String.valueOf(time));
-        else
+        } else {
             newToken.put("exp", String.valueOf(timestamp));
+        }
 
         return newToken;
     }
diff --git a/src/test/java/edu/tamu/app/service/ProjectServiceTest.java b/src/test/java/edu/tamu/app/service/ProjectServiceTest.java
@@ -21,7 +21,7 @@
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import edu.tamu.app.WebServerInit;
+import edu.tamu.app.StatusApplication;
 import edu.tamu.app.enums.Role;
 import edu.tamu.app.enums.Status;
 import edu.tamu.app.exception.UserNotFoundException;
@@ -42,7 +42,7 @@
 
 @ActiveProfiles("test")
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = { WebServerInit.class }, webEnvironment = WebEnvironment.DEFINED_PORT)
+@SpringBootTest(classes = { StatusApplication.class }, webEnvironment = WebEnvironment.DEFINED_PORT)
 public class ProjectServiceTest {
 
     private static final String TEST_SERVICE_NAME = "Test Service Name";
@@ -87,8 +87,7 @@ public class ProjectServiceTest {
     public void getAll() throws JsonParseException, JsonMappingException, MalformedURLException, IOException {
         ApiResponse response = projectService.getAll();
         assertEquals("Response was not a success!", ApiStatus.SUCCESS, response.getMeta().getStatus());
-        List<Project> projects = objectMapper.convertValue(response.getPayload().get("ArrayList<Project>"), new TypeReference<List<Project>>() {
-        });
+        List<Project> projects = objectMapper.convertValue(response.getPayload().get("ArrayList<Project>"), new TypeReference<List<Project>>() {});
         List<Project> mockProjects = mockReader.getAllProjects();
         assertEquals("Projects response size was not as expected!", mockProjects.size(), projects.size());
         for (int i = 0; i < projects.size(); i++) {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`@EnableScheduling`
`15`	`15`	`@SpringBootApplication`
`16`	`16`	`@ComponentScan(basePackages = { "edu.tamu.*" })`
`17`		`-public class WebServerInit extends SpringBootServletInitializer {`
	`17`	`+public class StatusApplication extends SpringBootServletInitializer {`
`18`	`18`
`19`	`19`	`/**`
`20`	`20`	`* Entry point to the application from within servlet.`
`@@ -24,7 +24,7 @@ public class WebServerInit extends SpringBootServletInitializer {`
`24`	`24`	`*`
`25`	`25`	`*/`
`26`	`26`	`public static void main(String[] args) {`
`27`		`- SpringApplication.run(WebServerInit.class, args);`
	`27`	`+ SpringApplication.run(StatusApplication.class, args);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`/**`
`@@ -38,7 +38,7 @@ public static void main(String[] args) {`
`38`	`38`	`*/`
`39`	`39`	`@Override`
`40`	`40`	`protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {`
`41`		`- return application.sources(WebServerInit.class);`
	`41`	`+ return application.sources(StatusApplication.class);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public FeatureProposal create(Idea idea) {`
`49`	`49`	`idea.setElevated(true);`
`50`	`50`	`idea = ideaRepo.save(idea);`
`51`	`51`	`simpMessagingTemplate.convertAndSend("/channel/ideas/update", new ApiResponse(SUCCESS, idea));`
`52`		`- FeatureProposal featureProposal = featureProposalRepo.save(new FeatureProposal(idea));`
	`52`	`+ FeatureProposal featureProposal = featureProposalRepo.save(new FeatureProposal(idea));`
`53`	`53`	`simpMessagingTemplate.convertAndSend("/channel/feature-proposals/create", new ApiResponse(SUCCESS, featureProposal));`
`54`	`54`	`return featureProposal;`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`- package edu.tamu.app.model.request;`
	`1`	`+package edu.tamu.app.model.request;`
`2`	`2`
`3`	`3`	`import java.util.ArrayList;`
`4`	`4`	`import java.util.HashMap;`