[server] Adapt to API changes, refine permission checking for image version deletion

1 files changed, 20 insertions, 11 deletions

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java
index 03ae5dd4..b6e632e6 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java
@@ -14,16 +14,19 @@ import org.openslx.bwlp.sat.database.Database;
 import org.openslx.bwlp.sat.database.mappers.DbImage;
 import org.openslx.bwlp.sat.fileserv.FileServer;
 import org.openslx.bwlp.sat.thrift.BinaryListener;
-import org.openslx.bwlp.sat.thrift.cache.OperatingSystemList;
 import org.openslx.bwlp.sat.thrift.cache.OrganizationList;
 import org.openslx.bwlp.sat.util.Configuration;
+import org.openslx.bwlp.sat.util.Json;
 import org.openslx.bwlp.sat.util.QuickTimer;
 import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
+import org.openslx.bwlp.thrift.iface.NetDirection;
+import org.openslx.bwlp.thrift.iface.NetRule;
 import org.openslx.bwlp.thrift.iface.UserInfo;
 
+
 public class App {
 
-	private static Logger log = Logger.getLogger(App.class);
+	private static Logger LOGGER = Logger.getLogger(App.class);
 
 	private static List<Thread> servers = new ArrayList<>();
 
@@ -35,16 +38,16 @@ public class App {
 		if (args.length != 0 && args[0].equals("debug")) {
 			DEBUG = true;
 		}
-		log.info("****************************************************************");
-		log.info("******************* Starting Application ***********************");
-		log.info("****************************************************************");
+		LOGGER.info("****************************************************************");
+		LOGGER.info("******************* Starting Application ***********************");
+		LOGGER.info("****************************************************************");
 
 		// get Configuration
 		try {
-			log.info("Loading configuration");
+			LOGGER.info("Loading configuration");
 			Configuration.load();
 		} catch (Exception e1) {
-			log.fatal("Could not load configuration", e1);
+			LOGGER.fatal("Could not load configuration", e1);
 			System.exit(1);
 		}
 
@@ -54,7 +57,7 @@ public class App {
 
 		// Start file transfer server
 		if (!FileServer.instance().start()) {
-			log.error("Could not start internal file server.");
+			LOGGER.error("Could not start internal file server.");
 			return;
 		}
 		// Start Server
@@ -68,9 +71,9 @@ public class App {
 			List<ImageSummaryRead> allVisible;
 			try {
 				allVisible = DbImage.getAllVisible(new UserInfo("bla", "blu", null, null, null), null, 0);
-				log.info("Got " + allVisible.size());
+				LOGGER.info("Got " + allVisible.size());
 			} catch (SQLException e) {
-				log.warn("could not test query getallvisible");
+				LOGGER.warn("could not test query getallvisible");
 			}
 			QuickTimer.scheduleAtFixedDelay(new TimerTask() {
 				@Override
@@ -78,6 +81,12 @@ public class App {
 					Database.printDebug();
 				}
 			}, 100, 5000);
+			NetRule nr = new NetRule(2, NetDirection.OUT, "dsafg", 1336);
+			String data = Json.serialize(nr);
+			LOGGER.info(data);
+			Json.registerThriftClass(NetRule.class);
+			NetRule nn = Json.deserializeThrift(data, NetRule.class);
+			LOGGER.info(nn);
 		}
 		// Wait for servers
 		for (Thread wait : servers) {
@@ -92,7 +101,7 @@ public class App {
 			}
 		}
 		QuickTimer.cancel();
-		log.info(new Date() + " - all Servers shut down, exiting...\n");
+		LOGGER.info(new Date() + " - all Servers shut down, exiting...\n");
 	}
 
 }