Repository: openmeetings Updated Branches: refs/heads/master 0bec78526 -> c1d679c4a
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/c1d679c4 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/c1d679c4 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/c1d679c4 Branch: refs/heads/master Commit: c1d679c4afd22314c0fc040e3ffe8500deadbcf7 Parents: 0bec785 Author: Maxim Solodovnik <[email protected]> Authored: Fri Sep 29 21:28:52 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Fri Sep 29 21:28:52 2017 +0700 ---------------------------------------------------------------------- .../core/converter/FlvExplorerConverter.java | 2 +- .../core/converter/ImageConverter.java | 17 +- .../core/data/file/FileProcessor.java | 2 +- .../test/asf/AsfCopyRightReplace.java | 203 ------------------- .../AppointmentReminderTypeConverter.java | 4 - .../openmeetings/backup/BackupExport.java | 22 +- .../openmeetings/backup/BackupImport.java | 91 ++------- .../openmeetings/backup/InlineConverter.java | 29 --- .../openmeetings/backup/IntegerTransform.java | 3 +- .../openmeetings/backup/PollTypeConverter.java | 2 - .../backup/RecordingStatusConverter.java | 1 - .../openmeetings/backup/RoomTypeConverter.java | 2 - .../apache/openmeetings/cli/CleanupHelper.java | 14 +- .../service/quartz/scheduler/CleanupJob.java | 10 +- 14 files changed, 39 insertions(+), 363 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c1d679c4/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java index 9d19f7e..9f937bf 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java @@ -40,7 +40,7 @@ import org.springframework.stereotype.Component; public class FlvExplorerConverter extends BaseConverter { private static final Logger log = Red5LoggerFactory.getLogger(FlvExplorerConverter.class, getWebAppRootKey()); - public List<ConverterProcessResult> convertToMP4(FileItem f, String ext) { + public List<ConverterProcessResult> convertVideo(FileItem f, String ext) { List<ConverterProcessResult> logs = new ArrayList<>(); try { File mp4 = f.getFile(EXTENSION_MP4); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c1d679c4/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java index 5924f2f..1b20308 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java @@ -33,7 +33,6 @@ import static org.apache.openmeetings.util.process.ConverterProcessResult.ZERO; import static org.apache.tika.metadata.HttpHeaders.CONTENT_TYPE; import java.io.File; -import java.io.FileFilter; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; @@ -87,12 +86,7 @@ public class ImageConverter extends BaseConverter { ConverterProcessResultList returnMap = new ConverterProcessResultList(); // User Profile Update - File[] files = getUploadProfilesUserDir(userId).listFiles(new FileFilter() { - @Override - public boolean accept(File pathname) { - return pathname.getName().endsWith(EXTENSION_JPG); - } - }); + File[] files = getUploadProfilesUserDir(userId).listFiles(fi -> fi.getName().endsWith(EXTENSION_JPG)); if (files != null) { for (File f : files) { FileUtils.deleteQuietly(f); @@ -118,8 +112,6 @@ public class ImageConverter extends BaseConverter { userDao.update(us, userId); //FIXME: After uploading a new picture all other clients should refresh - //scopeApplicationAdapter.updateUserSessionObject(userId, pictureuri); - return returnMap; } @@ -191,12 +183,7 @@ public class ImageConverter extends BaseConverter { ConverterProcessResult res = ProcessHelper.executeScript("convertDocument", argv); list.addItem("convert PDF to images", res); if (res.isOk()) { - File[] pages = pdf.getParentFile().listFiles(new FileFilter() { - @Override - public boolean accept(File f) { - return f.isFile() && f.getName().startsWith(DOC_PAGE_PREFIX) && f.getName().endsWith(EXTENSION_PNG); - } - }); + File[] pages = pdf.getParentFile().listFiles(fi -> fi.isFile() && fi.getName().startsWith(DOC_PAGE_PREFIX) && fi.getName().endsWith(EXTENSION_PNG)); if (pages == null || pages.length == 0) { f.setCount(0); } else { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c1d679c4/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java index ce6d5bd..b3f82a1 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java @@ -122,7 +122,7 @@ public class FileProcessor { result = imageConverter.convertImage(f, sf); } else if (isVideo) { copyFile(temp, file); - List<ConverterProcessResult> returnList = flvExplorerConverter.convertToMP4(f, ext); + List<ConverterProcessResult> returnList = flvExplorerConverter.convertVideo(f, ext); int i = 0; for (ConverterProcessResult returnMap : returnList) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c1d679c4/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java deleted file mode 100644 index 2daa96f..0000000 --- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java +++ /dev/null @@ -1,203 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.test.asf; - -import static java.nio.charset.StandardCharsets.UTF_8; -import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.FilenameFilter; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.io.StringWriter; - -import org.red5.logging.Red5LoggerFactory; -import org.slf4j.Logger; - -public class AsfCopyRightReplace { - private static final Logger log = Red5LoggerFactory.getLogger(AsfCopyRightReplace.class, getWebAppRootKey()); - - private static String asf_copyright = "/*\n" - + " * Licensed to the Apache Software Foundation (ASF) under one\n" - + " * or more contributor license agreements. See the NOTICE file\n" - + " * distributed with this work for additional information\n" - + " * regarding copyright ownership. The ASF licenses this file\n" - + " * to you under the Apache License, Version 2.0 (the\n" - + " * \"License\") + you may not use this file except in compliance\n" - + " * with the License. You may obtain a copy of the License at\n" - + " *\n" - + " * http://www.apache.org/licenses/LICENSE-2.0\n"; - + " *\n" - + " * Unless required by applicable law or agreed to in writing,\n" - + " * software distributed under the License is distributed on an\n" - + " * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n" - + " * KIND, either express or implied. See the License for the\n" - + " * specific language governing permissions and limitations\n" - + " * under the License.\n" + " */\n"; - - private static String asf_xml_copyright = "<!--\n" - + " Licensed to the Apache Software Foundation (ASF) under one\n" - + " or more contributor license agreements. See the NOTICE file\n" - + " distributed with this work for additional information\n" - + " regarding copyright ownership. The ASF licenses this file\n" - + " to you under the Apache License, Version 2.0 (the\n" - + " \"License\"); you may not use this file except in compliance\n" - + " with the License. You may obtain a copy of the License at\n" - + "\n" - + " http://www.apache.org/licenses/LICENSE-2.0\n"; - + "\n" - + " Unless required by applicable law or agreed to in writing,\n" - + " software distributed under the License is distributed on an\n" - + " \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n" - + " KIND, either express or implied. See the License for the\n" - + " specific language governing permissions and limitations\n" - + " under the License.\n" + " \n" + "-->\n"; - - private static String asf_vm_copyright = "#\n" - + "# Licensed to the Apache Software Foundation (ASF) under one\n" - + "# or more contributor license agreements. See the NOTICE file\n" - + "# distributed with this work for additional information\n" - + "# regarding copyright ownership. The ASF licenses this file\n" - + "# to you under the Apache License, Version 2.0 (the\n" - + "# \"License\") + you may not use this file except in compliance\n" - + "# with the License. You may obtain a copy of the License at\n" - + "#\n" - + "# http://www.apache.org/licenses/LICENSE-2.0\n"; - + "#\n" - + "# Unless required by applicable law or agreed to in writing,\n" - + "# software distributed under the License is distributed on an\n" - + "# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n" - + "# KIND, either express or implied. See the License for the\n" - + "# specific language governing permissions and limitations\n" - + "# under the License.\n" + "#/\n"; - - public static void main(String... args) { - scanFolder(new File("./src/main")); - } - - private static void scanFolder(File folder) { - - for (File javaFile : folder.listFiles(new FilenameFilter() { - @Override - public boolean accept(File b, String name) { - return name.endsWith(".java") || name.endsWith(".vm"); - } - })) { - scanAndWriteJavaFile(javaFile); - } - - for (File javaFile : folder.listFiles(new FilenameFilter() { - @Override - public boolean accept(File b, String name) { - return name.endsWith(".xml") || name.endsWith(".lzx"); - } - })) { - scanAndWriteXMLFile(javaFile); - } - - for (File folderFile : folder.listFiles(new FilenameFilter() { - @Override - public boolean accept(File b, String name) { - File f = new File(b, name); - return f.isDirectory(); - } - })) { - scanFolder(folderFile); - } - } - - private static void scanAndWriteXMLFile(File javaFile) { - StringWriter strWriter = new StringWriter(); - try (BufferedReader is = new BufferedReader(new InputStreamReader(new FileInputStream(javaFile), UTF_8))) { - log.debug("Processing " + javaFile.getCanonicalPath()); - - String line; - String firstline = ""; - int i = 0; - - while ((line = is.readLine()) != null) { - if (i == 0) { - firstline = line; - - if (firstline.startsWith("<canvas")) { - strWriter.append(asf_xml_copyright); - } else if (firstline.startsWith("<library")) { - strWriter.append(asf_xml_copyright); - } - } else if (i == 1) { - if (firstline.startsWith("<?xml ") - && !line.startsWith("<!--")) { - strWriter.append(asf_xml_copyright); - } else if (firstline.startsWith("<?xml ") - && !line.startsWith("<library")) { - strWriter.append(asf_xml_copyright); - } else if (firstline.startsWith("<?xml ") - && !line.startsWith("<canvas")) { - strWriter.append(asf_xml_copyright); - } - } - strWriter.append(line + "\n"); - i++; - } - - } catch (Exception err) { - log.error("Error while scanAndWriteXMLFile", err); - } - try (OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(javaFile), UTF_8)) { - out.write(strWriter.toString()); - out.flush(); - } catch (Exception err) { - log.error("Error while scanAndWriteXMLFile", err); - } - } - - private static void scanAndWriteJavaFile(File javaFile) { - StringWriter strWriter = new StringWriter(); - try (BufferedReader is = new BufferedReader(new InputStreamReader(new FileInputStream(javaFile), UTF_8))) { - log.debug("Processing " + javaFile.getCanonicalPath()); - - String line; - int i = 0; - - while ((line = is.readLine()) != null) { - if (i == 0) { - if (line.startsWith("package ")) { - strWriter.append(asf_copyright); - } else if (line.startsWith("## OpenMeetings") - && javaFile.getName().endsWith(".vm")) { - strWriter.append(asf_vm_copyright); - } - } - strWriter.append(line + "\n"); - i++; - } - } catch (Exception err) { - log.error("Error while scanAndWriteJavaFile", err); - } - try (OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(javaFile), UTF_8)) { - out.write(strWriter.toString()); - out.flush(); - } catch (Exception err) { - log.error("Error while scanAndWriteJavaFile", err); - } - } -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c1d679c4/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java index 99f09ed..936b4e9 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java @@ -25,10 +25,6 @@ import org.simpleframework.xml.stream.InputNode; import org.simpleframework.xml.stream.OutputNode; public class AppointmentReminderTypeConverter implements OmConverter<Reminder> { - public AppointmentReminderTypeConverter() { - //default constructor is for export - } - @Override public Reminder read(InputNode node) throws Exception { return Reminder.get(getInt(node)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c1d679c4/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java index 1d310e3..aa50b83 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java @@ -35,6 +35,7 @@ import java.net.URI; import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; +import java.util.Date; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -171,12 +172,10 @@ public class BackupExport { if (includeFiles) { //##################### Backup Room Files for (File file : OmFileHelper.getUploadDir().listFiles()) { - if (file.isDirectory()) { - String fName = file.getName(); - if (!IMPORT_DIR.equals(fName) && !BACKUP_DIR.equals(fName)) { - log.debug("### " + file.getName()); - writeZipDir(BCKP_ROOM_FILES, file.getParentFile().toURI(), file, zos); - } + String fName = file.getName(); + if (file.isDirectory() && !IMPORT_DIR.equals(fName) && !BACKUP_DIR.equals(fName)) { + log.debug("### " + file.getName()); + writeZipDir(BCKP_ROOM_FILES, file.getParentFile().toURI(), file, zos); } } @@ -281,13 +280,16 @@ public class BackupExport { registry.bind(User.class, UserConverter.class); registry.bind(Appointment.Reminder.class, AppointmentReminderTypeConverter.class); registry.bind(Room.class, RoomConverter.class); - if (list != null && !list.isEmpty()) { + if (list != null) { for (Appointment a : list) { + Class<? extends Date> clazz = null; if (a.getStart() != null) { - registry.bind(a.getStart().getClass(), DateConverter.class); - break; + clazz = a.getStart().getClass(); } else if (a.getInserted() != null) { - registry.bind(a.getInserted().getClass(), DateConverter.class); + clazz = a.getInserted().getClass(); + } + if (clazz != null) { + registry.bind(clazz, DateConverter.class); break; } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c1d679c4/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 43f26dd..397b44a 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 @@ -317,10 +317,6 @@ public class BackupImport { private final Map<Long, Long> userContactMap = new HashMap<>(); private final Map<String, String> fileMap = new HashMap<>(); - private enum Maps { - USERS, ORGANISATIONS, CALENDARS, APPOINTMENTS, ROOMS, MESSAGEFOLDERS, USERCONTACTS - }; - private static File validate(String _ename, File intended) throws IOException { final String intendedPath = intended.getCanonicalPath(); String ename = File.pathSeparatorChar != '\\' && _ename.indexOf('\\') > -1 @@ -347,10 +343,8 @@ public class BackupImport { // for each entry to be extracted File fentry = validate(zipentry.getName(), f); File dir = zipentry.isDirectory() ? fentry : fentry.getParentFile(); - if (!dir.exists()) { - if (!dir.mkdirs()) { - log.warn("Failed to create folders: " + dir); - } + if (!dir.exists() && !dir.mkdirs()) { + log.warn("Failed to create folders: {}", dir); } if (!fentry.isDirectory()) { try (FileOutputStream fos = FileUtils.openOutputStream(fentry)) { @@ -434,11 +428,7 @@ public class BackupImport { if (type != null) { c.setType(type); if (Configuration.Type.bool == type) { - if ("1".equals(c.getValue()) || "yes".equals(c.getValue()) || "true".equals(c.getValue())) { - c.setValue("true"); - } else { - c.setValue("false"); - } + c.setValue(String.valueOf("1".equals(c.getValue()) || "yes".equals(c.getValue()) || "true".equals(c.getValue()))); } } Configuration cfg = cfgDao.forceGet(c.getKey()); @@ -633,7 +623,6 @@ public class BackupImport { Strategy strategy = new RegistryStrategy(registry); Serializer serializer = new Persister(strategy); registry.bind(User.class, new UserConverter(userDao, userMap)); - //registry.bind(OmCalendar.SyncType.class, OmCalendarSyncTypeConverter.class); List<OmCalendar> list = readList(serializer, f, "calendars.xml", "calendars", OmCalendar.class, true); for (OmCalendar c : list) { Long id = c.getId(); @@ -797,8 +786,8 @@ public class BackupImport { } for (PrivateMessage p : list) { p.setId(null); - p.setFolderId(getNewId(p.getFolderId(), Maps.MESSAGEFOLDERS)); - p.setUserContactId(getNewId(p.getUserContactId(), Maps.USERCONTACTS)); + p.setFolderId(messageFolderMap.get(p.getFolderId())); + p.setUserContactId(userContactMap.get(p.getUserContactId())); if (p.getRoom() != null && p.getRoom().getId() == null) { p.setRoom(null); } @@ -917,20 +906,20 @@ public class BackupImport { final String msg = fileName + " missing"; if (notThow) { log.debug(msg); + return list; } else { throw new Exception(msg); } - } else { - try (InputStream rootIs = new FileInputStream(xml)) { - InputNode root = NodeBuilder.read(rootIs); - InputNode listNode = root.getNext(); - if (listNodeName.equals(listNode.getName())) { - InputNode item = listNode.getNext(); - while (item != null) { - T o = ser.read(clazz, item, false); - list.add(o); - item = listNode.getNext(); - } + } + try (InputStream rootIs = new FileInputStream(xml)) { + InputNode root = NodeBuilder.read(rootIs); + InputNode listNode = root.getNext(); + if (listNodeName.equals(listNode.getName())) { + InputNode item = listNode.getNext(); + while (item != null) { + T o = ser.read(clazz, item, false); + list.add(o); + item = listNode.getNext(); } } } @@ -1404,7 +1393,7 @@ public class BackupImport { // profile should correspond to the new user id for (File profile : file.listFiles()) { Long oldId = getProfileId(profile); - Long id = oldId != null ? getNewId(oldId, Maps.USERS) : null; + Long id = oldId != null ? userMap.get(oldId) : null; if (id != null) { FileUtils.copyDirectory(profile, getUploadProfilesUserDir(id)); } @@ -1422,7 +1411,7 @@ public class BackupImport { } else { // check if folder is room folder, store it under new id if necessary Long oldId = importLongType(fName); - Long id = oldId != null ? getNewId(oldId, Maps.ROOMS) : null; + Long id = oldId != null ? roomMap.get(oldId) : null; if (id != null) { FileUtils.copyDirectory(file, getUploadRoomDir(id.toString())); } else { @@ -1464,50 +1453,6 @@ public class BackupImport { return val; } - private Long getNewId(Long oldId, Maps map) { - Long newId = null; - switch (map) { - case USERS: - if (userMap.containsKey(oldId)) { - newId = userMap.get(oldId); - } - break; - case ORGANISATIONS: - if (groupMap.containsKey(oldId)) { - newId = groupMap.get(oldId); - } - break; - case CALENDARS: - if (calendarMap.containsKey(oldId)) { - newId = calendarMap.get(oldId); - } - break; - case APPOINTMENTS: - if (appointmentMap.containsKey(oldId)) { - newId = appointmentMap.get(oldId); - } - break; - case ROOMS: - if (roomMap.containsKey(oldId)) { - newId = roomMap.get(oldId); - } - break; - case MESSAGEFOLDERS: - if (messageFolderMap.containsKey(oldId)) { - newId = messageFolderMap.get(oldId); - } - break; - case USERCONTACTS: - if (userContactMap.containsKey(oldId)) { - newId = userContactMap.get(oldId); - } - break; - default: - break; - } - return newId; - } - private static String getCountry(String countryId) { if (countries.isEmpty()) { try (InputStream is = BackupImport.class.getResourceAsStream("countries.properties")) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c1d679c4/openmeetings-install/src/main/java/org/apache/openmeetings/backup/InlineConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/InlineConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/InlineConverter.java deleted file mode 100644 index 67b78d6..0000000 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/InlineConverter.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.backup; - -import org.simpleframework.xml.stream.InputNode; - -public abstract class InlineConverter<T> implements OmConverter<T> { - - String getNextValue(InputNode parent, String name) throws Exception { - InputNode node = parent.getNext(name); - return node != null ? node.getValue() : null; - } -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c1d679c4/openmeetings-install/src/main/java/org/apache/openmeetings/backup/IntegerTransform.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/IntegerTransform.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/IntegerTransform.java index dc7dc7e..cf1cd80 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/IntegerTransform.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/IntegerTransform.java @@ -20,7 +20,7 @@ package org.apache.openmeetings.backup; import org.simpleframework.xml.transform.Transform; -public class IntegerTransform implements Transform<Integer>{ +public class IntegerTransform implements Transform<Integer> { @Override public Integer read(String value) throws Exception { return OmConverter.getInt(value, 0); @@ -30,5 +30,4 @@ public class IntegerTransform implements Transform<Integer>{ public String write(Integer value) throws Exception { return "" + value; } - } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c1d679c4/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 92eec70..93a7230 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 @@ -25,8 +25,6 @@ import org.simpleframework.xml.stream.InputNode; import org.simpleframework.xml.stream.OutputNode; public class PollTypeConverter implements OmConverter<RoomPoll.Type> { - public PollTypeConverter() {} - @Override public RoomPoll.Type read(InputNode node) throws Exception { return RoomPoll.Type.get(getLong(node)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c1d679c4/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RecordingStatusConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RecordingStatusConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RecordingStatusConverter.java index bbdd19e..eee761a 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RecordingStatusConverter.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RecordingStatusConverter.java @@ -30,7 +30,6 @@ import org.slf4j.Logger; public class RecordingStatusConverter implements OmConverter<Recording.Status> { private static final Logger log = Red5LoggerFactory.getLogger(RecordingStatusConverter.class, getWebAppRootKey()); private static final String PROCESSING = "PROCESSING"; - public RecordingStatusConverter() {} @Override public Recording.Status read(InputNode node) throws Exception { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c1d679c4/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 700b68f..6162abe 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 @@ -25,8 +25,6 @@ import org.simpleframework.xml.stream.InputNode; import org.simpleframework.xml.stream.OutputNode; public class RoomTypeConverter implements OmConverter<Type> { - public RoomTypeConverter() {} - @Override public Type read(InputNode node) throws Exception { return Type.get(getInt(node)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c1d679c4/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java index 4897bb7..dc53e90 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java @@ -98,12 +98,7 @@ public class CleanupHelper { List<File> invalid = new ArrayList<>(); List<File> deleted = new ArrayList<>(); int missing = 0; - for (File f : list(hibernateDir, new FilenameFilter() { - @Override - public boolean accept(File dir, String name) { - return name.endsWith(EXTENSION_MP4); - } - })) { + for (File f : list(hibernateDir, (dir, name) -> name.endsWith(EXTENSION_MP4))) { if (!f.isFile()) { log.warn("Recording found is not a file: " + f); continue; @@ -143,12 +138,7 @@ public class CleanupHelper { } private static File[] list(final String hash) { - return list(hibernateDir, new FilenameFilter() { - @Override - public boolean accept(File dir, String name) { - return name.startsWith(hash); - } - }); + return list(hibernateDir, (dir, name) -> name.startsWith(hash)); } private static void add(List<File> list, final String hash) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c1d679c4/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java index 8426db6..4db6031 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java @@ -21,11 +21,10 @@ package org.apache.openmeetings.service.quartz.scheduler; import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4; import static org.apache.openmeetings.util.OmFileHelper.TEST_SETUP_PREFIX; import static org.apache.openmeetings.util.OmFileHelper.getStreamsDir; -import static org.apache.openmeetings.util.OpenmeetingsVariables.isInitComplete; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.isInitComplete; import java.io.File; -import java.io.FileFilter; import java.util.List; import java.util.Map; @@ -83,12 +82,7 @@ public class CleanupJob extends AbstractJob { if (folders != null) { for (File folder : folders) { if (folder.isDirectory()) { - File[] files = folder.listFiles(new FileFilter() { - @Override - public boolean accept(File file) { - return file.getName().startsWith(TEST_SETUP_PREFIX); - } - }); + File[] files = folder.listFiles(fi -> fi.getName().startsWith(TEST_SETUP_PREFIX)); if (files != null) { for (File file : files) { if (file.isFile() && file.lastModified() + testSetupTimeout < System.currentTimeMillis()) {
