[server] Json.deserializeThrift -> Json.deserialize

4 files changed, 12 insertions, 8 deletions

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbConfiguration.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbConfiguration.java
index a94a7441..84df8685 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbConfiguration.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbConfiguration.java
@@ -120,7 +120,7 @@ public class DbConfiguration {
 		byte[] conf = retrieve(KEY_LIMITS);
 		if (conf == null)
 			return null;
-		return Json.deserializeThrift(new String(conf, StandardCharsets.UTF_8), SatelliteConfig.class);
+		return Json.deserialize(new String(conf, StandardCharsets.UTF_8), SatelliteConfig.class);
 	}
 	
 	public static void setSatelliteConfig(SatelliteConfig config) throws SQLException {
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 d79b4fdf..57ae7778 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
@@ -322,7 +322,7 @@ public class DbLecture {
 			String netrules = rs.getString("netrules");
 			if (netrules != null) {
 				try {
-					NetRule[] rules = Json.deserializeThrift(netrules, NetRule[].class);
+					NetRule[] rules = Json.deserialize(netrules, NetRule[].class);
 					if (rules != null) {
 						lecture.setNetworkExceptions(Arrays.asList(rules));
 					}
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetshare.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetshare.java
index 5287971c..1748f4ba 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetshare.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetshare.java
@@ -58,7 +58,7 @@ public class DbLectureNetshare {
 		netsharestmt.setString("lectureid", lectureId);
 		ResultSet rs = netsharestmt.executeQuery();
 		while (rs.next()) {
-			list.add(Json.deserializeThrift(rs.getString("sharedata"), NetShare.class));
+			list.add(Json.deserialize(rs.getString("sharedata"), NetShare.class));
 		}
 		return list;
 	}
@@ -70,7 +70,7 @@ public class DbLectureNetshare {
 					.prepareStatement("SELECT shareid, sharedata" + " FROM presetnetworkshare");
 			ResultSet rs = stmt.executeQuery();
 			while (rs.next()) {
-				list.add(Json.deserializeThrift(rs.getString("sharedata"), NetShare.class)
+				list.add(Json.deserialize(rs.getString("sharedata"), NetShare.class)
 						.setShareId(rs.getInt("shareid")));
 			}
 			return list;
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbUser.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbUser.java
index 7084acc2..83b738a1 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbUser.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbUser.java
@@ -301,10 +301,14 @@ public class DbUser {
 	 */
 	public static void deleteUser(UserInfo user) throws SQLException {
 		try (MysqlConnection connection = Database.getConnection()) {
-			MysqlStatement stmt = connection.prepareStatement("DELETE FROM user WHERE userid = :userid");
-			stmt.setString("userid", user.userId);
-			stmt.executeUpdate();
-			connection.commit();
+			try {
+				MysqlStatement stmt = connection.prepareStatement("DELETE FROM user WHERE userid = :userid");
+				stmt.setString("userid", user.userId);
+				stmt.executeUpdate();
+				connection.commit();
+			} catch (Exception e) {
+				connection.rollback();
+			}
 		} catch (SQLException e) {
 			throw e;
 		}