Merge pull request #10 from JavaIsJavaScript/revert-9-master

Revert " update dependencies & refactor"

Author: JavaIsJavaScript

pom.xml

@@ -30,14 +30,14 @@
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <jooq.version>3.10.6</jooq.version>
-        <cxf.version>3.2.4</cxf.version>
-        <spring.version>5.0.4.RELEASE</spring.version>
-        <spring.security.version>5.0.3.RELEASE</spring.security.version>
+        <jooq.version>3.10.1</jooq.version>
+        <cxf.version>3.2.0</cxf.version>
+        <spring.version>5.0.0.RELEASE</spring.version>
+        <spring.security.version>4.2.3.RELEASE</spring.security.version>
         <mysql.jdbc.version>8.0.8-dmr</mysql.jdbc.version>
-        <jetty.version>9.4.9.v20180320</jetty.version>
-        <lombok.version>1.16.20</lombok.version>
-        <jackson.version>2.9.5</jackson.version>
+        <jetty.version>9.4.7.v20170914</jetty.version>
+        <lombok.version>1.16.18</lombok.version>
+        <jackson.version>2.9.2</jackson.version>
 
         <!-- In Mysql: schema == database (http://dev.mysql.com/doc/refman/5.6/en/glossary.html#glos_schema) -->
         <jdbcUrl>jdbc:mysql://${db.ip}:${db.port}/${db.schema}?useSSL=true&amp;serverTimezone=UTC</jdbcUrl>
@@ -245,7 +245,7 @@
                             <extraarg>-xjc-Xfluent-api</extraarg>
                             <extraarg>-xjc-Xinheritance</extraarg>
                             <extraarg>-xjc-Xannotate</extraarg>
-                            <!--<extraarg>-verbose</extraarg>-->
+                            <extraarg>-verbose</extraarg>
                             <extraarg>-exsh</extraarg>
                             <extraarg>true</extraarg>
                         </extraargs>
@@ -417,7 +417,7 @@
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-bom</artifactId>
-                <version>2.11.0</version>
+                <version>2.9.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -429,7 +429,7 @@
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>javax.mail</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.0</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -443,9 +443,9 @@
             <version>2.9.9</version>
         </dependency>
         <dependency>
-            <groupId>org.hibernate.validator</groupId>
+            <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>6.0.9.Final</version>
+            <version>6.0.3.Final</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -533,7 +533,7 @@
         <dependency>
             <groupId>com.lmax</groupId>
             <artifactId>disruptor</artifactId>
-            <version>3.4.1</version>
+            <version>3.3.7</version>
         </dependency>
 
         <!-- CXF -->
@@ -572,11 +572,6 @@
             <artifactId>cxf-rt-transports-http-hc</artifactId>
             <version>${cxf.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-features-logging</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
 
         <!-- Jetty related dependencies -->
         <dependency>
@@ -635,7 +630,7 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>2.7.8</version>
+            <version>2.7.2</version>
         </dependency>
         <dependency>
             <groupId>org.jooq</groupId>

src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java

@@ -1,6 +1,5 @@
 package de.rwth.idsg.steve.config;
 
-import de.rwth.idsg.steve.ocpp.soap.LoggingFeatureProxy;
 import de.rwth.idsg.steve.ocpp.soap.MediatorInInterceptor;
 import de.rwth.idsg.steve.ocpp.soap.MessageIdInterceptor;
 import de.rwth.idsg.steve.ocpp.ws.custom.AlwaysLastStrategy;
@@ -10,7 +9,7 @@
 import org.apache.cxf.bus.spring.SpringBus;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.logging.Slf4jLogger;
-import org.apache.cxf.feature.Feature;
+import org.apache.cxf.feature.LoggingFeature;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
 import org.apache.cxf.message.Message;
@@ -21,8 +20,6 @@
 import org.springframework.context.annotation.Configuration;
 
 import javax.annotation.PostConstruct;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
 import static de.rwth.idsg.steve.SteveConfiguration.CONFIG;
@@ -56,18 +53,24 @@ public void init() {
         List<Interceptor<? extends Message>> interceptors = asList(new MessageIdInterceptor(), fromAddressInterceptor);
 
         // Just a dummy service to route incoming messages to the appropriate service version
-        createOcppService(ocpp12Server, CONFIG.getRouterEndpointPath(), route, Collections.emptyList());
+        createOcppService(ocpp12Server, CONFIG.getRouterEndpointPath(), route);
 
-        Collection<Feature> logging = Collections.singletonList(LoggingFeatureProxy.INSTANCE.get());
-
-        createOcppService(ocpp12Server, "/CentralSystemServiceOCPP12", interceptors, logging);
-        createOcppService(ocpp15Server, "/CentralSystemServiceOCPP15", interceptors, logging);
-        createOcppService(ocpp16Server, "/CentralSystemServiceOCPP16", interceptors, logging);
+        createOcppService(ocpp12Server, "/CentralSystemServiceOCPP12", interceptors);
+        createOcppService(ocpp15Server, "/CentralSystemServiceOCPP15", interceptors);
+        createOcppService(ocpp16Server, "/CentralSystemServiceOCPP16", interceptors);
     }
 
+    /**
+     * Help by: http://stackoverflow.com/a/31988136
+     *
+     * logFeature.initialize(springBus) is not needed, because during the init of bus it will call f.initialize(this)
+     * in {@link org.apache.cxf.bus.extension.ExtensionManagerBus#initializeFeatures()} anyway
+     */
     @Bean(name = Bus.DEFAULT_BUS_ID, destroyMethod = "shutdown")
     public SpringBus springBus() {
-        return new SpringBus();
+        SpringBus bus = new SpringBus();
+        bus.getFeatures().add(new LoggingFeature()); // Log incoming/outgoing messages
+        return bus;
     }
 
     @Bean
@@ -83,13 +86,11 @@ public WsSessionSelectStrategy sessionSelectStrategy() {
     }
 
     private void createOcppService(Object serviceBean, String address,
-                                   List<Interceptor<? extends Message>> interceptors,
-                                   Collection<? extends Feature> features) {
+                                   List<Interceptor<? extends Message>> interceptors) {
         JaxWsServerFactoryBean f = new JaxWsServerFactoryBean();
         f.setBus(springBus());
         f.setServiceBean(serviceBean);
         f.setAddress(address);
-        f.getFeatures().addAll(features);
         f.getInInterceptors().addAll(interceptors);
         f.create();
     }

src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java

@@ -13,8 +13,12 @@
 import org.eclipse.jetty.websocket.api.WebSocketBehavior;
 import org.eclipse.jetty.websocket.api.WebSocketPolicy;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.socket.config.annotation.EnableWebSocket;
+import org.springframework.web.socket.config.annotation.ServletWebSocketHandlerRegistry;
 import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
 import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
 import org.springframework.web.socket.server.support.DefaultHandshakeHandler;
@@ -72,4 +76,27 @@ public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
     private List<AbstractWebSocketEndpoint> getEndpoints() {
         return Lists.newArrayList(ocpp16WebSocketEndpoint, ocpp15WebSocketEndpoint, ocpp12WebSocketEndpoint);
     }
+
+    // -------------------------------------------------------------------------
+    // We don't need no SockJS fallback. But, nevertheless, Spring initializes
+    // a scheduler for it, to be used in the implementation
+    // AbstractWebSocketHandlerRegistration.withSockJS(). We don't call
+    // WebSocketHandlerRegistry.withSockJS() above to add SockJS support,
+    // so the scheduler is useless.
+    //
+    // Hereby, we override the default beans provided by
+    // org.springframework.web.socket.config.annotation.WebSocketConfigurationSupport
+    // -------------------------------------------------------------------------
+
+    @Bean
+    public HandlerMapping webSocketHandlerMapping() {
+        ServletWebSocketHandlerRegistry registry = new ServletWebSocketHandlerRegistry();
+        registerWebSocketHandlers(registry);
+        return registry.getHandlerMapping();
+    }
+
+    @Bean
+    public ThreadPoolTaskScheduler defaultSockJsTaskScheduler() {
+        return null;
+    }
 }

src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java

@@ -25,7 +25,6 @@ private ClientProvider() { }
     public static JaxWsProxyFactoryBean getBean(String endpointAddress) {
         JaxWsProxyFactoryBean f = new JaxWsProxyFactoryBean();
         f.setBindingId(SOAPBinding.SOAP12HTTP_BINDING);
-        f.getFeatures().add(LoggingFeatureProxy.INSTANCE.get());
         f.getFeatures().add(new WSAddressingFeature());
         f.setAddress(endpointAddress);
         return f;

src/main/java/de/rwth/idsg/steve/ocpp/soap/LoggingFeatureProxy.java

@@ -3,8 +3,8 @@
 import de.rwth.idsg.steve.web.validation.ChargeBoxId;
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.validator.constraints.NotEmpty;
 
-import javax.validation.constraints.NotEmpty;
 import java.util.List;
 
 /**

src/main/java/de/rwth/idsg/steve/web/dto/ChargePointBatchInsertForm.java

@@ -3,9 +3,9 @@
 import de.rwth.idsg.steve.web.validation.ChargeBoxId;
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.validator.constraints.NotBlank;
 import org.hibernate.validator.constraints.Range;
 
-import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 
 /**

src/main/java/de/rwth/idsg/steve/web/dto/ChargePointForm.java

@@ -3,8 +3,8 @@
 import de.rwth.idsg.steve.web.validation.IdTag;
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.validator.constraints.NotEmpty;
 
-import javax.validation.constraints.NotEmpty;
 import java.util.List;
 
 /**

src/main/java/de/rwth/idsg/steve/web/dto/OcppTagBatchInsertForm.java

@@ -3,10 +3,10 @@
 import de.rwth.idsg.steve.web.validation.IdTag;
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.validator.constraints.NotEmpty;
 import org.joda.time.LocalDateTime;
 
 import javax.validation.constraints.Future;
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
 /**

src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java

@@ -7,8 +7,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.hibernate.validator.constraints.Email;
 
-import javax.validation.constraints.Email;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import java.util.List;

src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java

@@ -2,9 +2,9 @@
 
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.validator.constraints.Email;
 import org.joda.time.LocalDate;
 
-import javax.validation.constraints.Email;
 import javax.validation.constraints.NotNull;
 
 /**

src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java

@@ -5,9 +5,9 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
+import org.hibernate.validator.constraints.NotBlank;
 
 import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 
@@ -27,7 +27,7 @@ public class ChangeConfigurationParams extends MultipleChargePointSelect {
     private ConfigurationKeyType keyType = ConfigurationKeyType.PREDEFINED;
 
     @NotBlank(message = "Value is required")
-    @Pattern(regexp = "\\S+", message = "Value cannot contain any whitespace")
+    @Pattern(regexp = "\\S+", message = "Value cannot contain any whitespace")  
     private String value;
 
     @AssertTrue(message = "Custom Configuration Key cannot be left blank")
@@ -71,7 +71,7 @@ private enum ConfigurationKeyType {
         @Getter private final String value;
 
         public static ConfigurationKeyType fromValue(String v) {
-            for (ConfigurationKeyType c : ConfigurationKeyType.values()) {
+            for (ConfigurationKeyType c: ConfigurationKeyType.values()) {
                 if (c.value.equals(v)) {
                     return c;
                 }

src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java

@@ -2,11 +2,11 @@
 
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.validator.constraints.NotBlank;
 import org.joda.time.LocalDateTime;
 
 import javax.validation.constraints.AssertTrue;
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Past;
 import javax.validation.constraints.Pattern;
 

src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetDiagnosticsParams.java

@@ -3,9 +3,9 @@
 import de.rwth.idsg.steve.web.validation.IdTag;
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.validator.constraints.NotBlank;
 
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
 
 /**
  * @author Sevket Goekay <goekay@dbis.rwth-aachen.de>

src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStartTransactionParams.java

@@ -3,11 +3,11 @@
 import de.rwth.idsg.steve.web.validation.IdTag;
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.validator.constraints.NotBlank;
 import org.joda.time.LocalDateTime;
 
 import javax.validation.constraints.Future;
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**