Upgrade to Java 8 (#17)

* upgrade to jdk1.8 source compatibility * upgrade various libraries, following jdk upgrade
rtr-nettest · Oct 7, 2020 · 4b664af · 4b664af
1 parent 2e17482
commit 4b664af
Show file tree

Hide file tree

Showing 13 changed files with 83 additions and 99 deletions.
diff --git a/RMBTClient/build.gradle b/RMBTClient/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'java'
 apply plugin: 'com.github.johnrengelman.shadow'
-sourceCompatibility = 1.7
+sourceCompatibility = 1.8
 
 repositories {
     mavenCentral()
@@ -11,7 +11,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
     }
 }
 

diff --git a/RMBTControlServer/build.gradle b/RMBTControlServer/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 }
 
 apply plugin: 'war'
-sourceCompatibility = '1.7'
+sourceCompatibility = '1.8'
 
 tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"
@@ -39,16 +39,16 @@ def webXmlFile = file(project.webAppDirName + "/WEB-INF/web.xml")
 def generatedContextXmlFile = file("${buildDir}/context.xml")
 
 dependencies {
-    providedCompile 'org.apache.tomcat:tomcat-catalina:7.0.56'
-    providedCompile group: 'javax.servlet', name: 'servlet-api', version: '2.3'
+    providedCompile "org.apache.tomcat:tomcat-catalina:$catalinaVersion"
+    providedCompile "javax.servlet:javax.servlet-api:$servletVersion"
     compile('commons-io:commons-io:2.4',
-            'org.json:json:20140107',
-            'org.restlet.jse:org.restlet.ext.json:2.1.7',
-            'org.restlet.jee:org.restlet.ext.servlet:2.1.7',
+            "org.json:json:$jsonVersion",
+            "org.restlet.jse:org.restlet.ext.json:${restletVersion}",
+            "org.restlet.jee:org.restlet.ext.servlet:$restletVersion",
             'is.tagomor.woothee:woothee-java:1.7.0',
             'com.vdurmont:semver4j:2.0.2',
             'commons-dbutils:commons-dbutils:1.6',
-            'com.fasterxml.jackson.core:jackson-databind:2.8.8.1',
+            "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion",
             group: 'net.bull.javamelody', name: 'javamelody-core', version: '1.85.0'
     )
     testCompile 'net.sf.uadetector:uadetector-resources:2014.10'

diff --git a/RMBTControlServer/src/at/rtr/rmbt/controlServer/RequestDataCollector.java b/RMBTControlServer/src/at/rtr/rmbt/controlServer/RequestDataCollector.java
@@ -25,7 +25,7 @@
 import org.restlet.data.ClientInfo;
 import org.restlet.data.Language;
 import org.restlet.data.Preference;
-import org.restlet.engine.header.Header;
+import org.restlet.data.Header;
 import org.restlet.resource.Get;
 import org.restlet.util.Series;
 
@@ -76,8 +76,8 @@ public String request(final String entity) throws JSONException
         answer.put("headers", headersObj);
 
         @SuppressWarnings("unchecked")
-        final Series<Header> headers = (Series<Header>) request.getAttributes().get("org.restlet.http.headers");
-        
+        final Series<Header> headers = request.getHeaders();
+
         if (headers != null)
             for (final Header h : headers)
             {

diff --git a/RMBTControlServer/src/at/rtr/rmbt/controlServer/ServerResource.java b/RMBTControlServer/src/at/rtr/rmbt/controlServer/ServerResource.java
@@ -26,11 +26,13 @@
 
 import javax.naming.NamingException;
 
+import com.google.common.collect.Sets;
 import org.joda.time.DateTime;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.restlet.data.Method;
 import org.restlet.data.Reference;
-import org.restlet.engine.header.Header;
+import org.restlet.data.Header;
 import org.restlet.representation.Representation;
 import org.restlet.resource.Options;
 import org.restlet.resource.ResourceException;
@@ -143,17 +145,11 @@ protected void addAllowOrigin()
     }
 
     private void addAllowOrgin(String origin) {
-        Series<Header> responseHeaders = (Series<Header>) getResponse().getAttributes().get("org.restlet.http.headers");
-        if (responseHeaders == null)
-        {
-            responseHeaders = new Series<>(Header.class);
-            getResponse().getAttributes().put("org.restlet.http.headers", responseHeaders);
-        }
-        responseHeaders.add("Access-Control-Allow-Origin", origin);
-        responseHeaders.add("Access-Control-Allow-Methods", "GET,POST,OPTIONS");
-        responseHeaders.add("Access-Control-Allow-Headers", "Content-Type");
-        responseHeaders.add("Access-Control-Allow-Credentials", "false");
-        responseHeaders.add("Access-Control-Max-Age", "60");
+        getResponse().setAccessControlAllowCredentials(false);
+        getResponse().setAccessControlAllowMethods(Sets.newHashSet(Method.GET, Method.POST, Method.OPTIONS));
+        getResponse().setAccessControlMaxAge(60);
+        getResponse().setAccessControlAllowOrigin(origin);
+        getResponse().setAccessControlAllowHeaders(Sets.newHashSet("Content-Type"));
     }
 
     /**

diff --git a/RMBTMapServer/build.gradle b/RMBTMapServer/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 }
 
 apply plugin: 'war'
-sourceCompatibility = '1.7'
+sourceCompatibility = '1.8'
 
 tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"
@@ -32,11 +32,11 @@ subprojects{
 }
 
 dependencies {
-    providedCompile 'org.apache.tomcat:tomcat-catalina:7.0.56'
-    providedCompile group: 'javax.servlet', name: 'servlet-api', version: '2.3'
-    compile 'org.json:json:20140107'
-    compile 'org.restlet.jse:org.restlet.ext.json:2.1.7'
-    compile 'org.restlet.jee:org.restlet.ext.servlet:2.1.7'
+    providedCompile "org.apache.tomcat:tomcat-catalina:$catalinaVersion"
+    providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version: "$servletVersion"
+    compile "org.json:json:$jsonVersion"
+    compile "org.restlet.jse:org.restlet.ext.json:$restletVersion"
+    compile "org.restlet.jee:org.restlet.ext.servlet:$restletVersion"
     compile 'org.postgis:postgis-jdbc:1.3.3'
     compile(group: 'net.bull.javamelody', name: 'javamelody-core', version: '1.85.0')
     compile project(':RMBTSharedCode')

diff --git a/RMBTMapServer/src/at/rtr/rmbt/mapServer/ServerResource.java b/RMBTMapServer/src/at/rtr/rmbt/mapServer/ServerResource.java
@@ -25,9 +25,11 @@
 
 import javax.naming.NamingException;
 
+import com.google.common.collect.Sets;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.restlet.engine.header.Header;
+
+import org.restlet.data.Method;
 import org.restlet.representation.Representation;
 import org.restlet.resource.Options;
 import org.restlet.resource.ResourceException;
@@ -104,17 +106,11 @@ public void readCapabilities(final JSONObject request) throws JSONException {
     @SuppressWarnings("unchecked")
     protected void addAllowOrigin()
     {
-        Series<Header> responseHeaders = (Series<Header>) getResponse().getAttributes().get("org.restlet.http.headers");
-        if (responseHeaders == null)
-        {
-            responseHeaders = new Series<Header>(Header.class);
-            getResponse().getAttributes().put("org.restlet.http.headers", responseHeaders);
-        }
-        responseHeaders.add("Access-Control-Allow-Origin", "*");
-        responseHeaders.add("Access-Control-Allow-Methods", "GET,POST,OPTIONS");
-        responseHeaders.add("Access-Control-Allow-Headers", "Content-Type");
-        responseHeaders.add("Access-Control-Allow-Credentials", "false");
-        responseHeaders.add("Access-Control-Max-Age", "60");
+        getResponse().setAccessControlAllowCredentials(false);
+        getResponse().setAccessControlAllowMethods(Sets.newHashSet(Method.GET, Method.POST, Method.OPTIONS));
+        getResponse().setAccessControlMaxAge(60);
+        getResponse().setAccessControlAllowOrigin("*");
+        getResponse().setAccessControlAllowHeaders(Sets.newHashSet("Content-Type"));
     }
 
     @Options

diff --git a/RMBTQoSServer/build.gradle b/RMBTQoSServer/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 }
 
 apply plugin: 'java'
-sourceCompatibility = '1.7'
+sourceCompatibility = '1.8'
 
 tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"
@@ -23,8 +23,8 @@ dependencies {
     compile project(':RMBTSharedCode')
     compile 'org.jumpmind.symmetric.jdbc:postgresql:9.2-1002-jdbc4'
     compile 'log4j:log4j:1.2.17'
-    compile 'org.json:json:5.0.5'
-    compile 'org.restlet.jse:org.restlet:2.3-M4'
+    compile "org.json:json:$jsonVersion"
+    compile "org.restlet.jse:org.restlet:$restletVersion"
 
     testImplementation group: 'org.jmockit', name: 'jmockit', version: '1.45'
     testImplementation group: 'junit', name: 'junit', version: '4.12'

diff --git a/RMBTSharedCode/build.gradle b/RMBTSharedCode/build.gradle
@@ -10,7 +10,7 @@ sourceSets.main.compileClasspath += configurations.providedCompile
 sourceSets.test.compileClasspath += configurations.providedCompile
 sourceSets.test.runtimeClasspath += configurations.providedCompile
 
-sourceCompatibility = 1.7
+sourceCompatibility = 1.8
 
 repositories {
     mavenCentral()
@@ -23,16 +23,16 @@ dependencies {
     compile group: 'net.spy', name: 'spymemcached', version: '2.12.1'
     compile group: 'joda-time', name: 'joda-time', version: '2.9.7'
     testCompile group: 'junit', name: 'junit', version: '4.11'
-    compile group: 'org.postgresql', name: 'postgresql', version: '42.2.16.jre6'
+    compile group: 'org.postgresql', name: 'postgresql', version: '42.2.16'
     compile group: 'com.google.guava', name: 'guava', version: '20.0'
-    providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
-    compile group: 'org.json', name: 'json', version: '20160810'
+    providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version: "$servletVersion"
+    compile "org.json:json:$jsonVersion"
     compile group: 'com.google.code.gson', name: 'gson', version: '2.8.0'
     compile group: 'com.github.jknack', name: 'handlebars', version: '4.1.2'
 
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.10.1'
+    compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: "$jacksonVersion"
     // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.10.1'
+    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "$jacksonVersion"
 
     compile 'io.swagger:swagger-annotations:1.5.15'
 }

diff --git a/RMBTStatisticServer/build.gradle b/RMBTStatisticServer/build.gradle
@@ -5,12 +5,12 @@ buildscript {
 }
 
 plugins {
-    id "com.benjaminsproule.swagger" version "1.0.4"
+    id "com.benjaminsproule.swagger" version "1.0.13"
 }
 
 apply plugin: 'com.benjaminsproule.swagger'
 apply plugin: 'war'
-sourceCompatibility = '1.7'
+sourceCompatibility = '1.8'
 
 tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"
@@ -52,24 +52,24 @@ def webXmlFile = file(project.webAppDirName + "/WEB-INF/web.xml")
 def generatedContextXmlFile = file("${buildDir}/context.xml")
 
 dependencies {
-    providedCompile 'org.apache.tomcat:tomcat-catalina:7.0.56'
-    providedCompile group: 'javax.servlet', name: 'servlet-api', version: '2.3'
+    providedCompile "org.apache.tomcat:tomcat-catalina:$catalinaVersion"
+    providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version: "$servletVersion"
     testCompile group: 'junit', name: 'junit', version: '4.12'
     testCompile 'org.mockito:mockito-core:2.7.17'
-    compile 'org.restlet.jse:org.restlet:2.1.7'
-    compile 'org.restlet.jse:org.restlet.ext.json:2.1.7'
-    compile 'org.restlet.jee:org.restlet.ext.servlet:2.1.7'
-    compile 'org.restlet.jee:org.restlet.ext.fileupload:2.1.7'
-    compile 'org.json:json:20140107'
+    compile "org.restlet.jse:org.restlet:$restletVersion"
+    compile "org.restlet.jse:org.restlet.ext.json:$restletVersion"
+    compile "org.restlet.jee:org.restlet.ext.servlet:$restletVersion"
+    compile "org.restlet.jee:org.restlet.ext.fileupload:$restletVersion"
+    compile "org.json:json:$jsonVersion"
     compile 'commons-io:commons-io:2.4'
     compile 'org.apache.jcs:jcs:1.3'
-    compile 'io.swagger:swagger-annotations:1.5.15'
+    compile "io.swagger:swagger-annotations:1.5.24"
     //compile 'io.swagger:swagger-core:1.5.15'
     compile 'javax.ws.rs:javax.ws.rs-api:2.0.1'
-    compile 'com.fasterxml.jackson:jackson-base:2.9.7'
-    compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.9.7'
+    compile "com.fasterxml.jackson:jackson-base:$jacksonVersion"
+    compile "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:$jacksonVersion"
     compile group: 'commons-dbutils', name: 'commons-dbutils', version: '1.7'
-    compile 'com.github.sett4:jackson-dataformat-xlsx-lite:2.9.6-1'
+    compile "com.github.sett4:jackson-dataformat-xlsx-lite:2.9.10.1"
     compile (group: 'net.bull.javamelody', name: 'javamelody-core', version: '1.85.0')
     compile project(':RMBTSharedCode')
     compile project(':RMBTUtil')
@@ -90,7 +90,7 @@ war {
 swagger {
     apiSource {
         springmvc = false
-        locations = ['at.rtr.rmbt.statisticServer']
+        locations = ['at.rtr.rmbt.statisticServer','at.rtr.rmbt.statisticSerer.opendata.dto']
         schemes = ['https']
         host = 'data.netztest.at'
         basePath = '/RMBTStatisticServer'

diff --git a/RMBTStatisticServer/src/at/rtr/rmbt/statisticServer/ServerResource.java b/RMBTStatisticServer/src/at/rtr/rmbt/statisticServer/ServerResource.java
@@ -26,11 +26,13 @@
 
 import javax.naming.NamingException;
 
+import com.google.common.collect.Sets;
 import org.joda.time.DateTime;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.restlet.data.Method;
 import org.restlet.data.Reference;
-import org.restlet.engine.header.Header;
+import org.restlet.data.Header;
 import org.restlet.representation.Representation;
 import org.restlet.resource.Options;
 import org.restlet.resource.ResourceException;
@@ -139,17 +141,11 @@ protected void doRelease() throws ResourceException
     @SuppressWarnings("unchecked")
     protected void addAllowOrigin()
     {
-        Series<Header> responseHeaders = (Series<Header>) getResponse().getAttributes().get("org.restlet.http.headers");
-        if (responseHeaders == null)
-        {
-            responseHeaders = new Series<>(Header.class);
-            getResponse().getAttributes().put("org.restlet.http.headers", responseHeaders);
-        }
-        responseHeaders.add("Access-Control-Allow-Origin", "*");
-        responseHeaders.add("Access-Control-Allow-Methods", "GET,POST,OPTIONS");
-        responseHeaders.add("Access-Control-Allow-Headers", "Content-Type");
-        responseHeaders.add("Access-Control-Allow-Credentials", "false");
-        responseHeaders.add("Access-Control-Max-Age", "60");
+        getResponse().setAccessControlAllowCredentials(false);
+        getResponse().setAccessControlAllowMethods(Sets.newHashSet(Method.GET, Method.POST, Method.OPTIONS));
+        getResponse().setAccessControlMaxAge(60);
+        getResponse().setAccessControlAllowOrigin("*");
+        getResponse().setAccessControlAllowHeaders(Sets.newHashSet("Content-Type"));
     }
 
     @Options
@@ -161,7 +157,7 @@ public void doOptions(final Representation entity)
     @SuppressWarnings("unchecked")
     public String getIP()
     {
-        final Series<Header> headers = (Series<Header>) getRequest().getAttributes().get("org.restlet.http.headers");
+        final Series<Header> headers = getRequest().getHeaders();
         final String realIp = headers.getFirstValue("X-Real-IP", true);
         if (realIp != null)
             return realIp;
@@ -172,7 +168,7 @@ public String getIP()
     @SuppressWarnings("unchecked")
     public Reference getURL()
     {
-        final Series<Header> headers = (Series<Header>) getRequest().getAttributes().get("org.restlet.http.headers");
+        final Series<Header> headers = getRequest().getHeaders();
         final String realURL = headers.getFirstValue("X-Real-URL", true);
         if (realURL != null)
             return new Reference(realURL);

diff --git a/RMBTStatisticServer/src/at/rtr/rmbt/statisticServer/StatisticsResource.java b/RMBTStatisticServer/src/at/rtr/rmbt/statisticServer/StatisticsResource.java
@@ -16,30 +16,20 @@
  ******************************************************************************/
 package at.rtr.rmbt.statisticServer;
 
+import at.rtr.rmbt.db.DbConnection;
+import at.rtr.rmbt.shared.Classification;
+import at.rtr.rmbt.shared.cache.CacheHelper;
+import at.rtr.rmbt.shared.cache.CacheHelper.ObjectWithTimestamp;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.restlet.resource.Get;
 import org.restlet.resource.Post;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.util.Calendar;
-import java.util.Queue;
-import java.util.Set;
-import java.util.TimeZone;
-import java.util.TreeSet;
-import java.util.concurrent.LinkedBlockingQueue;
-
 import javax.naming.NamingException;
-
-import at.rtr.rmbt.db.DbConnection;
-import at.rtr.rmbt.shared.Classification;
-import at.rtr.rmbt.shared.cache.CacheHelper;
-import at.rtr.rmbt.shared.cache.CacheHelper.ObjectWithTimestamp;
+import java.sql.*;
+import java.util.*;
+import java.util.concurrent.LinkedBlockingQueue;
 
 public class StatisticsResource extends ServerResource
 {

diff --git a/RMBTUtil/build.gradle b/RMBTUtil/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'java'
-sourceCompatibility = 1.7
+sourceCompatibility = 1.8
 
 repositories {
     mavenCentral()
@@ -8,6 +8,6 @@ repositories {
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.11'
-    compile group: 'org.json', name: 'json', version: '20160810'
+    compile group: 'org.json', name: 'json', version: "$jsonVersion"
     compile group: 'com.google.code.gson', name: 'gson', version: '2.8.0'
 }