Clean up Redundant Code and Add Code Optimization.
Issue-ID: SDC-1078
Change-Id: Ic6d03acf811df443c02df1753ea95aa4bf36da62
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
/**
- * Copyright (c) 2017 ZTE Corporation.
+ * Copyright (c) 2017-2018 ZTE Corporation.
* All rights reserved. This program and the accompanying materials
* are made available under the Apache License, Version 2.0
* and the Eclipse Public License v1.0 which both accompany this distribution,
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
-import java.nio.file.DirectoryStream;
import java.nio.file.Files;
-import java.nio.file.Path;
import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class FileCommonUtils {
private static final Logger logger = LoggerFactory.getLogger(FileCommonUtils.class);
- private static final int KILO_BYTE = 1024; // 1K
- private static final int MEGA_BYTE = 1024 * 1024; // 1M
- private static final int GIGA_BYTE = 1024 * 1024 * 1024; // 1G
-
- private static final int TRY_COUNT = 3;
-
- /**
- *
- * @param srcAbsolutePath
- * @param destAbsolutePath
- */
- public static void rename(String srcAbsolutePath, String destAbsolutePath) {
- File dest = new File(destAbsolutePath);
- new File(srcAbsolutePath).renameTo(dest);
- }
-
- /**
- *
- * @param filePath
- * @return
- */
- public static String getFileName(String filePath) {
- return new File(filePath).getName();
- }
-
- /**
- *
- * @param filePath
- * @return
- */
- public static String getFilePath(String filePath) {
- return new File(filePath).getParent();
- }
-
/**
* @param ins
*/
}
}
}
+
/**
*
}
}
}
+
/**
* @param reader
}
}
}
+
/**
*
}
}
- /**
- * @param sourecePath
- * @param targetPath
- * @throws IOException
- */
- public static void copy(Path sourecePath, Path targetPath) throws IOException {
- if (!sourecePath.toFile().exists()) {
- return;
- }
-
- if (Files.isDirectory(sourecePath)) {
- List<Path> paths = list(sourecePath);
- for (Path path : paths) {
- copy(path, targetPath.resolve(path.getFileName()));
- }
-
- return;
- }
-
- if (!targetPath.getParent().toFile().exists()) {
- targetPath.getParent().toFile().mkdirs();
- }
- Files.copy(sourecePath, targetPath, StandardCopyOption.REPLACE_EXISTING);
- }
-
- /**
- * create folder.
- *
- * @param path folder path to create
- * @return boolean
- */
- public static boolean createDirectory(String path) {
- File folder = new File(path);
- int tryCount = 0;
- while (tryCount < FileCommonUtils.TRY_COUNT) {
- tryCount++;
- if (!folder.exists() && !folder.mkdirs()) {
- continue;
- } else {
- return true;
- }
- }
-
- return folder.exists();
- }
-
- /**
- * delete the file and file directory.
- *
- * @param file file
- * @return boolean
- */
- public static void delete(File file) {
- logger.info("delete file = {}", file);
-
- if (file.isDirectory()) {
- String[] children = file.list();
- if (children != null) {
- for (int i = 0; i < children.length; i++) {
- delete(new File(file, children[i]));
- }
- }
- }
-
- deleteFile(file);
- }
-
- /**
- *
- * @param file
- */
- public static void deleteFile(File file) {
- logger.info("deleteFile file = {}", file);
-
- try {
- FileUtils.forceDelete(file);
- } catch (IOException e) {
- logger.warn("deleteFile error. {}", file, e);
- }
- }
-
- public static String formatFileSize(double fileLength, int fileUnit) {
- DecimalFormat format = new DecimalFormat("#0.00");
- return format.format(fileLength / fileUnit) + "M";
- }
-
- /**
- * get file size.
- *
- * @param file file which to get the size
- * @param fileUnit file unit
- * @return String file size
- */
- public static String getFileSize(File file, int fileUnit) {
- String fileSize = "";
- DecimalFormat format = new DecimalFormat("#0.00");
- if (file.exists()) {
- fileSize = format.format((double) file.length() / fileUnit) + "M";
- }
- return fileSize;
- }
-
- /**
- * get file size by content.
- *
- * @param contentRange content range
- * @return String
- */
- public static String getFileSizeByContent(String contentRange) {
- String size =
- contentRange.substring(contentRange.indexOf("/") + 1, contentRange.length()).trim();
- return formatFileSize(Double.parseDouble(size), MEGA_BYTE);
- }
-
- /**
- * get the size format according file size.
- *
- * @param fileSize file size
- * @return size format
- */
- public static String getFormatFileSize(long fileSize) {
- if (fileSize >= GIGA_BYTE) {
- return String.format("%.1f GB", (float) fileSize / (long) GIGA_BYTE);
- } else if (fileSize >= MEGA_BYTE) {
- float fi = (float) fileSize / (long) MEGA_BYTE;
- return String.format(fi > 100 ? "%.0f MB" : "%.1f MB", fi);
- } else if (fileSize >= KILO_BYTE) {
- float fi = (float) fileSize / (long) KILO_BYTE;
- return String.format(fi > 100 ? "%.0f KB" : "%.1f KB", fi);
- } else {
- return String.format("%d B", fileSize);
- }
- }
-
- public static long getFileSize(String path) {
- return getFileSize(new File(path));
- }
-
- /**
- *
- * @param file
- * @return
- */
- public static long getFileSize(final File file) {
- if (file.isFile()) {
- return file.length();
- }
-
- final File[] children = file.listFiles();
- long total = 0;
- if (children != null) {
- for (final File child : children) {
- total += getFileSize(child);
- }
- }
-
- return total;
- }
-
- /**
- *
- * @param path
- * @return
- * @throws IOException
- */
- public static List<Path> list(Path path) throws IOException {
- if (!path.toFile().isDirectory()) {
- return new ArrayList<>();
- }
-
- List<Path> list = new ArrayList<>();
- DirectoryStream<Path> ds = null;
- try {
- ds = Files.newDirectoryStream(path);
- for (Path p : ds) {
- list.add(p);
- }
- } finally {
- if (ds != null) {
- ds.close();
- }
- }
-
- return list;
- }
-
- /**
- * @param path
- * @return
- * @throws IOException
- */
- public static List<String> listFileName(Path path) throws IOException {
- List<String> list = new ArrayList<>();
- DirectoryStream<Path> ds = null;
- try {
- ds = Files.newDirectoryStream(path);
- for (Path p : ds) {
- list.add(p.getFileName().toString());
- }
- } finally {
- if (ds != null) {
- ds.close();
- }
- }
-
- return list;
- }
-
- /**
- *
- * @param srcPath
- * @param destPath
- * @throws IOException
- */
- public static void moveDirectory(String srcPath, String destPath) throws IOException {
- File destDirectory = new File(destPath);
- File srcDirectory = new File(srcPath);
- FileUtils.deleteDirectory(destDirectory);
- FileUtils.copyDirectory(srcDirectory, destDirectory);
- FileUtils.deleteDirectory(srcDirectory);
- }
/**
*
return lineList.toArray(new String[0]);
}
+
/**
*
public static String readString(InputStream ins) throws IOException {
return IOUtils.toString(ins, "UTF-8");
}
+
/**
*
}
}
+
/**
*
* @param ins
closeOutputStream(os);
}
}
+
/**
*
throws IOException {
writetoAbsoluteFile(path, fileName, content, FileCommonConstants.DEFAULT_CHARSET_NAME);
}
+
/**
*
String charsetName) throws IOException {
write(path, fileName, content, charsetName);
}
+
/**
*
write(".", fileName, s, FileCommonConstants.DEFAULT_CHARSET_NAME);
}
+
/**
*
closeOutputStream(out);
}
}
+
/**
*
write(".", fileName, s, charsetName);
}
+
/**
*
* @param fileName
public static void write(String fileName, String[] ss) throws IOException {
write(fileName, ss, FileCommonConstants.DEFAULT_CHARSET_NAME);
}
+
/**
*
write(sb.toString(), fileName, charsetName);
}
- /**
- *
- * @param rootPath
- * @param more
- * @return
- */
- public static String buildAbsolutePath(String rootPath, String... more) {
- Path absolutePath = Paths.get(rootPath, more);
- return absolutePath.toFile().getAbsolutePath();
- }
-
}
/**
*
- * @author 10090474
- *
*/
public class RestUtils {
public static InternalServerErrorException newInternalServerErrorException(Exception e) {
+++ /dev/null
-/**
- * Copyright (c) 2017 ZTE Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the Apache License, Version 2.0
- * and the Eclipse Public License v1.0 which both accompany this distribution,
- * and are available at http://www.eclipse.org/legal/epl-v10.html
- * and http://www.apache.org/licenses/LICENSE-2.0
- *
- * Contributors:
- * ZTE - initial API and implementation and/or initial documentation
- */
-
-package org.onap.sdc.workflowdesigner.utils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
-import org.apache.commons.collections.MapUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * common utility class.
- *
- */
-public class ToolUtils {
- static final Logger logger = LoggerFactory.getLogger(ToolUtils.class);
-
- /**
- * @param array
- * @param t
- * @param ts
- * @return
- */
- public static <T> T[] addElement2Array(T[] array, T t, T[] ts) {
- List<T> list = new ArrayList<>();
- if (isNotEmpty(array)) {
- list.addAll(Arrays.asList(array));
- }
- list.add(t);
-
- return list.toArray(ts);
- }
-
- /**
- *
- * @param name
- * @param v
- * @return
- */
- public static <K, V> Entry<K, V> buildEntry(K name, V v) {
- return buildMapObject(name, v).entrySet().iterator().next();
- }
-
- /**
- * @param key
- * @param v
- * @return
- */
- public static <K, V> Map<K, V> buildMapObject(K key, V v) {
- Map<K, V> map = new HashMap<>();
- map.put(key, v);
- return map;
- }
-
- /**
- *
- * @return
- */
- public static String generateUUID() {
- return UUID.randomUUID().toString();
- }
-
- /**
- *
- * @param path
- * @return
- */
- public static String getRuntimePath(String path) {
- return Class.class.getClass().getResource("/").getPath() + path;
- }
-
- /**
- *
- * @param map
- * @return
- */
- @SuppressWarnings("unchecked")
- public static <K, V> Map<V, K> invertMap(Map<K, V> map) {
- if (isEmpty(map)) {
- return new HashMap<>();
- }
-
- return MapUtils.invertMap(map);
- }
-
- /**
- *
- * @param coll
- * @return
- */
- public static boolean isEmpty(Collection<?> coll) {
- return null == coll || coll.isEmpty();
- }
-
- /**
- * @param map
- * @return
- */
- public static <K, V> boolean isEmpty(Map<K, V> map) {
- return map == null || map.isEmpty();
- }
-
- /**
- * @param val
- * @return
- */
- public static boolean isEmpty(String val) {
- return val == null || val.trim().isEmpty();
- }
-
- /**
- *
- * @param t
- * @return
- */
- public static <T> boolean isEmpty(T t) {
- return t == null || t.toString().isEmpty();
- }
-
- /**
- *
- * @param array
- * @return
- */
- public static <T> boolean isEmpty(T[] array) {
- return array == null || array.length == 0;
- }
-
- /**
- *
- * @param x
- * @param y
- * @return
- */
- public static <T> boolean isEqual(final T x, final T y) {
- return x == y || (x != null && y != null && x.equals(y));
- }
-
- /**
- *
- * @param coll
- * @return
- */
- public static boolean isNotEmpty(Collection<?> coll) {
- return null != coll && !coll.isEmpty();
- }
-
- /**
- *
- * @param map
- * @return
- */
- public static <K, V> boolean isNotEmpty(Map<K, V> map) {
- return map != null && !map.isEmpty();
- }
-
- /**
- *
- * @param val
- * @return
- */
- public static boolean isNotEmpty(String val) {
- return val != null && !val.trim().isEmpty();
- }
-
- /**
- *
- * @param t
- * @return
- */
- public static <T> boolean isNotEmpty(T t) {
- return t != null && !t.toString().isEmpty();
- }
-
- /**
- *
- * @param array
- * @return
- */
- public static <T> boolean isNotEmpty(T[] array) {
- return array != null && array.length > 0;
- }
-
- private static <K, V> Map<K, V> merge(Map<K, V> mapA, Map<K, V> mapB) {
- Map<K, V> target = new HashMap<>();
- if (!isEmpty(mapA)) {
- target.putAll(mapA);
- }
- if (!isEmpty(mapB)) {
- target.putAll(mapB);
- }
- return target;
- }
-
- /**
- * @param mapA
- * @param mapB
- * @param override
- * @return
- */
- public static <K, V> Map<K, V> merge(Map<K, V> mapA, Map<K, V> mapB, boolean override) {
- if (override) {
- return merge(mapA, mapB);
- }
-
- return merge(mapB, mapA);
- }
-
- /**
- *
- * @param keySet
- * @param origalKey
- * @return
- */
- public static String newNonRepetitiveKey(Set<String> keySet, String origalKey) {
- return newNonRepetitiveKey(keySet, origalKey, 1);
- }
-
- /**
- *
- * @param keySet
- * @param origalKey
- * @param index
- * @return
- */
- public static String newNonRepetitiveKey(Set<String> keySet, String origalKey, int index) {
- String key = origalKey + index;
- while (keySet.contains(key)) {
- index++;
- key = origalKey + index;
- }
-
- return key;
- }
-
-}
-/**
- * Copyright (c) 2018 ZTE Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the Apache License, Version 2.0
- * and the Eclipse Public License v1.0 which both accompany this distribution,
- * and are available at http://www.eclipse.org/legal/epl-v10.html
- * and http://www.apache.org/licenses/LICENSE-2.0
- *
- * Contributors:
- * ZTE - initial API and implementation and/or initial documentation
- */
-
-package org.onap.sdc.workflowdesigner.utils;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- *
- */
-public class FileCommonUtilsTest {
-
- /**
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {}
-
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {}
-
- /**
- * Test method for {@link org.onap.sdc.workflowdesigner.utils.FileCommonUtils#readString(String)}
- *
- */
- @Test
- public final void readStringString() {
- String fileName = "src\\test\\resources\\workflow\\template-test.bpmn20.xml";
- File file = new File(fileName);
- if (file.exists()) {
- try {
- String s = FileCommonUtils.readString(fileName);
- FileCommonUtils.write("test.xml", s);
- assertEquals(s.isEmpty(), false);
- } catch (IOException e) {
- }
- }
- }
-
-
- /**
- * Test method for
- * {@link org.onap.sdc.workflowdesigner.utils.FileCommonUtils#write(String, String)}
- *
- */
- @Test
- public final void writeStringString() {
- String fileName = "test.json";
- String content = "{\"aaa\": \"节点\"}";
-
- try {
- FileCommonUtils.write(fileName, content);
- String s = FileCommonUtils.readString(fileName);
- assertEquals(s, content);
- } catch (IOException e) {
- }
- }
-
- /**
- * Test method for
- * {@link org.onap.sdc.workflowdesigner.utils.FileCommonUtils#writetoAbsoluteFile(String, String, String)}
- *
- */
- @Test
- public final void saveFileStringStringString() {
- String fileName = "test1.json";
- String content = "{\"aaa\": \"节点\"}";
-
- try {
- FileCommonUtils.writetoAbsoluteFile(".", fileName, content);
- String s = FileCommonUtils.readString(fileName);
- assertEquals(s, content);
- } catch (IOException e) {
- }
- }
-
-}
+/**\r
+ * Copyright (c) 2017-2018 ZTE Corporation.\r
+ * All rights reserved. This program and the accompanying materials\r
+ * are made available under the Apache License, Version 2.0\r
+ * and the Eclipse Public License v1.0 which both accompany this distribution,\r
+ * and are available at http://www.eclipse.org/legal/epl-v10.html\r
+ * and http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Contributors:\r
+ * ZTE - initial API and implementation and/or initial documentation\r
+ */\r
+package org.onap.sdc.workflowdesigner.utils;\r
+\r
+import static org.junit.Assert.assertEquals;\r
+\r
+import java.io.File;\r
+import java.io.IOException;\r
+\r
+import org.junit.After;\r
+import org.junit.Before;\r
+import org.junit.Test;\r
+\r
+/**\r
+ *\r
+ */\r
+public class FileCommonUtilsTest {\r
+\r
+ /**\r
+ * @throws java.lang.Exception\r
+ */\r
+ @Before\r
+ public void setUp() throws Exception {}\r
+\r
+ /**\r
+ * @throws java.lang.Exception\r
+ */\r
+ @After\r
+ public void tearDown() throws Exception {}\r
+\r
+ /**\r
+ * Test method for {@link org.onap.sdc.workflowdesigner.utils.FileCommonUtils#readLines(java.io.InputStream)}.\r
+ */\r
+ @Test\r
+ public void testReadLines() {\r
+ }\r
+\r
+ /**\r
+ * Test method for {@link org.onap.sdc.workflowdesigner.utils.FileCommonUtils#readString(java.io.InputStream)}.\r
+ */\r
+ @Test\r
+ public void testReadStringInputStream() {\r
+ }\r
+\r
+ /**\r
+ * Test method for {@link org.onap.sdc.workflowdesigner.utils.FileCommonUtils#readString(java.lang.String)}.\r
+ */\r
+ @Test\r
+ public void testReadStringString() {\r
+ String fileName = "src\\test\\resources\\workflow\\template-test.bpmn20.xml";\r
+ File file = new File(fileName);\r
+ if (file.exists()) {\r
+ try {\r
+ String s = FileCommonUtils.readString(fileName);\r
+ FileCommonUtils.write("test.xml", s);\r
+ assertEquals(s.isEmpty(), false);\r
+ } catch (IOException e) {\r
+ }\r
+ }\r
+ }\r
+\r
+ /**\r
+ * Test method for {@link org.onap.sdc.workflowdesigner.utils.FileCommonUtils#saveFile(java.io.InputStream, java.lang.String, java.lang.String)}.\r
+ */\r
+ @Test\r
+ public void testSaveFile() {\r
+ }\r
+\r
+ /**\r
+ * Test method for {@link org.onap.sdc.workflowdesigner.utils.FileCommonUtils#writetoAbsoluteFile(java.lang.String, java.lang.String, java.lang.String)}.\r
+ */\r
+ @Test\r
+ public void testWritetoAbsoluteFileStringStringString() {\r
+ String fileName = "test1.json";\r
+ String content = "{\"aaa\": \"节点\"}";\r
+\r
+ try {\r
+ FileCommonUtils.writetoAbsoluteFile(".", fileName, content);\r
+ String s = FileCommonUtils.readString(fileName);\r
+ assertEquals(s, content);\r
+ } catch (IOException e) {\r
+ }\r
+ }\r
+\r
+ /**\r
+ * Test method for {@link org.onap.sdc.workflowdesigner.utils.FileCommonUtils#writetoAbsoluteFile(java.lang.String, java.lang.String, java.lang.String, java.lang.String)}.\r
+ */\r
+ @Test\r
+ public void testWritetoAbsoluteFileStringStringStringString() {\r
+ }\r
+\r
+ /**\r
+ * Test method for {@link org.onap.sdc.workflowdesigner.utils.FileCommonUtils#write(java.lang.String, java.lang.String)}.\r
+ */\r
+ @Test\r
+ public void testWriteStringString() {\r
+ String fileName = "test.json";\r
+ String content = "{\"aaa\": \"节点\"}";\r
+\r
+ try {\r
+ FileCommonUtils.write(fileName, content);\r
+ String s = FileCommonUtils.readString(fileName);\r
+ assertEquals(s, content);\r
+ } catch (IOException e) {\r
+ }\r
+ }\r
+\r
+ /**\r
+ * Test method for {@link org.onap.sdc.workflowdesigner.utils.FileCommonUtils#write(java.lang.String, java.lang.String, java.lang.String, java.lang.String)}.\r
+ */\r
+ @Test\r
+ public void testWriteStringStringStringString() {\r
+ }\r
+\r
+ /**\r
+ * Test method for {@link org.onap.sdc.workflowdesigner.utils.FileCommonUtils#write(java.lang.String, java.lang.String, java.lang.String)}.\r
+ */\r
+ @Test\r
+ public void testWriteStringStringString() {\r
+ }\r
+\r
+ /**\r
+ * Test method for {@link org.onap.sdc.workflowdesigner.utils.FileCommonUtils#write(java.lang.String, java.lang.String[])}.\r
+ */\r
+ @Test\r
+ public void testWriteStringStringArray() {\r
+ }\r
+\r
+ /**\r
+ * Test method for {@link org.onap.sdc.workflowdesigner.utils.FileCommonUtils#write(java.lang.String, java.lang.String[], java.lang.String)}.\r
+ */\r
+ @Test\r
+ public void testWriteStringStringArrayString() {\r
+ }\r
+\r
+}\r
Code Review / sdc / sdc-workflow-designer.git / commitdiff