You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/09/15 16:00:28 UTC
openmeetings git commit: [OPENMEETINGS-1671] import/export seems to
work
Repository: openmeetings
Updated Branches:
refs/heads/OPENMEETINGS-1671-room-files 541bb1dc4 -> 6eec97dce
[OPENMEETINGS-1671] import/export seems to work
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/6eec97dc
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/6eec97dc
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/6eec97dc
Branch: refs/heads/OPENMEETINGS-1671-room-files
Commit: 6eec97dced3a938e9c216b3068f106fb7d8656b9
Parents: 541bb1d
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Sep 15 23:00:21 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Sep 15 23:00:21 2017 +0700
----------------------------------------------------------------------
.../apache/openmeetings/backup/AppointmentConverter.java | 10 +++++-----
.../org/apache/openmeetings/backup/BackupImport.java | 11 +++++++++--
.../openmeetings/backup/BaseFileItemConverter.java | 4 ++--
.../org/apache/openmeetings/backup/DateConverter.java | 2 +-
.../org/apache/openmeetings/backup/GroupConverter.java | 10 +++++-----
.../apache/openmeetings/backup/PollTypeConverter.java | 4 ++--
.../org/apache/openmeetings/backup/RoomConverter.java | 8 ++++----
.../apache/openmeetings/backup/RoomTypeConverter.java | 4 ++--
.../apache/openmeetings/backup/SalutationConverter.java | 2 +-
.../org/apache/openmeetings/backup/UserConverter.java | 10 +++++-----
10 files changed, 36 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6eec97dc/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java
index 79ee837..c219331 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentConverter.java
@@ -28,21 +28,21 @@ import org.simpleframework.xml.stream.OutputNode;
public class AppointmentConverter extends OmConverter<Appointment> {
private AppointmentDao appointmentDao;
private Map<Long, Long> idMap;
-
+
public AppointmentConverter() {
//default constructor is for export
}
-
+
public AppointmentConverter(AppointmentDao appointmentDao, Map<Long, Long> idMap) {
this.appointmentDao = appointmentDao;
this.idMap = idMap;
}
-
+
@Override
public Appointment read(InputNode node) throws Exception {
long oldId = getLong(node);
Long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : oldId;
-
+
Appointment a = appointmentDao.getAny(newId);
return a == null ? new Appointment() : a;
}
@@ -52,4 +52,4 @@ public class AppointmentConverter extends OmConverter<Appointment> {
node.setData(true);
node.setValue(value == null ? "0" : "" + value.getId());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6eec97dc/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index 14d60a5..414bb50 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -716,9 +716,16 @@ public class BackupImport {
registry.bind(BaseFileItem.class, new BaseFileItemConverter(fileItemDao, fileItemMap));
- List<RoomFile> list = readList(serializer, f, "roomFiles.xml", "RoomFiles", RoomFile.class);
+ List<RoomFile> list = readList(serializer, f, "roomFiles.xml", "RoomFiles", RoomFile.class, true);
for (RoomFile rf : list) {
- int i = 0;
+ Room r = roomDao.get(roomMap.get(rf.getRoomId()));
+ if (r.getFiles() == null) {
+ r.setFiles(new ArrayList<>());
+ }
+ rf.setId(null);
+ rf.setRoomId(r.getId());
+ r.getFiles().add(rf);
+ roomDao.update(r, null);
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6eec97dc/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BaseFileItemConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BaseFileItemConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BaseFileItemConverter.java
index 3e0cb41..def8fa5 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BaseFileItemConverter.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BaseFileItemConverter.java
@@ -51,7 +51,7 @@ public class BaseFileItemConverter extends OmConverter<BaseFileItem> {
@Override
public void write(OutputNode node, BaseFileItem value) throws Exception {
node.setData(true);
- node.setAttribute("type", Long.class.getCanonicalName());
+ node.getAttributes().forEach(name -> node.getAttributes().remove(name));
node.setValue(value == null ? "0" : "" + value.getId());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6eec97dc/openmeetings-install/src/main/java/org/apache/openmeetings/backup/DateConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/DateConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/DateConverter.java
index 7f3967d..7066ce9 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/DateConverter.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/DateConverter.java
@@ -38,4 +38,4 @@ public class DateConverter implements Converter<Date> {
node.setData(true);
node.setValue(value == null ? "0" : CalendarPatterns.getExportDate(value));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6eec97dc/openmeetings-install/src/main/java/org/apache/openmeetings/backup/GroupConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/GroupConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/GroupConverter.java
index 67c363b..7a07fe8 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/GroupConverter.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/GroupConverter.java
@@ -28,21 +28,21 @@ import org.simpleframework.xml.stream.OutputNode;
public class GroupConverter extends OmConverter<Group> {
private GroupDao groupDao;
private Map<Long, Long> idMap;
-
+
public GroupConverter() {
//default constructor is for export
}
-
+
public GroupConverter(GroupDao groupDao, Map<Long, Long> idMap) {
this.groupDao = groupDao;
this.idMap = idMap;
}
-
+
@Override
public Group read(InputNode node) throws Exception {
long oldId = getLong(node);
long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : oldId;
-
+
Group o = groupDao.get(newId);
return o == null ? new Group() : o;
}
@@ -52,4 +52,4 @@ public class GroupConverter extends OmConverter<Group> {
node.setData(true);
node.setValue(value == null ? "0" : "" + value.getId());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6eec97dc/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java
index 365904d..d627139 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java
@@ -24,7 +24,7 @@ import org.simpleframework.xml.stream.OutputNode;
public class PollTypeConverter extends OmConverter<RoomPoll.Type> {
public PollTypeConverter() {}
-
+
@Override
public RoomPoll.Type read(InputNode node) throws Exception {
return RoomPoll.Type.get(getLong(node));
@@ -35,4 +35,4 @@ public class PollTypeConverter extends OmConverter<RoomPoll.Type> {
node.setData(true);
node.setValue(value == null ? "0" : "" + value.getId());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6eec97dc/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomConverter.java
index 20ccba1..a47c036 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomConverter.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomConverter.java
@@ -28,16 +28,16 @@ import org.simpleframework.xml.stream.OutputNode;
public class RoomConverter extends OmConverter<Room> {
private RoomDao roomDao;
private Map<Long, Long> idMap;
-
+
public RoomConverter() {
//default constructor is for export
}
-
+
public RoomConverter(RoomDao roomDao, Map<Long, Long> idMap) {
this.roomDao = roomDao;
this.idMap = idMap;
}
-
+
@Override
public Room read(InputNode node) throws Exception {
long oldId = getLong(node);
@@ -52,4 +52,4 @@ public class RoomConverter extends OmConverter<Room> {
node.setData(true);
node.setValue(value == null ? "0" : "" + value.getId());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6eec97dc/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java
index a6f8f5b..b5f3543 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java
@@ -24,7 +24,7 @@ import org.simpleframework.xml.stream.OutputNode;
public class RoomTypeConverter extends OmConverter<Type> {
public RoomTypeConverter() {}
-
+
@Override
public Type read(InputNode node) throws Exception {
return Type.get(getInt(node));
@@ -35,4 +35,4 @@ public class RoomTypeConverter extends OmConverter<Type> {
node.setData(true);
node.setValue(value == null ? "0" : "" + value.getId());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6eec97dc/openmeetings-install/src/main/java/org/apache/openmeetings/backup/SalutationConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/SalutationConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/SalutationConverter.java
index 59e680a..7824802 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/SalutationConverter.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/SalutationConverter.java
@@ -33,4 +33,4 @@ public class SalutationConverter extends OmConverter<Salutation> {
node.setData(true);
node.setValue(value == null ? "0" : "" + value.getId());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6eec97dc/openmeetings-install/src/main/java/org/apache/openmeetings/backup/UserConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/UserConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/UserConverter.java
index 696bd8c..4853efa 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/UserConverter.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/UserConverter.java
@@ -28,21 +28,21 @@ import org.simpleframework.xml.stream.OutputNode;
public class UserConverter extends OmConverter<User> {
private UserDao userDao;
private Map<Long, Long> idMap;
-
+
public UserConverter() {
//default constructor is for export
}
-
+
public UserConverter(UserDao userDao, Map<Long, Long> idMap) {
this.userDao = userDao;
this.idMap = idMap;
}
-
+
@Override
public User read(InputNode node) throws Exception {
long oldId = getLong(node);
Long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : oldId;
-
+
User u = userDao.get(newId);
return u == null ? new User() : u;
}
@@ -52,4 +52,4 @@ public class UserConverter extends OmConverter<User> {
node.setData(true);
node.setValue(value == null ? "0" : "" + value.getId());
}
-}
\ No newline at end of file
+}