From 720ad06767ce6df316e5768b1e1fb63d994320fb Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 3 Dec 2018 12:27:18 +0100 Subject: [server] renamed DbNetshare -> DbLectureNetshare --- .../bwlp/sat/database/mappers/DbLecture.java | 6 +-- .../sat/database/mappers/DbLectureNetshare.java | 63 ++++++++++++++++++++++ .../bwlp/sat/database/mappers/DbNetshare.java | 63 ---------------------- .../java/org/openslx/bwlp/sat/web/WebServer.java | 4 +- 4 files changed, 68 insertions(+), 68 deletions(-) create mode 100644 dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetshare.java delete mode 100644 dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbNetshare.java (limited to 'dozentenmodulserver/src/main/java') 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 ec96dd3c..d79b4fdf 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 @@ -120,7 +120,7 @@ public class DbLecture { stmt.executeUpdate(); writeLocations(connection, lectureId, lecture.locationIds); if (lecture.isSetNetworkShares()) { - DbNetshare.writeNetworkShares(connection, lectureId, lecture.networkShares); + DbLectureNetshare.writeNetworkShares(connection, lectureId, lecture.networkShares); } if (lecture.isSetLdapFilters()) { DbLectureFilter.writeLdapFilters(connection, lectureId, lecture.ldapFilters); @@ -147,7 +147,7 @@ public class DbLecture { setWriteFields(stmt, lectureId, lecture, user); writeLocations(connection, lectureId, lecture.locationIds); if (lecture.isSetNetworkShares()) { - DbNetshare.writeNetworkShares(connection, lectureId, lecture.networkShares); + DbLectureNetshare.writeNetworkShares(connection, lectureId, lecture.networkShares); } if (lecture.isSetLdapFilters()) { DbLectureFilter.writeLdapFilters(connection, lectureId, lecture.ldapFilters); @@ -338,7 +338,7 @@ public class DbLecture { lecture.setUserPermissions(DbLecturePermissions.fromResultSetUser(rs)); User.setCombinedUserPermissions(lecture, user); lecture.setLocationIds(DbLocation.getLectureLocations(connection, lectureId)); - lecture.setNetworkShares(DbNetshare.getLectureNetshares(connection, lectureId)); + lecture.setNetworkShares(DbLectureNetshare.getLectureNetshares(connection, lectureId)); lecture.setLdapFilters(DbLectureFilter.getLectureLdapFilters(connection, lectureId)); return lecture; } catch (SQLException e) { 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 new file mode 100644 index 00000000..1629178b --- /dev/null +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetshare.java @@ -0,0 +1,63 @@ +package org.openslx.bwlp.sat.database.mappers; + +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; + +import org.apache.log4j.Logger; +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.thrift.iface.NetShare; +import org.openslx.util.Json; + +public class DbLectureNetshare { + + private static final Logger LOGGER = Logger.getLogger(DbLectureNetshare.class); + + public static void writeNetworkShares(MysqlConnection connection, String lectureId, List shares) + throws SQLException { + if (lectureId == null || lectureId.isEmpty()) { + return; + } + MysqlStatement delStmt = connection.prepareStatement("DELETE FROM networkshare WHERE lectureid = :lectureid"); + delStmt.setString("lectureid", lectureId); + delStmt.executeUpdate(); + if (shares == null || shares.isEmpty()) { + return; + } + MysqlStatement addStmt = connection + .prepareStatement("INSERT IGNORE INTO networkshare (shareid, lectureid, shareuid, sharedata)" + + " VALUES (DEFAULT, :lectureid, NULL, :sharedata)"); + addStmt.setString("lectureid", lectureId); + for (NetShare share : shares) { + String netshareJson = Json.serialize(share); + addStmt.setString("sharedata", netshareJson); + addStmt.executeUpdate(); + } + } + + public static List getLectureNetshares(String lectureId) throws SQLException { + try (MysqlConnection connection = Database.getConnection()) { + return getLectureNetshares(connection, lectureId); + } catch (SQLException e) { + LOGGER.error("Query failed in DbNetshare.getLectureNetshares()", e); + throw e; + } + } + + public static List getLectureNetshares(MysqlConnection connection, String lectureId) throws SQLException { + List list = new ArrayList<>(); + MysqlStatement netsharestmt = connection + .prepareStatement("SELECT sharedata FROM networkshare WHERE lectureid = :lectureid"); + netsharestmt.setString("lectureid", lectureId); + ResultSet rs = netsharestmt.executeQuery(); + while (rs.next()) { + // TODO get the shares saved on slx-admin, if any shareuid aren't null + list.add(Json.deserializeThrift(rs.getString("sharedata"), NetShare.class)); + } + return list; + } + +} diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbNetshare.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbNetshare.java deleted file mode 100644 index 8377993c..00000000 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbNetshare.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.openslx.bwlp.sat.database.mappers; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; - -import org.apache.log4j.Logger; -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.thrift.iface.NetShare; -import org.openslx.util.Json; - -public class DbNetshare { - - private static final Logger LOGGER = Logger.getLogger(DbNetshare.class); - - public static void writeNetworkShares(MysqlConnection connection, String lectureId, List shares) - throws SQLException { - if (lectureId == null || lectureId.isEmpty()) { - return; - } - MysqlStatement delStmt = connection.prepareStatement("DELETE FROM networkshare WHERE lectureid = :lectureid"); - delStmt.setString("lectureid", lectureId); - delStmt.executeUpdate(); - if (shares == null || shares.isEmpty()) { - return; - } - MysqlStatement addStmt = connection - .prepareStatement("INSERT IGNORE INTO networkshare (shareid, lectureid, shareuid, sharedata)" - + " VALUES (DEFAULT, :lectureid, NULL, :sharedata)"); - addStmt.setString("lectureid", lectureId); - for (NetShare share : shares) { - String netshareJson = Json.serialize(share); - addStmt.setString("sharedata", netshareJson); - addStmt.executeUpdate(); - } - } - - public static List getLectureNetshares(String lectureId) throws SQLException { - try (MysqlConnection connection = Database.getConnection()) { - return getLectureNetshares(connection, lectureId); - } catch (SQLException e) { - LOGGER.error("Query failed in DbNetshare.getLectureNetshares()", e); - throw e; - } - } - - public static List getLectureNetshares(MysqlConnection connection, String lectureId) throws SQLException { - List list = new ArrayList<>(); - MysqlStatement netsharestmt = connection - .prepareStatement("SELECT sharedata FROM networkshare WHERE lectureid = :lectureid"); - netsharestmt.setString("lectureid", lectureId); - ResultSet rs = netsharestmt.executeQuery(); - while (rs.next()) { - // TODO get the shares saved on slx-admin, if any shareuid aren't null - list.add(Json.deserializeThrift(rs.getString("sharedata"), NetShare.class)); - } - return list; - } - -} 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 e87ffdc8..2f742420 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 @@ -9,7 +9,7 @@ import java.util.Map; import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.log4j.Logger; import org.openslx.bwlp.sat.database.mappers.DbLecture; -import org.openslx.bwlp.sat.database.mappers.DbNetshare; +import org.openslx.bwlp.sat.database.mappers.DbLectureNetshare; import org.openslx.bwlp.sat.fileserv.FileServer; import org.openslx.bwlp.thrift.iface.LectureRead; import org.openslx.bwlp.thrift.iface.NetRule; @@ -199,7 +199,7 @@ public class WebServer extends NanoHTTPD { private Response serveLectureNetshares(String lectureId) { List list = null; try { - list = DbNetshare.getLectureNetshares(lectureId); + list = DbLectureNetshare.getLectureNetshares(lectureId); // TODO handling not found necessary? } catch (SQLException e) { return internalServerError(); -- cgit v1.2.3-55-g7522