Merge pull request #61 from TAMULib/sprint5-staging

Sprint5 staging

Author: tamu-sad-iii

pom.xml

@@ -62,6 +62,11 @@
       <artifactId>postgresql</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-actuator</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
@@ -101,7 +106,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.7</version>
         <configuration>
           <quiet>true</quiet>
           <instrumentation>
@@ -120,7 +124,6 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.7.8</version>
         <executions>
           <execution>
             <id>prepare-agent</id>
@@ -133,7 +136,6 @@
       <plugin>
         <groupId>org.eluder.coveralls</groupId>
         <artifactId>coveralls-maven-plugin</artifactId>
-        <version>4.3.0</version>
         <configuration>
           <repoToken></repoToken>
         </configuration>

src/main/java/edu/tamu/app/config/AppH2ConsoleConfig.java

@@ -0,0 +1,21 @@
+package edu.tamu.app.config;
+
+import org.h2.server.web.WebServlet;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+@Configuration
+@Profile("!production")
+public class AppH2ConsoleConfig {
+
+    @Bean
+    public ServletRegistrationBean h2servletRegistration() {
+        ServletRegistrationBean registrationBean = new ServletRegistrationBean(new WebServlet());
+        registrationBean.addUrlMappings("/admin/h2console/*");
+        registrationBean.addInitParameter("-webAllowOthers", "true");
+        return registrationBean;
+    }
+
+}

src/main/java/edu/tamu/app/config/AppWebMvcConfig.java

@@ -2,12 +2,10 @@
 
 import java.util.List;
 
-import org.h2.server.web.WebServlet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.boot.web.client.RestTemplateBuilder;
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
@@ -51,14 +49,6 @@ public ResourceUrlEncodingFilter resourceUrlEncodingFilter() {
         return new ResourceUrlEncodingFilter();
     }
 
-    @Bean
-    public ServletRegistrationBean h2servletRegistration() {
-        ServletRegistrationBean registrationBean = new ServletRegistrationBean(new WebServlet());
-        registrationBean.addUrlMappings("/admin/h2console/*");
-        registrationBean.addInitParameter("-webAllowOthers", "true");
-        return registrationBean;
-    }
-
     @Bean
     public ConfigurableMimeFileTypeMap configurableMimeFileTypeMap() {
         return new ConfigurableMimeFileTypeMap();

src/main/resources/application.properties

@@ -6,6 +6,7 @@ security.basic.enabled: false
 
 spring.template.cache: false
 
+spring.profiles.active: production
 
 spring.datasource.username: spring
 spring.datasource.password: spring

src/test/java/edu/tamu/app/service/ProjectServiceTest.java

@@ -13,7 +13,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import com.fasterxml.jackson.core.JsonParseException;
@@ -86,7 +85,8 @@ 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++) {

src/test/resources/application.properties

@@ -6,8 +6,7 @@ security.basic.enabled: false
 
 spring.template.cache: false
 
-spring.profiles: test
-spring.profiles.active:test
+spring.profiles.active: test
 
 spring.datasource.username: spring
 spring.datasource.password: spring