[server] Kill Util class; methods moved to m-s-s

11 files changed, 10 insertions, 56 deletions

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 e3b0baf7..e5a86d22 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
@@ -20,7 +20,6 @@ import org.openslx.bwlp.sat.database.models.LocalImageVersion;
 import org.openslx.bwlp.sat.mail.MailGenerator;
 import org.openslx.bwlp.sat.permissions.User;
 import org.openslx.bwlp.sat.util.FileSystem;
-import org.openslx.bwlp.sat.util.Util;
 import org.openslx.bwlp.thrift.iface.ImageBaseWrite;
 import org.openslx.bwlp.thrift.iface.ImageDetailsRead;
 import org.openslx.bwlp.thrift.iface.ImagePermissions;
@@ -35,6 +34,7 @@ import org.openslx.filetransfer.util.ChunkList;
 import org.openslx.filetransfer.util.FileChunk;
 import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
+import org.openslx.util.Util;
 
 public class DbImage {
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
index 701d435b..ec96dd3c 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
@@ -17,7 +17,6 @@ import org.openslx.bwlp.sat.database.models.LocalImageVersion;
 import org.openslx.bwlp.sat.mail.MailGenerator;
 import org.openslx.bwlp.sat.permissions.User;
 import org.openslx.bwlp.sat.thrift.cache.OperatingSystemList;
-import org.openslx.bwlp.sat.util.Util;
 import org.openslx.bwlp.sat.web.VmChooserEntryXml;
 import org.openslx.bwlp.sat.web.VmChooserListXml;
 import org.openslx.bwlp.sat.web.XmlFilterEntry;
@@ -29,6 +28,7 @@ import org.openslx.bwlp.thrift.iface.NetShare;
 import org.openslx.bwlp.thrift.iface.TNotFoundException;
 import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.util.Json;
+import org.openslx.util.Util;
 import org.openslx.util.vm.UnsupportedVirtualizerFormatException;
 import org.openslx.util.vm.VmMetaData;
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureFilter.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureFilter.java
index 81c42444..dddd47b0 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureFilter.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureFilter.java
@@ -8,9 +8,9 @@ import java.util.List;
 import org.apache.log4j.Logger;
 import org.openslx.bwlp.sat.database.MysqlConnection;
 import org.openslx.bwlp.sat.database.MysqlStatement;
-import org.openslx.bwlp.sat.util.Util;
 import org.openslx.bwlp.sat.web.XmlFilterEntry;
 import org.openslx.bwlp.thrift.iface.LdapFilter;
+import org.openslx.util.Util;
 
 public class DbLectureFilter {
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLocation.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLocation.java
index b079d3b4..2f6ba4bb 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLocation.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLocation.java
@@ -10,8 +10,8 @@ import org.openslx.bwlp.sat.database.Database;
 import org.openslx.bwlp.sat.database.MysqlConnection;
 import org.openslx.bwlp.sat.database.MysqlStatement;
 import org.openslx.bwlp.sat.util.Configuration;
-import org.openslx.bwlp.sat.util.Util;
 import org.openslx.bwlp.thrift.iface.Location;
+import org.openslx.util.Util;
 
 public class DbLocation {
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailGenerator.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailGenerator.java
index f43274e6..68e4f641 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailGenerator.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailGenerator.java
@@ -21,7 +21,6 @@ import org.openslx.bwlp.sat.database.models.LocalImageVersion;
 import org.openslx.bwlp.sat.mail.MailQueue.MailConfig;
 import org.openslx.bwlp.sat.mail.MailTemplatePlain.Template;
 import org.openslx.bwlp.sat.util.Formatter;
-import org.openslx.bwlp.sat.util.Util;
 import org.openslx.bwlp.thrift.iface.ImageDetailsRead;
 import org.openslx.bwlp.thrift.iface.ImagePermissions;
 import org.openslx.bwlp.thrift.iface.ImageVersionDetails;
@@ -30,6 +29,7 @@ import org.openslx.bwlp.thrift.iface.LectureSummary;
 import org.openslx.bwlp.thrift.iface.ShareMode;
 import org.openslx.bwlp.thrift.iface.TNotFoundException;
 import org.openslx.bwlp.thrift.iface.UserInfo;
+import org.openslx.util.Util;
 
 public class MailGenerator {
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailQueue.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailQueue.java
index 0f49194b..799d9487 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailQueue.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailQueue.java
@@ -21,11 +21,11 @@ import org.openslx.bwlp.sat.database.mappers.DbUser.User;
 import org.openslx.bwlp.sat.mail.MailTemplatePlain.Template;
 import org.openslx.bwlp.sat.mail.SmtpMailer.EncryptionMode;
 import org.openslx.bwlp.sat.maintenance.MailFlusher;
-import org.openslx.bwlp.sat.util.Util;
 import org.openslx.bwlp.thrift.iface.TNotFoundException;
 import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
+import org.openslx.util.Util;
 
 public class MailQueue {
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/SmtpMailer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/SmtpMailer.java
index 9b0d38bd..51ad5b19 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/SmtpMailer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/SmtpMailer.java
@@ -18,7 +18,7 @@ import org.apache.commons.net.smtp.AuthenticatingSMTPClient.AUTH_METHOD;
 import org.apache.commons.net.smtp.SMTPReply;
 import org.apache.commons.net.smtp.SimpleSMTPHeader;
 import org.apache.log4j.Logger;
-import org.openslx.bwlp.sat.util.Util;
+import org.openslx.util.Util;
 
 public class SmtpMailer {
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/SendExpireWarning.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/SendExpireWarning.java
index 1204c2a2..db1baa36 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/SendExpireWarning.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/SendExpireWarning.java
@@ -11,10 +11,10 @@ import org.openslx.bwlp.sat.database.mappers.DbLecture;
 import org.openslx.bwlp.sat.database.models.LocalImageVersion;
 import org.openslx.bwlp.sat.mail.MailGenerator;
 import org.openslx.bwlp.sat.util.FileSystem;
-import org.openslx.bwlp.sat.util.Util;
 import org.openslx.bwlp.thrift.iface.LectureSummary;
 import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
+import org.openslx.util.Util;
 
 public class SendExpireWarning implements Runnable {
 
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 f97231f8..30c38288 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
@@ -33,7 +33,6 @@ import org.openslx.bwlp.sat.thrift.cache.VirtualizerList;
 import org.openslx.bwlp.sat.util.FileSystem;
 import org.openslx.bwlp.sat.util.Formatter;
 import org.openslx.bwlp.sat.util.Sanitizer;
-import org.openslx.bwlp.sat.util.Util;
 import org.openslx.bwlp.thrift.iface.AuthorizationError;
 import org.openslx.bwlp.thrift.iface.DateParamError;
 import org.openslx.bwlp.thrift.iface.ImageBaseWrite;
@@ -72,6 +71,7 @@ import org.openslx.sat.thrift.version.Version;
 import org.openslx.thrifthelper.Comparators;
 import org.openslx.thrifthelper.ThriftManager;
 import org.openslx.util.ThriftUtil;
+import org.openslx.util.Util;
 
 public class ServerHandler implements SatelliteServer.Iface {
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Configuration.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Configuration.java
index f2926d64..2f0e04ee 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Configuration.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Configuration.java
@@ -13,6 +13,7 @@ import javax.net.ssl.SSLContext;
 import org.apache.log4j.Logger;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
+import org.openslx.util.Util;
 
 public class Configuration {
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Util.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Util.java
deleted file mode 100644
index 8e6950e8..00000000
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Util.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.openslx.bwlp.sat.util;
-
-import java.util.regex.Pattern;
-
-public class Util {
-
-	/**
-	 * Try to close everything passed to this method. Never throw an exception
-	 * if it fails, just silently continue.
-	 * 
-	 * @param item One or more objects that are AutoCloseable
-	 */
-	public static void safeClose(AutoCloseable... item) {
-		if (item == null)
-			return;
-		for (AutoCloseable c : item) {
-			if (c == null)
-				continue;
-			try {
-				c.close();
-			} catch (Exception e) {
-			}
-		}
-	}
-
-	private static Pattern nonprintableExp = Pattern.compile("[\\p{C}\\p{Zl}\\p{Zp}]");
-	private static Pattern nonSpaceExp = Pattern.compile("[^\\p{C}\\p{Z}]");
-
-	/**
-	 * Whether the given string contains only printable characters.
-	 * 
-	 * @param string {@link String} to check
-	 * @return
-	 */
-	public static boolean isPrintable(String string) {
-		return !nonprintableExp.matcher(string).find();
-	}
-
-	public static boolean isEmptyString(String string) {
-		return string == null || !nonSpaceExp.matcher(string).find();
-	}
-
-	public static long unixTime() {
-		return System.currentTimeMillis() / 1000;
-	}
-
-}