Merge branch 'sql' into xray

Author: mwunderl

src/main/java/scorekeep/GameHistoryController.java

@@ -5,7 +5,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import scorekeep.dao.gamehistory.GameHistory;
-import scorekeep.dao.gamehistory.GameHistory;
 
 import java.io.IOException;
 import java.util.List;

src/main/java/scorekeep/RdsWebConfig.java

@@ -1,14 +1,11 @@
 package scorekeep;
 
-
 import java.net.URL;
 
 import javax.annotation.PostConstruct;
 import javax.servlet.Filter;
 import javax.sql.DataSource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
 import org.hibernate.boot.registry.StandardServiceRegistry;
@@ -27,6 +24,9 @@
 
 import scorekeep.dao.gamehistory.GameHistory;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.amazonaws.xray.AWSXRay;
 import com.amazonaws.xray.AWSXRayRecorderBuilder;
 import com.amazonaws.xray.javax.servlet.AWSXRayServletFilter;
@@ -38,7 +38,7 @@
 @EnableAutoConfiguration
 @Profile("pgsql")
 public class RdsWebConfig {
-    private static final Log logger = LogFactory.getLog(WebConfig.class);
+    private static final Logger logger = LoggerFactory.getLogger(WebConfig.class);
 
     @Bean
     public Filter TracingFilter() {

src/main/java/scorekeep/WebConfig.java

@@ -1,13 +1,5 @@
 package scorekeep;
 
-import com.amazonaws.xray.AWSXRay;
-import com.amazonaws.xray.AWSXRayRecorderBuilder;
-import com.amazonaws.xray.javax.servlet.AWSXRayServletFilter;
-import com.amazonaws.xray.plugins.EC2Plugin;
-import com.amazonaws.xray.plugins.ElasticBeanstalkPlugin;
-import com.amazonaws.xray.strategy.sampling.LocalizedSamplingStrategy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
@@ -23,6 +15,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.amazonaws.xray.AWSXRay;
+import com.amazonaws.xray.AWSXRayRecorderBuilder;
+import com.amazonaws.xray.javax.servlet.AWSXRayServletFilter;
+import com.amazonaws.xray.plugins.EC2Plugin;
+import com.amazonaws.xray.plugins.ElasticBeanstalkPlugin;
+import com.amazonaws.xray.strategy.sampling.LocalizedSamplingStrategy;
+
 @Configuration
 @EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class, HibernateJpaAutoConfiguration.class})
 @Profile("nodb")