[server] Fix warnings and replace deprecated methods

8 files changed, 8 insertions, 39 deletions

diff --git a/dozentenmodulserver/src/main/java/fi/iki/elonen/NanoHTTPD.java b/dozentenmodulserver/src/main/java/fi/iki/elonen/NanoHTTPD.java
index 238dca10..d6eeabe2 100644
--- a/dozentenmodulserver/src/main/java/fi/iki/elonen/NanoHTTPD.java
+++ b/dozentenmodulserver/src/main/java/fi/iki/elonen/NanoHTTPD.java
@@ -63,11 +63,9 @@ import java.util.StringTokenizer;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.io.output.ByteArrayOutputStream;
-import org.apache.log4j.Logger;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.openslx.util.GrowingThreadPoolExecutor;
@@ -126,8 +124,6 @@ import org.openslx.util.PrioThreadFactory;
  */
 public abstract class NanoHTTPD implements Runnable {
 
-	private static final Logger LOGGER = Logger.getLogger(NanoHTTPD.class);
-
 	/**
 	 * Maximum time to wait on Socket.getInputStream().read() (in milliseconds)
 	 * This is required as the Keep-Alive HTTP connections would otherwise
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/Database.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/Database.java
index cfc6530b..76565f37 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/Database.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/Database.java
@@ -28,6 +28,7 @@ public class Database {
 

 	static {

 		try {

+			// Hack for some Java versions to register and instantiate the MySQL connection driver

 			Class.forName("com.mysql.jdbc.Driver").newInstance();

 		} catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {

 			LOGGER.fatal("Cannot get mysql JDBC driver!", e);

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/MysqlStatement.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/MysqlStatement.java
index e7573cb1..1d1bbc18 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/MysqlStatement.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/MysqlStatement.java
@@ -282,7 +282,7 @@ public class MysqlStatement implements Closeable {
 						indexList = new ArrayList<>();
 						paramMap.put(name, indexList);
 					}
-					indexList.add(new Integer(index));
+					indexList.add(Integer.valueOf(index));
 
 					index++;
 				}
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java
index da52a5b3..1d501c7a 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java
@@ -27,6 +27,7 @@ import org.openslx.bwlp.thrift.iface.ImagePublishData;
 import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
 import org.openslx.bwlp.thrift.iface.ImageVersionDetails;
 import org.openslx.bwlp.thrift.iface.ImageVersionWrite;
+import org.openslx.bwlp.thrift.iface.Role;
 import org.openslx.bwlp.thrift.iface.ShareMode;
 import org.openslx.bwlp.thrift.iface.TNotFoundException;
 import org.openslx.bwlp.thrift.iface.UserInfo;
@@ -90,7 +91,7 @@ public class DbImage {
 
 			// if Student is trying to download only needed information is filled
 			MysqlStatement stmt = null;
-			if (user.role.equals("STUDENT")) 
+			if (user.role == Role.STUDENT) 
 			{
 				stmt = connection.prepareStatement("SELECT i.imagebaseid, i.latestversionid,"
 					+ " null, null, null, null, null, null, null, null,"
@@ -272,7 +273,7 @@ public class DbImage {
 			throws SQLException {
 		List<ImageVersionDetails> versionList = new ArrayList<>();
 		MysqlStatement stmt = null;	
-		if (user.role.equals("STUDENT")) {
+		if (user.role == Role.STUDENT) {
 			stmt = connection.prepareStatement("SELECT"
 			+ " imageversionid, createtime, expiretime, filesize, null,"
 			+ " isrestricted, isvalid, isprocessed" + " FROM imageversion"
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailTemplatePlain.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailTemplatePlain.java
index 54ee81ee..0366c9ba 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailTemplatePlain.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailTemplatePlain.java
@@ -32,9 +32,10 @@ public class MailTemplatePlain {
 	
 	@SerializedName("edit_version")
 	private int editVersion;
-	
+
 	private boolean original = false;
-	
+
+	@SerializedName("original_template")
 	private String original_template;
 
 	public MailTemplatePlain(Template name, String description, String template, String[] optionalVariables,
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldLectures.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldLectures.java
index 614ed19f..fb093ea7 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldLectures.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldLectures.java
@@ -3,7 +3,6 @@ package org.openslx.bwlp.sat.maintenance;
 import java.sql.SQLException;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.log4j.Logger;
 import org.joda.time.DateTime;
 import org.openslx.bwlp.sat.database.mappers.DbLecture;
 import org.openslx.util.QuickTimer;
@@ -14,8 +13,6 @@ import org.openslx.util.QuickTimer.Task;
  */
 public class DeleteOldLectures implements Runnable {
 
-	private static final Logger LOGGER = Logger.getLogger(DeleteOldLectures.class);
-
 	private static final DeleteOldLectures instance = new DeleteOldLectures();
 
 	private static long blockedUntil = 0;
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
index 4910ec4c..181baef5 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
@@ -3,7 +3,6 @@ package org.openslx.bwlp.sat.thrift;
 import java.io.File;
 import java.nio.ByteBuffer;
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -48,17 +47,14 @@ import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
 import org.openslx.bwlp.thrift.iface.ImageVersionDetails;
 import org.openslx.bwlp.thrift.iface.ImageVersionWrite;
 import org.openslx.bwlp.thrift.iface.InvocationError;
-import org.openslx.bwlp.thrift.iface.LdapFilter;
 import org.openslx.bwlp.thrift.iface.LecturePermissions;
 import org.openslx.bwlp.thrift.iface.LectureRead;
 import org.openslx.bwlp.thrift.iface.LectureSummary;
 import org.openslx.bwlp.thrift.iface.LectureWrite;
 import org.openslx.bwlp.thrift.iface.Location;
-import org.openslx.bwlp.thrift.iface.NetShare;
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
 import org.openslx.bwlp.thrift.iface.Organization;
 import org.openslx.bwlp.thrift.iface.PredefinedData;
-import org.openslx.bwlp.thrift.iface.PresetRunScript;
 import org.openslx.bwlp.thrift.iface.SatelliteConfig;
 import org.openslx.bwlp.thrift.iface.SatelliteServer;
 import org.openslx.bwlp.thrift.iface.SatelliteStatus;
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java
index 6357e411..b6e0592c 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java
@@ -50,29 +50,6 @@ public class WebServer extends NanoHTTPD {
 		super.maxRequestSize = 65535;
 	}
 
-	/**
-	 * Extract request source ip address. Honors the x-forwarded-for header.
-	 * 
-	 * @param headers
-	 *            map of headers as supplied by nanohttpd
-	 * @return IP address, or empty string if unknown
-	 */
-	private String extractIp(Map<String, String> headers) {
-		if (headers == null || headers.isEmpty())
-			return "";
-		String ip;
-		ip = headers.get("remote-addr");
-		if (ip != null && !ip.equals("127.0.0.1"))
-			return ip;
-		ip = headers.get("x-forwarded-for");
-		if (ip == null || ip.isEmpty())
-			return "";
-		final int i = ip.lastIndexOf(',');
-		if (i == -1)
-			return ip.trim();
-		return ip.substring(i + 1).trim();
-	}
-
 	@Override
 	public Response serve(IHTTPSession session) {
 		String uri = session.getUri();