Merge branch 'sprint4-staging' of https://github.com/TAMULib/LibraryServiceStatusSystemService into sprint4-staging-refinement

Author: rladdusaw

.gitignore

@@ -5,5 +5,6 @@ target/
 .factorypath
 .project
 .settings
+.springBeans
 bin/
 logs/

…ain/java/edu/tamu/app/WebServerInit.java …java/edu/tamu/app/StatusApplication.javasrc/main/java/edu/tamu/app/WebServerInit.java renamed to src/main/java/edu/tamu/app/StatusApplication.java src/main/java/edu/tamu/app/WebServerInit.java renamed to 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);
     }
 
 }

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;
     }

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;

src/test/java/edu/tamu/app/model/FeatureProposalTest.java

@@ -3,6 +3,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 
+import java.util.ArrayList;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -15,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;
@@ -27,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";
@@ -112,8 +114,13 @@ public void testVote() throws UserNotFoundException {
     public void testVoteDuplicate() throws UserNotFoundException {
         FeatureProposal newFeatureProposal = featureProposalRepo.create(new FeatureProposal(TEST_ALTERNATIVE_FEATURE_PROPOSAL_TITLE, TEST_ALTERNATIVE_FEATURE_PROPOSAL_DESCRIPTION, testUser, service2), TEST_CREDENTIALS);
         User testVoter = userRepo.create(TEST_VOTER_CREDENTIALS.getUin(), TEST_VOTER_CREDENTIALS.getEmail(), TEST_VOTER_CREDENTIALS.getFirstName(), TEST_VOTER_CREDENTIALS.getLastName(), Role.valueOf(TEST_VOTER_CREDENTIALS.getRole()));
-        newFeatureProposal.addVoter(testVoter);
-        newFeatureProposal.addVoter(testVoter);
+        newFeatureProposal.setVoters(new ArrayList<User>() {
+            private static final long serialVersionUID = -7900927790649066585L;
+            {
+                add(testVoter);
+                add(testVoter);
+            }
+        });
         newFeatureProposal = featureProposalRepo.save(newFeatureProposal);
     }
 

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";

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";

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";

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";

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();