Features/modules

pom.xml

@@ -24,14 +24,15 @@
   <modules>
     <module>steve</module>
     <module>steve-api</module>
+    <module>steve-bom</module>
     <module>steve-core</module>
-    <module>steve-jooq</module>
-    <module>steve-ocpp</module>
-    <module>steve-ocpp-1-x</module>
-    <module>steve-ocpp-2-x</module>
-    <module>steve-ocpp-transport-soap</module>
-    <module>steve-ocpp-transport-websocket</module>
-    <module>steve-ui-jsp</module>
+    <module>steve-db/steve-jooq</module>
+    <module>steve-ocpp/steve-ocpp-1-x</module>
+    <module>steve-ocpp/steve-ocpp-2-x</module>
+    <module>steve-ocpp/steve-ocpp-commons</module>
+    <module>steve-ocpp/steve-ocpp-transport-soap</module>
+    <module>steve-ocpp/steve-ocpp-transport-websocket</module>
+    <module>steve-ui/steve-ui-jsp</module>
   </modules>
 
   <properties>
@@ -62,7 +63,7 @@
       </dependency>
       <dependency>
         <groupId>de.rwth.idsg</groupId>
-        <artifactId>steve-ocpp</artifactId>
+        <artifactId>steve-ocpp-commons</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -227,13 +228,22 @@
             </annotationProcessorPaths>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>com.mycila</groupId>
+          <artifactId>license-maven-plugin</artifactId>
+          <version>${plugin.license-maven.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>com.diffplug.spotless</groupId>
+          <artifactId>spotless-maven-plugin</artifactId>
+          <version>2.46.1</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
       <plugin>
         <groupId>com.mycila</groupId>
         <artifactId>license-maven-plugin</artifactId>
-        <version>${plugin.license-maven.version}</version>
         <configuration>
           <licenseSets>
             <licenseSet>

steve-bom/pom.xml

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>de.rwth.idsg</groupId>
+    <artifactId>steve-parent</artifactId>
+    <version>3.8.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>steve-bom</artifactId>
+  <packaging>pom</packaging>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>de.rwth.idsg</groupId>
+        <artifactId>steve-core</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>de.rwth.idsg</groupId>
+        <artifactId>steve-jooq</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>de.rwth.idsg</groupId>
+        <artifactId>steve-ocpp-commons</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>de.rwth.idsg</groupId>
+        <artifactId>steve-ocpp-1-x</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>de.rwth.idsg</groupId>
+        <artifactId>steve-ocpp-2-x</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>de.rwth.idsg</groupId>
+        <artifactId>steve-ocpp-transport-soap</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>de.rwth.idsg</groupId>
+        <artifactId>steve-ocpp-transport-websocket</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>de.rwth.idsg</groupId>
+        <artifactId>steve-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>de.rwth.idsg</groupId>
+        <artifactId>steve-ui-jsp</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

steve-core/src/main/java/de/rwth/idsg/steve/config/SteveProperties.java

@@ -23,6 +23,8 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
+import java.time.Duration;
+
 /**
  * @author Sevket Goekay <sevketgokay@gmail.com>
  * @since 19.08.2014
@@ -84,5 +86,13 @@ public static class Ocpp {
         private boolean autoRegisterUnknownStations;
         private @Nullable String chargeBoxIdValidationRegex;
         private String wsSessionSelectStrategy;
+        private Ws ws = new Ws();
+
+        @Data
+        public static class Ws {
+            private @Nullable Integer maxTextMessageSize;
+            private @Nullable Duration idleTimeout;
+            private String[] allowedOriginPatterns;
+        }
     }
 }

steve-jooq/pom.xml → steve-db/steve-jooq/pom.xml

@@ -5,6 +5,7 @@
     <groupId>de.rwth.idsg</groupId>
     <artifactId>steve-parent</artifactId>
     <version>3.8.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>steve-jooq</artifactId>
@@ -60,11 +61,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
 
   <profiles>

steve-ocpp-1-x/pom.xml → steve-ocpp/steve-ocpp-1-x/pom.xml

@@ -5,14 +5,15 @@
     <groupId>de.rwth.idsg</groupId>
     <artifactId>steve-parent</artifactId>
     <version>3.8.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>steve-ocpp-1-x</artifactId>
 
   <dependencies>
     <dependency>
       <groupId>de.rwth.idsg</groupId>
-      <artifactId>steve-ocpp</artifactId>
+      <artifactId>steve-ocpp-commons</artifactId>
     </dependency>
   </dependencies>
 

steve-ocpp-2-x/pom.xml → steve-ocpp/steve-ocpp-2-x/pom.xml

@@ -5,14 +5,15 @@
     <groupId>de.rwth.idsg</groupId>
     <artifactId>steve-parent</artifactId>
     <version>3.8.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>steve-ocpp-2-x</artifactId>
 
   <dependencies>
     <dependency>
       <groupId>de.rwth.idsg</groupId>
-      <artifactId>steve-ocpp</artifactId>
+      <artifactId>steve-ocpp-commons</artifactId>
     </dependency>
   </dependencies>