From 6d27bb8d9350ba1830d3b1c618838b8631cfed16 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 12 Dec 2016 17:14:12 +0300 Subject: [PATCH] Minor changes Remove this unused import, naming convention --- .../zeppelin/file/HDFSFileInterpreter.java | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/file/src/main/java/org/apache/zeppelin/file/HDFSFileInterpreter.java b/file/src/main/java/org/apache/zeppelin/file/HDFSFileInterpreter.java index c2caa11d5ae..1b2b01c3cf4 100644 --- a/file/src/main/java/org/apache/zeppelin/file/HDFSFileInterpreter.java +++ b/file/src/main/java/org/apache/zeppelin/file/HDFSFileInterpreter.java @@ -23,9 +23,7 @@ import com.google.gson.Gson; import org.apache.commons.lang.StringUtils; -import org.apache.zeppelin.interpreter.Interpreter; import org.apache.zeppelin.interpreter.InterpreterException; -import org.apache.zeppelin.interpreter.InterpreterPropertyBuilder; import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion; /** @@ -75,19 +73,19 @@ public class OneFileStatus { public String type; public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("\nAccessTime = " + accessTime); - sb.append("\nBlockSize = " + blockSize); - sb.append("\nChildrenNum = " + childrenNum); - sb.append("\nFileId = " + fileId); - sb.append("\nGroup = " + group); - sb.append("\nLength = " + length); - sb.append("\nModificationTime = " + modificationTime); - sb.append("\nOwner = " + owner); - sb.append("\nPathSuffix = " + pathSuffix); - sb.append("\nPermission = " + permission); - sb.append("\nReplication = " + replication); - sb.append("\nStoragePolicy = " + storagePolicy); - sb.append("\nType = " + type); + sb.append("\nAccessTime = ").append(accessTime); + sb.append("\nBlockSize = ").append(blockSize); + sb.append("\nChildrenNum = ").append(childrenNum); + sb.append("\nFileId = ").append(fileId); + sb.append("\nGroup = ").append(group); + sb.append("\nLength = ").append(length); + sb.append("\nModificationTime = ").append(modificationTime); + sb.append("\nOwner = ").append(owner); + sb.append("\nPathSuffix = ").append(pathSuffix); + sb.append("\nPermission = ").append(permission); + sb.append("\nReplication = ").append(replication); + sb.append("\nStoragePolicy = ").append(storagePolicy); + sb.append("\nType = ").append(type); return sb.toString(); } } @@ -162,7 +160,7 @@ private String listPermission(OneFileStatus fs){ private String listDate(OneFileStatus fs) { return new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date(fs.modificationTime)); } - private String ListOne(String path, OneFileStatus fs) { + private String listOne(String path, OneFileStatus fs) { if (args.flags.contains(new Character('l'))) { StringBuilder sb = new StringBuilder(); sb.append(listPermission(fs) + "\t"); @@ -194,7 +192,7 @@ public String listFile(String filePath) { String str = cmd.runCommand(cmd.getFileStatus, filePath, null); SingleFileStatus sfs = gson.fromJson(str, SingleFileStatus.class); if (sfs != null) { - return ListOne(filePath, sfs.FileStatus); + return listOne(filePath, sfs.FileStatus); } } catch (Exception e) { logger.error("listFile: " + filePath, e); @@ -218,7 +216,7 @@ public String listAll(String path) { allFiles.FileStatuses.FileStatus != null) { for (OneFileStatus fs : allFiles.FileStatuses.FileStatus) - all = all + ListOne(path, fs) + '\n'; + all = all + listOne(path, fs) + '\n'; } } return all;