[ZEPPELIN-429] Replaced explicit types with diamonds ### What is this PR for?
Changed all occurrences of explicit types to diamonds in the different modules. ### What type of PR is it? Improvement ### Todos ## ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-429 ### How should this be tested? Run the normal Maven build process. ### Screenshots (if appropriate) ### Questions: - Does the licenses files need update? No - Is there breaking changes for older versions? No - Does this needs documentation? No Author: Jan Hentschel <[email protected]> Closes #1551 from HorizonNet/ZEPPELIN-429 and squashes the following commits: 7bde50e [Jan Hentschel] [ZEPPELIN-429] Incorporated latest changes 58a94ac [Jan Hentschel] Merge branch 'master' of https://github.com/apache/zeppelin into ZEPPELIN-429 b56bf24 [Jan Hentschel] [ZEPPELIN-429] Replaced explicit types with diamonds Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/99b975f5 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/99b975f5 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/99b975f5 Branch: refs/heads/master Commit: 99b975f5c567e025317d5d683f2136fe0c696435 Parents: 2f79852 Author: Jan Hentschel <[email protected]> Authored: Fri Oct 28 14:44:42 2016 +0200 Committer: Mina Lee <[email protected]> Committed: Tue Nov 1 11:59:22 2016 +0900 ---------------------------------------------------------------------- .../zeppelin/alluxio/AlluxioInterpreter.java | 4 +-- .../alluxio/AlluxioInterpreterTest.java | 2 +- .../zeppelin/file/HDFSFileInterpreterTest.java | 2 +- .../apache/zeppelin/flink/FlinkInterpreter.java | 6 ++-- .../zeppelin/ignite/IgniteInterpreter.java | 2 +- .../apache/zeppelin/lens/LensInterpreter.java | 4 +-- .../org/apache/zeppelin/livy/LivyHelper.java | 8 ++--- .../zeppelin/pig/PigQueryInterpreter.java | 2 +- .../postgresql/PostgreSqlInterpreter.java | 2 +- .../zeppelin/postgresql/SqlCompleter.java | 6 ++-- .../zeppelin/postgresql/SqlCompleterTest.java | 4 +-- .../apache/zeppelin/shell/ShellInterpreter.java | 2 +- .../apache/zeppelin/spark/DepInterpreter.java | 10 +++--- .../zeppelin/spark/PySparkInterpreter.java | 2 +- .../apache/zeppelin/spark/SparkInterpreter.java | 12 ++++---- .../apache/zeppelin/spark/ZeppelinContext.java | 6 ++-- .../spark/dep/SparkDependencyContext.java | 18 +++++------ .../spark/dep/SparkDependencyResolver.java | 16 +++++----- .../dep/AbstractDependencyResolver.java | 2 +- .../org/apache/zeppelin/dep/Dependency.java | 2 +- .../apache/zeppelin/dep/DependencyContext.java | 16 +++++----- .../apache/zeppelin/dep/DependencyResolver.java | 10 +++--- .../apache/zeppelin/dep/TransferListener.java | 2 +- .../apache/zeppelin/display/AngularObject.java | 5 ++- .../zeppelin/display/AngularObjectRegistry.java | 7 ++--- .../java/org/apache/zeppelin/display/GUI.java | 8 ++--- .../java/org/apache/zeppelin/display/Input.java | 8 ++--- .../zeppelin/helium/ApplicationLoader.java | 2 +- .../interpreter/InterpreterContext.java | 3 +- .../zeppelin/interpreter/InterpreterGroup.java | 10 +++--- .../interpreter/InterpreterHookRegistry.java | 3 +- .../zeppelin/interpreter/InterpreterOutput.java | 4 +-- .../InterpreterOutputChangeWatcher.java | 4 +-- .../interpreter/InterpreterPropertyBuilder.java | 2 +- .../zeppelin/interpreter/InterpreterResult.java | 2 +- .../interpreter/dev/DevInterpreter.java | 2 +- .../interpreter/remote/ClientFactory.java | 4 +-- .../remote/InterpreterContextRunnerPool.java | 2 +- .../interpreter/remote/RemoteInterpreter.java | 2 +- .../remote/RemoteInterpreterEventClient.java | 18 +++++------ .../remote/RemoteInterpreterEventPoller.java | 2 +- .../remote/RemoteInterpreterProcess.java | 2 +- .../remote/RemoteInterpreterServer.java | 8 ++--- .../zeppelin/scheduler/ExecutorFactory.java | 2 +- .../zeppelin/scheduler/FIFOScheduler.java | 6 ++-- .../zeppelin/scheduler/ParallelScheduler.java | 8 ++--- .../zeppelin/scheduler/RemoteScheduler.java | 8 ++--- .../zeppelin/scheduler/SchedulerFactory.java | 4 +-- .../org/apache/zeppelin/display/InputTest.java | 2 +- .../remote/RemoteAngularObjectTest.java | 2 +- .../RemoteInterpreterOutputTestStream.java | 2 +- .../remote/RemoteInterpreterTest.java | 6 ++-- .../resource/DistributedResourcePoolTest.java | 2 +- .../zeppelin/scheduler/RemoteSchedulerTest.java | 4 +-- .../apache/zeppelin/scheduler/SleepingJob.java | 2 +- .../server/ActiveDirectoryGroupRealm.java | 2 +- .../apache/zeppelin/server/JsonResponse.java | 2 +- .../apache/zeppelin/server/LdapGroupRealm.java | 2 +- .../apache/zeppelin/server/ZeppelinServer.java | 2 +- .../apache/zeppelin/socket/NotebookServer.java | 5 ++- .../ScreenCaptureHtmlUnitDriver.java | 6 ++-- .../org/apache/zeppelin/AbstractZeppelinIT.java | 2 +- .../org/apache/zeppelin/CommandExecutor.java | 2 +- .../interpreter/mock/MockInterpreter1.java | 2 +- .../zeppelin/rest/AbstractTestRestApi.java | 2 +- .../java/org/apache/zeppelin/helium/Helium.java | 8 ++--- .../org/apache/zeppelin/helium/HeliumConf.java | 2 +- .../zeppelin/helium/HeliumLocalRegistry.java | 2 +- .../helium/HeliumPackageSuggestion.java | 3 +- .../interpreter/install/InstallInterpreter.java | 2 +- .../org/apache/zeppelin/notebook/NoteInfo.java | 2 +- .../org/apache/zeppelin/notebook/Notebook.java | 2 +- .../notebook/NotebookAuthorization.java | 14 ++++----- .../org/apache/zeppelin/notebook/Paragraph.java | 10 +++--- .../notebook/repo/AzureNotebookRepo.java | 2 +- .../notebook/repo/NotebookRepoSync.java | 12 ++++---- .../zeppelin/notebook/repo/VFSNotebookRepo.java | 2 +- .../zeppelinhub/websocket/ZeppelinClient.java | 4 +-- .../websocket/utils/ZeppelinhubUtils.java | 6 ++-- .../zeppelin/notebook/socket/Message.java | 2 +- .../zeppelin/notebook/utility/IdHashes.java | 2 +- .../helium/HeliumApplicationFactoryTest.java | 2 +- .../zeppelin/helium/HeliumTestRegistry.java | 2 +- .../interpreter/InterpreterFactoryTest.java | 2 +- .../interpreter/mock/MockInterpreter1.java | 2 +- .../interpreter/mock/MockInterpreter11.java | 2 +- .../interpreter/mock/MockInterpreter2.java | 2 +- .../apache/zeppelin/notebook/NotebookTest.java | 32 ++++++++++---------- 88 files changed, 213 insertions(+), 219 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/alluxio/src/main/java/org/apache/zeppelin/alluxio/AlluxioInterpreter.java ---------------------------------------------------------------------- diff --git a/alluxio/src/main/java/org/apache/zeppelin/alluxio/AlluxioInterpreter.java b/alluxio/src/main/java/org/apache/zeppelin/alluxio/AlluxioInterpreter.java index d450c55..79e10b6 100644 --- a/alluxio/src/main/java/org/apache/zeppelin/alluxio/AlluxioInterpreter.java +++ b/alluxio/src/main/java/org/apache/zeppelin/alluxio/AlluxioInterpreter.java @@ -135,7 +135,7 @@ public class AlluxioInterpreter extends Interpreter { private String[] splitAndRemoveEmpty(String st, String splitSeparator) { String[] voices = st.split(splitSeparator); - ArrayList<String> result = new ArrayList<String>(); + ArrayList<String> result = new ArrayList<>(); for (String voice : voices) { if (!voice.trim().isEmpty()) { result.add(voice); @@ -145,7 +145,7 @@ public class AlluxioInterpreter extends Interpreter { } private String[] splitAndRemoveEmpty(String[] sts, String splitSeparator) { - ArrayList<String> result = new ArrayList<String>(); + ArrayList<String> result = new ArrayList<>(); for (String st : sts) { result.addAll(Arrays.asList(splitAndRemoveEmpty(st, splitSeparator))); } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/alluxio/src/test/java/org/apache/zeppelin/alluxio/AlluxioInterpreterTest.java ---------------------------------------------------------------------- diff --git a/alluxio/src/test/java/org/apache/zeppelin/alluxio/AlluxioInterpreterTest.java b/alluxio/src/test/java/org/apache/zeppelin/alluxio/AlluxioInterpreterTest.java index 5cbe72f..659390e 100644 --- a/alluxio/src/test/java/org/apache/zeppelin/alluxio/AlluxioInterpreterTest.java +++ b/alluxio/src/test/java/org/apache/zeppelin/alluxio/AlluxioInterpreterTest.java @@ -93,7 +93,7 @@ public class AlluxioInterpreterTest { List expectedResultThree = Arrays.asList( new InterpreterCompletion("copyFromLocal", "copyFromLocal"), new InterpreterCompletion("copyToLocal", "copyToLocal")); - List expectedResultNone = new ArrayList<String>(); + List expectedResultNone = new ArrayList<>(); List<InterpreterCompletion> resultOne = alluxioInterpreter.completion("c", 0); List<InterpreterCompletion> resultTwo = alluxioInterpreter.completion("co", 0); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/file/src/test/java/org/apache/zeppelin/file/HDFSFileInterpreterTest.java ---------------------------------------------------------------------- diff --git a/file/src/test/java/org/apache/zeppelin/file/HDFSFileInterpreterTest.java b/file/src/test/java/org/apache/zeppelin/file/HDFSFileInterpreterTest.java index 2c1a565..21fcae6 100644 --- a/file/src/test/java/org/apache/zeppelin/file/HDFSFileInterpreterTest.java +++ b/file/src/test/java/org/apache/zeppelin/file/HDFSFileInterpreterTest.java @@ -123,7 +123,7 @@ public class HDFSFileInterpreterTest extends TestCase { * Store command results from curl against a real file system */ class MockFileSystem { - HashMap<String, String> mfs = new HashMap<String, String>(); + HashMap<String, String> mfs = new HashMap<>(); void addListStatusData() { mfs.put("/?op=LISTSTATUS", "{\"FileStatuses\":{\"FileStatus\":[\n" + http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/flink/src/main/java/org/apache/zeppelin/flink/FlinkInterpreter.java ---------------------------------------------------------------------- diff --git a/flink/src/main/java/org/apache/zeppelin/flink/FlinkInterpreter.java b/flink/src/main/java/org/apache/zeppelin/flink/FlinkInterpreter.java index 5ce3b85..cae3560 100644 --- a/flink/src/main/java/org/apache/zeppelin/flink/FlinkInterpreter.java +++ b/flink/src/main/java/org/apache/zeppelin/flink/FlinkInterpreter.java @@ -175,7 +175,7 @@ public class FlinkInterpreter extends Interpreter { pathSettings.v_$eq(classpath); settings.scala$tools$nsc$settings$ScalaSettings$_setter_$classpath_$eq(pathSettings); - settings.explicitParentLoader_$eq(new Some<ClassLoader>(Thread.currentThread() + settings.explicitParentLoader_$eq(new Some<>(Thread.currentThread() .getContextClassLoader())); BooleanSetting b = (BooleanSetting) settings.usejavacp(); b.v_$eq(true); @@ -197,7 +197,7 @@ public class FlinkInterpreter extends Interpreter { } private List<File> classPath(ClassLoader cl) { - List<File> paths = new LinkedList<File>(); + List<File> paths = new LinkedList<>(); if (cl == null) { return paths; } @@ -217,7 +217,7 @@ public class FlinkInterpreter extends Interpreter { public Object getLastObject() { Object obj = imain.lastRequest().lineRep().call( "$result", - JavaConversions.asScalaBuffer(new LinkedList<Object>())); + JavaConversions.asScalaBuffer(new LinkedList<>())); return obj; } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteInterpreter.java ---------------------------------------------------------------------- diff --git a/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteInterpreter.java b/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteInterpreter.java index 3f24018..66dac1b 100644 --- a/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteInterpreter.java +++ b/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteInterpreter.java @@ -178,7 +178,7 @@ public class IgniteInterpreter extends Interpreter { public Object getLastObject() { Object obj = imain.lastRequest().lineRep().call( "$result", - JavaConversions.asScalaBuffer(new LinkedList<Object>())); + JavaConversions.asScalaBuffer(new LinkedList<>())); return obj; } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/lens/src/main/java/org/apache/zeppelin/lens/LensInterpreter.java ---------------------------------------------------------------------- diff --git a/lens/src/main/java/org/apache/zeppelin/lens/LensInterpreter.java b/lens/src/main/java/org/apache/zeppelin/lens/LensInterpreter.java index d270fcd..f0c9062 100644 --- a/lens/src/main/java/org/apache/zeppelin/lens/LensInterpreter.java +++ b/lens/src/main/java/org/apache/zeppelin/lens/LensInterpreter.java @@ -76,9 +76,9 @@ public class LensInterpreter extends Interpreter { private static Pattern s_queryExecutePattern = Pattern.compile(".*query\\s+execute\\s+(.*)"); private static Map<String, ExecutionDetail> s_paraToQH = - new ConcurrentHashMap<String, ExecutionDetail> (); //tracks paragraphId -> Lens QueryHandle + new ConcurrentHashMap<> (); //tracks paragraphId -> Lens QueryHandle private static Map<LensClient, Boolean> s_clientMap = - new ConcurrentHashMap<LensClient, Boolean>(); + new ConcurrentHashMap<>(); private int m_maxResults; private int m_maxThreads; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/livy/src/main/java/org/apache/zeppelin/livy/LivyHelper.java ---------------------------------------------------------------------- diff --git a/livy/src/main/java/org/apache/zeppelin/livy/LivyHelper.java b/livy/src/main/java/org/apache/zeppelin/livy/LivyHelper.java index 209a842..40bedf8 100644 --- a/livy/src/main/java/org/apache/zeppelin/livy/LivyHelper.java +++ b/livy/src/main/java/org/apache/zeppelin/livy/LivyHelper.java @@ -57,7 +57,7 @@ public class LivyHelper { public Integer createSession(InterpreterContext context, String kind) throws Exception { try { - Map<String, String> conf = new HashMap<String, String>(); + Map<String, String> conf = new HashMap<>(); Iterator<Entry<Object, Object>> it = property.entrySet().iterator(); while (it.hasNext()) { @@ -352,16 +352,16 @@ public class LivyHelper { ResponseEntity<String> response = null; try { if (method.equals("POST")) { - HttpEntity<String> entity = new HttpEntity<String>(jsonData, headers); + HttpEntity<String> entity = new HttpEntity<>(jsonData, headers); response = restTemplate.exchange(targetURL, HttpMethod.POST, entity, String.class); paragraphHttpMap.put(paragraphId, response); } else if (method.equals("GET")) { - HttpEntity<String> entity = new HttpEntity<String>(headers); + HttpEntity<String> entity = new HttpEntity<>(headers); response = restTemplate.exchange(targetURL, HttpMethod.GET, entity, String.class); paragraphHttpMap.put(paragraphId, response); } else if (method.equals("DELETE")) { - HttpEntity<String> entity = new HttpEntity<String>(headers); + HttpEntity<String> entity = new HttpEntity<>(headers); response = restTemplate.exchange(targetURL, HttpMethod.DELETE, entity, String.class); } } catch (HttpClientErrorException e) { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/pig/src/main/java/org/apache/zeppelin/pig/PigQueryInterpreter.java ---------------------------------------------------------------------- diff --git a/pig/src/main/java/org/apache/zeppelin/pig/PigQueryInterpreter.java b/pig/src/main/java/org/apache/zeppelin/pig/PigQueryInterpreter.java index c763b7f..1a7634a 100644 --- a/pig/src/main/java/org/apache/zeppelin/pig/PigQueryInterpreter.java +++ b/pig/src/main/java/org/apache/zeppelin/pig/PigQueryInterpreter.java @@ -68,7 +68,7 @@ public class PigQueryInterpreter extends BasePigInterpreter { // '-' is invalid for pig alias String alias = "paragraph_" + context.getParagraphId().replace("-", "_"); String[] lines = st.split("\n"); - List<String> queries = new ArrayList<String>(); + List<String> queries = new ArrayList<>(); for (int i = 0; i < lines.length; ++i) { if (i == lines.length - 1) { lines[i] = alias + " = " + lines[i]; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/postgresql/src/main/java/org/apache/zeppelin/postgresql/PostgreSqlInterpreter.java ---------------------------------------------------------------------- diff --git a/postgresql/src/main/java/org/apache/zeppelin/postgresql/PostgreSqlInterpreter.java b/postgresql/src/main/java/org/apache/zeppelin/postgresql/PostgreSqlInterpreter.java index fc9a37d..88c22d4 100644 --- a/postgresql/src/main/java/org/apache/zeppelin/postgresql/PostgreSqlInterpreter.java +++ b/postgresql/src/main/java/org/apache/zeppelin/postgresql/PostgreSqlInterpreter.java @@ -324,7 +324,7 @@ public class PostgreSqlInterpreter extends Interpreter { @Override public List<InterpreterCompletion> completion(String buf, int cursor) { - List<CharSequence> candidates = new ArrayList<CharSequence>(); + List<CharSequence> candidates = new ArrayList<>(); if (sqlCompleter != null && sqlCompleter.complete(buf, cursor, candidates) >= 0) { List completion = Lists.transform(candidates, sequenceToStringTransformer); return completion; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/postgresql/src/main/java/org/apache/zeppelin/postgresql/SqlCompleter.java ---------------------------------------------------------------------- diff --git a/postgresql/src/main/java/org/apache/zeppelin/postgresql/SqlCompleter.java b/postgresql/src/main/java/org/apache/zeppelin/postgresql/SqlCompleter.java index 9d2857f..66a1287 100644 --- a/postgresql/src/main/java/org/apache/zeppelin/postgresql/SqlCompleter.java +++ b/postgresql/src/main/java/org/apache/zeppelin/postgresql/SqlCompleter.java @@ -65,7 +65,7 @@ public class SqlCompleter extends StringsCompleter { } }; - private Set<String> modelCompletions = new HashSet<String>(); + private Set<String> modelCompletions = new HashSet<>(); public SqlCompleter(Set<String> allCompletions, Set<String> dataModelCompletions) { super(allCompletions); @@ -150,7 +150,7 @@ public class SqlCompleter extends StringsCompleter { keywords += "," + driverKeywords.toUpperCase(); } - Set<String> completions = new TreeSet<String>(); + Set<String> completions = new TreeSet<>(); // Add the keywords from the current JDBC connection @@ -193,7 +193,7 @@ public class SqlCompleter extends StringsCompleter { public static Set<String> getDataModelMetadataCompletions(Connection connection) throws SQLException { - Set<String> completions = new TreeSet<String>(); + Set<String> completions = new TreeSet<>(); getColumnNames(connection.getMetaData(), completions); getSchemaNames(connection.getMetaData(), completions); return completions; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/postgresql/src/test/java/org/apache/zeppelin/postgresql/SqlCompleterTest.java ---------------------------------------------------------------------- diff --git a/postgresql/src/test/java/org/apache/zeppelin/postgresql/SqlCompleterTest.java b/postgresql/src/test/java/org/apache/zeppelin/postgresql/SqlCompleterTest.java index 1244476..05d9487 100644 --- a/postgresql/src/test/java/org/apache/zeppelin/postgresql/SqlCompleterTest.java +++ b/postgresql/src/test/java/org/apache/zeppelin/postgresql/SqlCompleterTest.java @@ -39,7 +39,7 @@ public class SqlCompleterTest extends BasicJDBCTestCaseAdapter { private Logger logger = LoggerFactory.getLogger(SqlCompleterTest.class); - private final static Set<String> EMPTY = new HashSet<String>(); + private final static Set<String> EMPTY = new HashSet<>(); private CompleterTester tester; @@ -157,7 +157,7 @@ public class SqlCompleterTest extends BasicJDBCTestCaseAdapter { private void expectedCompletions(String buffer, int cursor, Set<String> expected) { - ArrayList<CharSequence> candidates = new ArrayList<CharSequence>(); + ArrayList<CharSequence> candidates = new ArrayList<>(); completer.complete(buffer, cursor, candidates); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java b/shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java index 3e09b8b..838c6f1 100644 --- a/shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java +++ b/shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java @@ -60,7 +60,7 @@ public class ShellInterpreter extends Interpreter { @Override public void open() { LOGGER.info("Command timeout property: {}", getProperty(TIMEOUT_PROPERTY)); - executors = new ConcurrentHashMap<String, DefaultExecutor>(); + executors = new ConcurrentHashMap<>(); if (!StringUtils.isAnyEmpty(getProperty("zeppelin.shell.auth.type"))) { ShellSecurityImpl.createSecureConfiguration(getProperty(), shell); } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/spark/src/main/java/org/apache/zeppelin/spark/DepInterpreter.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/org/apache/zeppelin/spark/DepInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/DepInterpreter.java index 146ae16..478d0bc 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/DepInterpreter.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/DepInterpreter.java @@ -153,7 +153,7 @@ public class DepInterpreter extends Interpreter { settings.scala$tools$nsc$settings$ScalaSettings$_setter_$classpath_$eq(pathSettings); // set classloader for scala compiler - settings.explicitParentLoader_$eq(new Some<ClassLoader>(Thread.currentThread() + settings.explicitParentLoader_$eq(new Some<>(Thread.currentThread() .getContextClassLoader())); BooleanSetting b = (BooleanSetting) settings.usejavacp(); @@ -219,7 +219,7 @@ public class DepInterpreter extends Interpreter { public Object getLastObject() { IMain.Request r = (IMain.Request) Utils.invokeMethod(intp, "lastRequest"); Object obj = r.lineRep().call("$result", - JavaConversions.asScalaBuffer(new LinkedList<Object>())); + JavaConversions.asScalaBuffer(new LinkedList<>())); return obj; } @@ -290,7 +290,7 @@ public class DepInterpreter extends Interpreter { Candidates ret = c.complete(buf, cursor); List<String> candidates = WrapAsJava$.MODULE$.seqAsJavaList(ret.candidates()); - List<InterpreterCompletion> completions = new LinkedList<InterpreterCompletion>(); + List<InterpreterCompletion> completions = new LinkedList<>(); for (String candidate : candidates) { completions.add(new InterpreterCompletion(candidate, candidate)); @@ -298,7 +298,7 @@ public class DepInterpreter extends Interpreter { return completions; } else { - return new LinkedList<InterpreterCompletion>(); + return new LinkedList<>(); } } @@ -314,7 +314,7 @@ public class DepInterpreter extends Interpreter { } private List<File> classPath(ClassLoader cl) { - List<File> paths = new LinkedList<File>(); + List<File> paths = new LinkedList<>(); if (cl == null) { return paths; } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/spark/src/main/java/org/apache/zeppelin/spark/PySparkInterpreter.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/org/apache/zeppelin/spark/PySparkInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/PySparkInterpreter.java index ed85558..c0b131c 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/PySparkInterpreter.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/PySparkInterpreter.java @@ -115,7 +115,7 @@ public class PySparkInterpreter extends Interpreter implements ExecuteResultHand // load libraries from Dependency Interpreter URL [] urls = new URL[0]; - List<URL> urlList = new LinkedList<URL>(); + List<URL> urlList = new LinkedList<>(); if (depInterpreter != null) { SparkDependencyContext depc = depInterpreter.getDependencyContext(); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java index 0812c76..6aa2f28 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java @@ -596,7 +596,7 @@ public class SparkInterpreter extends Interpreter { } String[] argsArray = args.split(" "); - LinkedList<String> argList = new LinkedList<String>(); + LinkedList<String> argList = new LinkedList<>(); for (String arg : argsArray) { argList.add(arg); } @@ -719,7 +719,7 @@ public class SparkInterpreter extends Interpreter { // set classloader for scala compiler - settings.explicitParentLoader_$eq(new Some<ClassLoader>(Thread.currentThread() + settings.explicitParentLoader_$eq(new Some<>(Thread.currentThread() .getContextClassLoader())); BooleanSetting b = (BooleanSetting) settings.usejavacp(); b.v_$eq(true); @@ -957,7 +957,7 @@ public class SparkInterpreter extends Interpreter { } private List<File> classPath(ClassLoader cl) { - List<File> paths = new LinkedList<File>(); + List<File> paths = new LinkedList<>(); if (cl == null) { return paths; } @@ -978,7 +978,7 @@ public class SparkInterpreter extends Interpreter { public List<InterpreterCompletion> completion(String buf, int cursor) { if (completer == null) { logger.warn("Can't find completer"); - return new LinkedList<InterpreterCompletion>(); + return new LinkedList<>(); } if (buf.length() < cursor) { @@ -994,7 +994,7 @@ public class SparkInterpreter extends Interpreter { Candidates ret = c.complete(completionText, cursor); List<String> candidates = WrapAsJava$.MODULE$.seqAsJavaList(ret.candidates()); - List<InterpreterCompletion> completions = new LinkedList<InterpreterCompletion>(); + List<InterpreterCompletion> completions = new LinkedList<>(); for (String candidate : candidates) { completions.add(new InterpreterCompletion(candidate, candidate)); @@ -1067,7 +1067,7 @@ public class SparkInterpreter extends Interpreter { return null; } Object obj = r.lineRep().call("$result", - JavaConversions.asScalaBuffer(new LinkedList<Object>())); + JavaConversions.asScalaBuffer(new LinkedList<>())); return obj; } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/spark/src/main/java/org/apache/zeppelin/spark/ZeppelinContext.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/org/apache/zeppelin/spark/ZeppelinContext.java b/spark/src/main/java/org/apache/zeppelin/spark/ZeppelinContext.java index 92b50d0..ff21c7a 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/ZeppelinContext.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/ZeppelinContext.java @@ -61,7 +61,7 @@ public class ZeppelinContext { // given replName in parapgraph private static final Map<String, String> interpreterClassMap; static { - interpreterClassMap = new HashMap<String, String>(); + interpreterClassMap = new HashMap<>(); interpreterClassMap.put("spark", "org.apache.zeppelin.spark.SparkInterpreter"); interpreterClassMap.put("sql", "org.apache.zeppelin.spark.SparkSqlInterpreter"); interpreterClassMap.put("dep", "org.apache.zeppelin.spark.DepInterpreter"); @@ -134,7 +134,7 @@ public class ZeppelinContext { @ZeppelinApi public scala.collection.Iterable<Object> checkbox(String name, scala.collection.Iterable<Tuple2<Object, String>> options) { - List<Object> allChecked = new LinkedList<Object>(); + List<Object> allChecked = new LinkedList<>(); for (Tuple2<Object, String> option : asJavaIterable(options)) { allChecked.add(option._1()); } @@ -400,7 +400,7 @@ public class ZeppelinContext { @ZeppelinApi public List<String> listParagraphs() { - List<String> paragraphs = new LinkedList<String>(); + List<String> paragraphs = new LinkedList<>(); for (InterpreterContextRunner r : interpreterContext.getRunners()) { paragraphs.add(r.getParagraphId()); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/spark/src/main/java/org/apache/zeppelin/spark/dep/SparkDependencyContext.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/org/apache/zeppelin/spark/dep/SparkDependencyContext.java b/spark/src/main/java/org/apache/zeppelin/spark/dep/SparkDependencyContext.java index 7e73c98..59d8d4a 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/dep/SparkDependencyContext.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/dep/SparkDependencyContext.java @@ -49,16 +49,16 @@ import scala.Console; * */ public class SparkDependencyContext { - List<Dependency> dependencies = new LinkedList<Dependency>(); - List<Repository> repositories = new LinkedList<Repository>(); + List<Dependency> dependencies = new LinkedList<>(); + List<Repository> repositories = new LinkedList<>(); - List<File> files = new LinkedList<File>(); - List<File> filesDist = new LinkedList<File>(); + List<File> files = new LinkedList<>(); + List<File> filesDist = new LinkedList<>(); private RepositorySystem system = Booter.newRepositorySystem(); private RepositorySystemSession session; private RemoteRepository mavenCentral = Booter.newCentralRepository(); private RemoteRepository mavenLocal = Booter.newLocalRepository(); - private List<RemoteRepository> additionalRepos = new LinkedList<RemoteRepository>(); + private List<RemoteRepository> additionalRepos = new LinkedList<>(); public SparkDependencyContext(String localRepoPath, String additionalRemoteRepository) { session = Booter.newRepositorySystemSession(system, localRepoPath); @@ -88,11 +88,11 @@ public class SparkDependencyContext { public void reset() { Console.println("DepInterpreter(%dep) deprecated. " + "Remove dependencies and repositories through GUI interpreter menu instead."); - dependencies = new LinkedList<Dependency>(); - repositories = new LinkedList<Repository>(); + dependencies = new LinkedList<>(); + repositories = new LinkedList<>(); - files = new LinkedList<File>(); - filesDist = new LinkedList<File>(); + files = new LinkedList<>(); + filesDist = new LinkedList<>(); } private void addRepoFromProperty(String listOfRepo) { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/spark/src/main/java/org/apache/zeppelin/spark/dep/SparkDependencyResolver.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/org/apache/zeppelin/spark/dep/SparkDependencyResolver.java b/spark/src/main/java/org/apache/zeppelin/spark/dep/SparkDependencyResolver.java index c404797..46224a8 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/dep/SparkDependencyResolver.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/dep/SparkDependencyResolver.java @@ -114,7 +114,7 @@ public class SparkDependencyResolver extends AbstractDependencyResolver { } // NOTE: Must use reflection until this is exposed/fixed upstream in Scala - List<String> classPaths = new LinkedList<String>(); + List<String> classPaths = new LinkedList<>(); for (URL url : urls) { classPaths.add(url.getPath()); } @@ -151,7 +151,7 @@ public class SparkDependencyResolver extends AbstractDependencyResolver { private MergedClassPath<AbstractFile> mergeUrlsIntoClassPath(JavaPlatform platform, URL[] urls) { IndexedSeq<ClassPath<AbstractFile>> entries = ((MergedClassPath<AbstractFile>) platform.classPath()).entries(); - List<ClassPath<AbstractFile>> cp = new LinkedList<ClassPath<AbstractFile>>(); + List<ClassPath<AbstractFile>> cp = new LinkedList<>(); for (int i = 0; i < entries.size(); i++) { cp.add(entries.apply(i)); @@ -200,7 +200,7 @@ public class SparkDependencyResolver extends AbstractDependencyResolver { return loadFromMvn(artifact, excludes, addSparkContext); } else { loadFromFs(artifact, addSparkContext); - LinkedList<String> libs = new LinkedList<String>(); + LinkedList<String> libs = new LinkedList<>(); libs.add(artifact); return libs; } @@ -224,8 +224,8 @@ public class SparkDependencyResolver extends AbstractDependencyResolver { private List<String> loadFromMvn(String artifact, Collection<String> excludes, boolean addSparkContext) throws Exception { - List<String> loadedLibs = new LinkedList<String>(); - Collection<String> allExclusions = new LinkedList<String>(); + List<String> loadedLibs = new LinkedList<>(); + Collection<String> allExclusions = new LinkedList<>(); allExclusions.addAll(excludes); allExclusions.addAll(Arrays.asList(exclusions)); @@ -244,8 +244,8 @@ public class SparkDependencyResolver extends AbstractDependencyResolver { } } - List<URL> newClassPathList = new LinkedList<URL>(); - List<File> files = new LinkedList<File>(); + List<URL> newClassPathList = new LinkedList<>(); + List<File> files = new LinkedList<>(); for (ArtifactResult artifactResult : listOfArtifact) { logger.info("Load " + artifactResult.getArtifact().getGroupId() + ":" + artifactResult.getArtifact().getArtifactId() + ":" @@ -302,7 +302,7 @@ public class SparkDependencyResolver extends AbstractDependencyResolver { } public static Collection<String> inferScalaVersion(Collection<String> artifact) { - List<String> list = new LinkedList<String>(); + List<String> list = new LinkedList<>(); for (String a : artifact) { list.add(inferScalaVersion(a)); } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/AbstractDependencyResolver.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/AbstractDependencyResolver.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/AbstractDependencyResolver.java index da3d0c0..0de790a 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/AbstractDependencyResolver.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/AbstractDependencyResolver.java @@ -37,7 +37,7 @@ import org.sonatype.aether.resolution.ArtifactResult; */ public abstract class AbstractDependencyResolver { protected RepositorySystem system = Booter.newRepositorySystem(); - protected List<RemoteRepository> repos = new LinkedList<RemoteRepository>(); + protected List<RemoteRepository> repos = new LinkedList<>(); protected RepositorySystemSession session; public AbstractDependencyResolver(String localRepoPath) { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/Dependency.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/Dependency.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/Dependency.java index 8f77de4..eec6592 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/Dependency.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/Dependency.java @@ -31,7 +31,7 @@ public class Dependency { public Dependency(String groupArtifactVersion) { this.groupArtifactVersion = groupArtifactVersion; - exclusions = new LinkedList<String>(); + exclusions = new LinkedList<>(); } @Override http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/DependencyContext.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/DependencyContext.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/DependencyContext.java index d9df994..9bac9e4 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/DependencyContext.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/DependencyContext.java @@ -42,11 +42,11 @@ import org.sonatype.aether.util.filter.PatternExclusionsDependencyFilter; * */ public class DependencyContext { - List<Dependency> dependencies = new LinkedList<Dependency>(); - List<Repository> repositories = new LinkedList<Repository>(); + List<Dependency> dependencies = new LinkedList<>(); + List<Repository> repositories = new LinkedList<>(); - List<File> files = new LinkedList<File>(); - List<File> filesDist = new LinkedList<File>(); + List<File> files = new LinkedList<>(); + List<File> filesDist = new LinkedList<>(); private RepositorySystem system = Booter.newRepositorySystem(); private RepositorySystemSession session; private RemoteRepository mavenCentral = Booter.newCentralRepository(); @@ -73,11 +73,11 @@ public class DependencyContext { } public void reset() { - dependencies = new LinkedList<Dependency>(); - repositories = new LinkedList<Repository>(); + dependencies = new LinkedList<>(); + repositories = new LinkedList<>(); - files = new LinkedList<File>(); - filesDist = new LinkedList<File>(); + files = new LinkedList<>(); + filesDist = new LinkedList<>(); } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/DependencyResolver.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/DependencyResolver.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/DependencyResolver.java index 7ca4a4d..03f6b32 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/DependencyResolver.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/DependencyResolver.java @@ -70,7 +70,7 @@ public class DependencyResolver extends AbstractDependencyResolver { throws RepositoryException, IOException { if (StringUtils.isBlank(artifact)) { // Skip dependency loading if artifact is empty - return new LinkedList<File>(); + return new LinkedList<>(); } // <groupId>:<artifactId>[:<extension>[:<classifier>]]:<version> @@ -78,7 +78,7 @@ public class DependencyResolver extends AbstractDependencyResolver { if (numSplits >= 3 && numSplits <= 6) { return loadFromMvn(artifact, excludes); } else { - LinkedList<File> libs = new LinkedList<File>(); + LinkedList<File> libs = new LinkedList<>(); libs.add(new File(artifact)); return libs; } @@ -90,7 +90,7 @@ public class DependencyResolver extends AbstractDependencyResolver { public List<File> load(String artifact, Collection<String> excludes, File destPath) throws RepositoryException, IOException { - List<File> libs = new LinkedList<File>(); + List<File> libs = new LinkedList<>(); if (StringUtils.isNotBlank(artifact)) { libs = load(artifact, excludes); @@ -123,7 +123,7 @@ public class DependencyResolver extends AbstractDependencyResolver { private List<File> loadFromMvn(String artifact, Collection<String> excludes) throws RepositoryException { - Collection<String> allExclusions = new LinkedList<String>(); + Collection<String> allExclusions = new LinkedList<>(); allExclusions.addAll(excludes); allExclusions.addAll(Arrays.asList(exclusions)); @@ -142,7 +142,7 @@ public class DependencyResolver extends AbstractDependencyResolver { } } - List<File> files = new LinkedList<File>(); + List<File> files = new LinkedList<>(); for (ArtifactResult artifactResult : listOfArtifact) { files.add(artifactResult.getArtifact().getFile()); logger.info("load {}", artifactResult.getArtifact().getFile().getAbsolutePath()); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/TransferListener.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/TransferListener.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/TransferListener.java index 277a303..fd9029f 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/TransferListener.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/dep/TransferListener.java @@ -37,7 +37,7 @@ public class TransferListener extends AbstractTransferListener { Logger logger = LoggerFactory.getLogger(TransferListener.class); private PrintStream out; - private Map<TransferResource, Long> downloads = new ConcurrentHashMap<TransferResource, Long>(); + private Map<TransferResource, Long> downloads = new ConcurrentHashMap<>(); private int lastLength; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AngularObject.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AngularObject.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AngularObject.java index 3ef1993..929533b 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AngularObject.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AngularObject.java @@ -38,8 +38,7 @@ public class AngularObject<T> { private T object; private transient AngularObjectListener listener; - private transient List<AngularObjectWatcher> watchers - = new LinkedList<AngularObjectWatcher>(); + private transient List<AngularObjectWatcher> watchers = new LinkedList<>(); private String noteId; // noteId belonging to. null for global scope private String paragraphId; // paragraphId belongs to. null for notebook scope @@ -175,7 +174,7 @@ public class AngularObject<T> { } final Logger logger = LoggerFactory.getLogger(AngularObject.class); - List<AngularObjectWatcher> ws = new LinkedList<AngularObjectWatcher>(); + List<AngularObjectWatcher> ws = new LinkedList<>(); synchronized (watchers) { ws.addAll(watchers); } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AngularObjectRegistry.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AngularObjectRegistry.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AngularObjectRegistry.java index af05d78..d954294 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AngularObjectRegistry.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AngularObjectRegistry.java @@ -32,8 +32,7 @@ import java.util.Map; * - Global scope : Shared to all notebook that uses the same interpreter group */ public class AngularObjectRegistry { - Map<String, Map<String, AngularObject>> registry = - new HashMap<String, Map<String, AngularObject>>(); + Map<String, Map<String, AngularObject>> registry = new HashMap<>(); private final String GLOBAL_KEY = "_GLOBAL_"; private AngularObjectRegistryListener listener; private String interpreterId; @@ -209,7 +208,7 @@ public class AngularObjectRegistry { * @return all angularobject in the scope */ public List<AngularObject> getAll(String noteId, String paragraphId) { - List<AngularObject> all = new LinkedList<AngularObject>(); + List<AngularObject> all = new LinkedList<>(); synchronized (registry) { Map<String, AngularObject> r = getRegistryForKey(noteId, paragraphId); if (r != null) { @@ -228,7 +227,7 @@ public class AngularObjectRegistry { * @return */ public List<AngularObject> getAllWithGlobal(String noteId) { - List<AngularObject> all = new LinkedList<AngularObject>(); + List<AngularObject> all = new LinkedList<>(); synchronized (registry) { Map<String, AngularObject> global = getRegistryForKey(null, null); if (global != null) { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/GUI.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/GUI.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/GUI.java index 42a5584..27640de 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/GUI.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/GUI.java @@ -32,8 +32,8 @@ import org.apache.zeppelin.display.Input.ParamOption; */ public class GUI implements Serializable { - Map<String, Object> params = new HashMap<String, Object>(); // form parameters from client - Map<String, Input> forms = new TreeMap<String, Input>(); // form configuration + Map<String, Object> params = new HashMap<>(); // form parameters from client + Map<String, Input> forms = new TreeMap<>(); // form configuration public GUI() { @@ -86,7 +86,7 @@ public class GUI implements Serializable { checked = defaultChecked; } forms.put(id, new Input(id, defaultChecked, "checkbox", options)); - Collection<Object> filtered = new LinkedList<Object>(); + Collection<Object> filtered = new LinkedList<>(); for (Object o : checked) { if (isValidOption(o, options)) { filtered.add(o); @@ -105,6 +105,6 @@ public class GUI implements Serializable { } public void clear() { - this.forms = new TreeMap<String, Input>(); + this.forms = new TreeMap<>(); } } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/Input.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/Input.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/Input.java index bb0aa4d..5294f8b 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/Input.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/Input.java @@ -292,7 +292,7 @@ public class Input implements Serializable { } public static Map<String, Input> extractSimpleQueryParam(String script) { - Map<String, Input> params = new HashMap<String, Input>(); + Map<String, Input> params = new HashMap<>(); if (script == null) { return params; } @@ -331,7 +331,7 @@ public class Input implements Serializable { } Collection<Object> checked = value instanceof Collection ? (Collection<Object>) value : Arrays.asList((Object[]) value); - List<Object> validChecked = new LinkedList<Object>(); + List<Object> validChecked = new LinkedList<>(); for (Object o : checked) { // filter out obsolete checked values for (ParamOption option : input.getOptions()) { if (option.getValue().equals(o)) { @@ -387,14 +387,14 @@ public class Input implements Serializable { public static String[] split(String str, String escapeSeq, char escapeChar, String[] blockStart, String[] blockEnd, String[] splitters, boolean includeSplitter) { - List<String> splits = new ArrayList<String>(); + List<String> splits = new ArrayList<>(); String curString = ""; boolean escape = false; // true when escape char is found int lastEscapeOffset = -1; int blockStartPos = -1; - List<Integer> blockStack = new LinkedList<Integer>(); + List<Integer> blockStack = new LinkedList<>(); for (int i = 0; i < str.length(); i++) { char c = str.charAt(i); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/helium/ApplicationLoader.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/helium/ApplicationLoader.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/helium/ApplicationLoader.java index be36ad9..eacef51 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/helium/ApplicationLoader.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/helium/ApplicationLoader.java @@ -200,7 +200,7 @@ public class ApplicationLoader { } // Create Application classloader - List<URL> urlList = new LinkedList<URL>(); + List<URL> urlList = new LinkedList<>(); // load artifact if (packageInfo.getArtifact() != null) { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterContext.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterContext.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterContext.java index e33b935..bf3cfcb 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterContext.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterContext.java @@ -30,8 +30,7 @@ import org.apache.zeppelin.resource.ResourcePool; * Interpreter context */ public class InterpreterContext { - private static final ThreadLocal<InterpreterContext> threadIC = - new ThreadLocal<InterpreterContext>(); + private static final ThreadLocal<InterpreterContext> threadIC = new ThreadLocal<>(); public final InterpreterOutput out; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterGroup.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterGroup.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterGroup.java index f3b158c..8a1c888 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterGroup.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterGroup.java @@ -55,7 +55,7 @@ public class InterpreterGroup extends ConcurrentHashMap<String, List<Interpreter // List<Interpreter>>(); private static final Map<String, InterpreterGroup> allInterpreterGroups = - new ConcurrentHashMap<String, InterpreterGroup>(); + new ConcurrentHashMap<>(); public static InterpreterGroup getByInterpreterGroupId(String id) { return allInterpreterGroups.get(id); @@ -147,7 +147,7 @@ public class InterpreterGroup extends ConcurrentHashMap<String, List<Interpreter */ public void close() { LOGGER.info("Close interpreter group " + getId()); - List<Interpreter> intpToClose = new LinkedList<Interpreter>(); + List<Interpreter> intpToClose = new LinkedList<>(); for (List<Interpreter> intpGroupForNote : this.values()) { intpToClose.addAll(intpGroupForNote); } @@ -168,7 +168,7 @@ public class InterpreterGroup extends ConcurrentHashMap<String, List<Interpreter if (intpToClose == null) { return; } - List<Thread> closeThreads = new LinkedList<Thread>(); + List<Thread> closeThreads = new LinkedList<>(); for (final Interpreter intp : intpToClose) { Thread t = new Thread() { @@ -219,7 +219,7 @@ public class InterpreterGroup extends ConcurrentHashMap<String, List<Interpreter */ public void destroy() { LOGGER.info("Destroy interpreter group " + getId()); - List<Interpreter> intpToDestroy = new LinkedList<Interpreter>(); + List<Interpreter> intpToDestroy = new LinkedList<>(); for (List<Interpreter> intpGroupForNote : this.values()) { intpToDestroy.addAll(intpGroupForNote); } @@ -241,7 +241,7 @@ public class InterpreterGroup extends ConcurrentHashMap<String, List<Interpreter return; } - List<Thread> destroyThreads = new LinkedList<Thread>(); + List<Thread> destroyThreads = new LinkedList<>(); for (final Interpreter intp : intpToDestroy) { Thread t = new Thread() { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterHookRegistry.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterHookRegistry.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterHookRegistry.java index 0917775..9df76f1 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterHookRegistry.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterHookRegistry.java @@ -29,8 +29,7 @@ import java.util.Map; public class InterpreterHookRegistry { public static final String GLOBAL_KEY = "_GLOBAL_"; private String interpreterId; - private Map<String, Map<String, Map<String, String>>> registry = - new HashMap<String, Map<String, Map<String, String>>>(); + private Map<String, Map<String, Map<String, String>>> registry = new HashMap<>(); /** * hookRegistry constructor. http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOutput.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOutput.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOutput.java index df0c210..6d21d22 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOutput.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOutput.java @@ -39,7 +39,7 @@ public class InterpreterOutput extends OutputStream { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - private final List<Object> outList = new LinkedList<Object>(); + private final List<Object> outList = new LinkedList<>(); private InterpreterOutputChangeWatcher watcher; private final InterpreterOutputListener flushListener; private InterpreterResult.Type type = InterpreterResult.Type.TEXT; @@ -185,7 +185,7 @@ public class InterpreterOutput extends OutputStream { public byte[] toByteArray() throws IOException { ByteArrayOutputStream out = new ByteArrayOutputStream(); - List<Object> all = new LinkedList<Object>(); + List<Object> all = new LinkedList<>(); synchronized (outList) { all.addAll(outList); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOutputChangeWatcher.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOutputChangeWatcher.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOutputChangeWatcher.java index 5fe8237..1cb9c23 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOutputChangeWatcher.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOutputChangeWatcher.java @@ -44,8 +44,8 @@ public class InterpreterOutputChangeWatcher extends Thread { Logger logger = LoggerFactory.getLogger(InterpreterOutputChangeWatcher.class); private WatchService watcher; - private final List<File> watchFiles = new LinkedList<File>(); - private final Map<WatchKey, File> watchKeys = new HashMap<WatchKey, File>(); + private final List<File> watchFiles = new LinkedList<>(); + private final Map<WatchKey, File> watchKeys = new HashMap<>(); private InterpreterOutputChangeListener listener; private boolean stop; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterPropertyBuilder.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterPropertyBuilder.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterPropertyBuilder.java index f33dc7c..d375a32 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterPropertyBuilder.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterPropertyBuilder.java @@ -24,7 +24,7 @@ import java.util.Map; * InterpreterPropertyBuilder */ public class InterpreterPropertyBuilder { - Map<String, InterpreterProperty> properties = new HashMap<String, InterpreterProperty>(); + Map<String, InterpreterProperty> properties = new HashMap<>(); public InterpreterPropertyBuilder add(String name, String defaultValue, String description){ properties.put(name, new InterpreterProperty(defaultValue, description)); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterResult.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterResult.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterResult.java index d213796..499239b 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterResult.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterResult.java @@ -119,7 +119,7 @@ public class InterpreterResult implements Serializable { private TreeMap<Integer, Type> buildIndexMap(String msg) { int lastIndexOftypes = 0; - TreeMap<Integer, Type> typesLastIndexInMsg = new TreeMap<Integer, Type>(); + TreeMap<Integer, Type> typesLastIndexInMsg = new TreeMap<>(); Type[] types = Type.values(); for (Type t : types) { lastIndexOftypes = getIndexOfType(msg, t); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/dev/DevInterpreter.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/dev/DevInterpreter.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/dev/DevInterpreter.java index a972b91..eb21d58 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/dev/DevInterpreter.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/dev/DevInterpreter.java @@ -105,7 +105,7 @@ public class DevInterpreter extends Interpreter { @Override public List<InterpreterCompletion> completion(String buf, int cursor) { - return new LinkedList<InterpreterCompletion>(); + return new LinkedList<>(); } public InterpreterContext getLastInterpretContext() { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/ClientFactory.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/ClientFactory.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/ClientFactory.java index 809c574..c980c47 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/ClientFactory.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/ClientFactory.java @@ -37,7 +37,7 @@ import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterService.Client; public class ClientFactory extends BasePooledObjectFactory<Client>{ private String host; private int port; - Map<Client, TSocket> clientSocketMap = new HashMap<Client, TSocket>(); + Map<Client, TSocket> clientSocketMap = new HashMap<>(); public ClientFactory(String host, int port) { this.host = host; @@ -64,7 +64,7 @@ public class ClientFactory extends BasePooledObjectFactory<Client>{ @Override public PooledObject<Client> wrap(Client client) { - return new DefaultPooledObject<Client>(client); + return new DefaultPooledObject<>(client); } @Override http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/InterpreterContextRunnerPool.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/InterpreterContextRunnerPool.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/InterpreterContextRunnerPool.java index ca2df12..064abd5 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/InterpreterContextRunnerPool.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/InterpreterContextRunnerPool.java @@ -35,7 +35,7 @@ public class InterpreterContextRunnerPool { private Map<String, List<InterpreterContextRunner>> interpreterContextRunners; public InterpreterContextRunnerPool() { - interpreterContextRunners = new HashMap<String, List<InterpreterContextRunner>>(); + interpreterContextRunners = new HashMap<>(); } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java index e0cdaa3..0ce7921 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java @@ -141,7 +141,7 @@ public class RemoteInterpreter extends Interpreter { } private Map<String, String> getEnvFromInterpreterProperty(Properties property) { - Map<String, String> env = new HashMap<String, String>(); + Map<String, String> env = new HashMap<>(); for (Object key : property.keySet()) { if (isEnvString((String) key)) { env.put((String) key, property.getProperty((String) key)); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java index 6f26ffd..c59a6f6 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java @@ -43,9 +43,9 @@ import java.util.Map; */ public class RemoteInterpreterEventClient implements ResourcePoolConnector { private final Logger logger = LoggerFactory.getLogger(RemoteInterpreterEvent.class); - private final List<RemoteInterpreterEvent> eventQueue = new LinkedList<RemoteInterpreterEvent>(); - private final List<ResourceSet> getAllResourceResponse = new LinkedList<ResourceSet>(); - private final Map<ResourceId, Object> getResourceResponse = new HashMap<ResourceId, Object>(); + private final List<RemoteInterpreterEvent> eventQueue = new LinkedList<>(); + private final List<ResourceSet> getAllResourceResponse = new LinkedList<>(); + private final Map<ResourceId, Object> getResourceResponse = new HashMap<>(); private final Gson gson = new Gson(); /** @@ -79,7 +79,7 @@ public class RemoteInterpreterEventClient implements ResourcePoolConnector { * notify angularObject removal */ public void angularObjectRemove(String name, String noteId, String paragraphId) { - Map<String, String> removeObject = new HashMap<String, String>(); + Map<String, String> removeObject = new HashMap<>(); removeObject.put("name", name); removeObject.put("noteId", noteId); removeObject.put("paragraphId", paragraphId); @@ -213,7 +213,7 @@ public class RemoteInterpreterEventClient implements ResourcePoolConnector { } public void onInterpreterOutputAppend(String noteId, String paragraphId, String output) { - Map<String, String> appendOutput = new HashMap<String, String>(); + Map<String, String> appendOutput = new HashMap<>(); appendOutput.put("noteId", noteId); appendOutput.put("paragraphId", paragraphId); appendOutput.put("data", output); @@ -224,7 +224,7 @@ public class RemoteInterpreterEventClient implements ResourcePoolConnector { } public void onInterpreterOutputUpdate(String noteId, String paragraphId, String output) { - Map<String, String> appendOutput = new HashMap<String, String>(); + Map<String, String> appendOutput = new HashMap<>(); appendOutput.put("noteId", noteId); appendOutput.put("paragraphId", paragraphId); appendOutput.put("data", output); @@ -243,7 +243,7 @@ public class RemoteInterpreterEventClient implements ResourcePoolConnector { } public void onAppOutputAppend(String noteId, String paragraphId, String appId, String output) { - Map<String, String> appendOutput = new HashMap<String, String>(); + Map<String, String> appendOutput = new HashMap<>(); appendOutput.put("noteId", noteId); appendOutput.put("paragraphId", paragraphId); appendOutput.put("appId", appId); @@ -256,7 +256,7 @@ public class RemoteInterpreterEventClient implements ResourcePoolConnector { public void onAppOutputUpdate(String noteId, String paragraphId, String appId, String output) { - Map<String, String> appendOutput = new HashMap<String, String>(); + Map<String, String> appendOutput = new HashMap<>(); appendOutput.put("noteId", noteId); appendOutput.put("paragraphId", paragraphId); appendOutput.put("appId", appId); @@ -268,7 +268,7 @@ public class RemoteInterpreterEventClient implements ResourcePoolConnector { } public void onAppStatusUpdate(String noteId, String paragraphId, String appId, String status) { - Map<String, String> appendOutput = new HashMap<String, String>(); + Map<String, String> appendOutput = new HashMap<>(); appendOutput.put("noteId", noteId); appendOutput.put("paragraphId", paragraphId); appendOutput.put("appId", appId); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java index 090aeea..f7fee49 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java @@ -211,7 +211,7 @@ public class RemoteInterpreterEventPoller extends Thread { boolean broken = false; try { client = interpreterProcess.getClient(); - List<String> resourceList = new LinkedList<String>(); + List<String> resourceList = new LinkedList<>(); Gson gson = new Gson(); for (Resource r : resourceSet) { resourceList.add(gson.toJson(r)); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcess.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcess.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcess.java index aef6c2b..62727bc 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcess.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcess.java @@ -78,7 +78,7 @@ public abstract class RemoteInterpreterProcess { } if (clientPool == null) { - clientPool = new GenericObjectPool<Client>(new ClientFactory(getHost(), getPort())); + clientPool = new GenericObjectPool<>(new ClientFactory(getHost(), getPort())); clientPool.setTestOnBorrow(true); remoteInterpreterEventPoller.setInterpreterGroup(interpreterGroup); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java index 0a7b1ed..cde6a7b 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java @@ -82,7 +82,7 @@ public class RemoteInterpreterServer public RemoteInterpreterServer(int port) throws TTransportException { this.port = port; - processor = new RemoteInterpreterService.Processor<RemoteInterpreterServer>(this); + processor = new RemoteInterpreterService.Processor<>(this); TServerSocket serverTransport = new TServerSocket(port); server = new TThreadPoolServer( new TThreadPoolServer.Args(serverTransport).processor(processor)); @@ -181,7 +181,7 @@ public class RemoteInterpreterServer synchronized (interpreterGroup) { List<Interpreter> interpreters = interpreterGroup.get(noteId); if (interpreters == null) { - interpreters = new LinkedList<Interpreter>(); + interpreters = new LinkedList<>(); interpreterGroup.put(noteId, interpreters); } @@ -532,7 +532,7 @@ public class RemoteInterpreterServer } private InterpreterContext convert(RemoteInterpreterContext ric, InterpreterOutput output) { - List<InterpreterContextRunner> contextRunners = new LinkedList<InterpreterContextRunner>(); + List<InterpreterContextRunner> contextRunners = new LinkedList<>(); List<InterpreterContextRunner> runners = gson.fromJson(ric.getRunners(), new TypeToken<List<RemoteInterpreterContextRunner>>() { }.getType()); @@ -774,7 +774,7 @@ public class RemoteInterpreterServer @Override public List<String> resourcePoolGetAll() throws TException { logger.debug("Request getAll from ZeppelinServer"); - List<String> result = new LinkedList<String>(); + List<String> result = new LinkedList<>(); if (resourcePool == null) { return result; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ExecutorFactory.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ExecutorFactory.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ExecutorFactory.java index 31b534e..c09af6d 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ExecutorFactory.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ExecutorFactory.java @@ -28,7 +28,7 @@ public class ExecutorFactory { private static ExecutorFactory _executor; private static Long _executorLock = new Long(0); - Map<String, ExecutorService> executor = new HashMap<String, ExecutorService>(); + Map<String, ExecutorService> executor = new HashMap<>(); public ExecutorFactory() { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/FIFOScheduler.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/FIFOScheduler.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/FIFOScheduler.java index 1837e4d..7ca4a0e 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/FIFOScheduler.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/FIFOScheduler.java @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; * FIFOScheduler runs submitted job sequentially */ public class FIFOScheduler implements Scheduler { - List<Job> queue = new LinkedList<Job>(); + List<Job> queue = new LinkedList<>(); private ExecutorService executor; private SchedulerListener listener; boolean terminate = false; @@ -53,7 +53,7 @@ public class FIFOScheduler implements Scheduler { @Override public Collection<Job> getJobsWaiting() { - List<Job> ret = new LinkedList<Job>(); + List<Job> ret = new LinkedList<>(); synchronized (queue) { for (Job job : queue) { ret.add(job); @@ -64,7 +64,7 @@ public class FIFOScheduler implements Scheduler { @Override public Collection<Job> getJobsRunning() { - List<Job> ret = new LinkedList<Job>(); + List<Job> ret = new LinkedList<>(); Job job = runningJob; if (job != null) { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ParallelScheduler.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ParallelScheduler.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ParallelScheduler.java index 1873944..36a67e3 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ParallelScheduler.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ParallelScheduler.java @@ -31,8 +31,8 @@ import org.slf4j.LoggerFactory; * Parallel scheduler runs submitted job concurrently. */ public class ParallelScheduler implements Scheduler { - List<Job> queue = new LinkedList<Job>(); - List<Job> running = new LinkedList<Job>(); + List<Job> queue = new LinkedList<>(); + List<Job> running = new LinkedList<>(); private ExecutorService executor; private SchedulerListener listener; boolean terminate = false; @@ -56,7 +56,7 @@ public class ParallelScheduler implements Scheduler { @Override public Collection<Job> getJobsWaiting() { - List<Job> ret = new LinkedList<Job>(); + List<Job> ret = new LinkedList<>(); synchronized (queue) { for (Job job : queue) { ret.add(job); @@ -82,7 +82,7 @@ public class ParallelScheduler implements Scheduler { @Override public Collection<Job> getJobsRunning() { - List<Job> ret = new LinkedList<Job>(); + List<Job> ret = new LinkedList<>(); synchronized (queue) { for (Job job : running) { ret.add(job); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/RemoteScheduler.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/RemoteScheduler.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/RemoteScheduler.java index 28c7437..8cd38dc 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/RemoteScheduler.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/RemoteScheduler.java @@ -39,8 +39,8 @@ import java.util.concurrent.ExecutorService; public class RemoteScheduler implements Scheduler { Logger logger = LoggerFactory.getLogger(RemoteScheduler.class); - List<Job> queue = new LinkedList<Job>(); - List<Job> running = new LinkedList<Job>(); + List<Job> queue = new LinkedList<>(); + List<Job> running = new LinkedList<>(); private ExecutorService executor; private SchedulerListener listener; boolean terminate = false; @@ -105,7 +105,7 @@ public class RemoteScheduler implements Scheduler { @Override public Collection<Job> getJobsWaiting() { - List<Job> ret = new LinkedList<Job>(); + List<Job> ret = new LinkedList<>(); synchronized (queue) { for (Job job : queue) { ret.add(job); @@ -131,7 +131,7 @@ public class RemoteScheduler implements Scheduler { @Override public Collection<Job> getJobsRunning() { - List<Job> ret = new LinkedList<Job>(); + List<Job> ret = new LinkedList<>(); synchronized (queue) { for (Job job : running) { ret.add(job); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerFactory.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerFactory.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerFactory.java index 20b4b8a..af52dec 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerFactory.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerFactory.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; public class SchedulerFactory implements SchedulerListener { private static final Logger logger = LoggerFactory.getLogger(SchedulerFactory.class); ExecutorService executor; - Map<String, Scheduler> schedulers = new LinkedHashMap<String, Scheduler>(); + Map<String, Scheduler> schedulers = new LinkedHashMap<>(); private static SchedulerFactory singleton; private static Long singletonLock = new Long(0); @@ -117,7 +117,7 @@ public class SchedulerFactory implements SchedulerListener { } public Collection<Scheduler> listScheduler(String name) { - List<Scheduler> s = new LinkedList<Scheduler>(); + List<Scheduler> s = new LinkedList<>(); synchronized (schedulers) { for (Scheduler ss : schedulers.values()) { s.add(ss); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/test/java/org/apache/zeppelin/display/InputTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/display/InputTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/display/InputTest.java index aeb0d83..4dd16ee 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/display/InputTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/display/InputTest.java @@ -102,7 +102,7 @@ public class InputTest { // test form substitution without new forms String script = "INPUT=${input_form=}SELECTED=${select_form(Selection Form)=,s_op1|s_op2|s_op3}\n" + "CHECKED=${checkbox:checkbox_form=c_op1|c_op2,c_op1|c_op2|c_op3}"; - Map<String, Object> params = new HashMap<String, Object>(); + Map<String, Object> params = new HashMap<>(); params.put("input_form", "some_input"); params.put("select_form", "s_op2"); params.put("checkbox_form", new String[]{"c_op1", "c_op3"}); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java index 5def888..c8f6650 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.java @@ -59,7 +59,7 @@ public class RemoteAngularObjectTest implements AngularObjectRegistryListener { intpGroup = new InterpreterGroup("intpId"); localRegistry = new RemoteAngularObjectRegistry("intpId", this, intpGroup); intpGroup.setAngularObjectRegistry(localRegistry); - env = new HashMap<String, String>(); + env = new HashMap<>(); env.put("ZEPPELIN_CLASSPATH", new File("./target/test-classes").getAbsolutePath()); Properties p = new Properties(); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java index 74649b1..2ba62c3 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterOutputTestStream.java @@ -50,7 +50,7 @@ public class RemoteInterpreterOutputTestStream implements RemoteInterpreterProce intpGroup = new InterpreterGroup(); intpGroup.put("note", new LinkedList<Interpreter>()); - env = new HashMap<String, String>(); + env = new HashMap<>(); env.put("ZEPPELIN_CLASSPATH", new File("./target/test-classes").getAbsolutePath()); } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java index af1c447..bdb8edc 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java @@ -65,7 +65,7 @@ public class RemoteInterpreterTest { @Before public void setUp() throws Exception { intpGroup = new InterpreterGroup(); - env = new HashMap<String, String>(); + env = new HashMap<>(); env.put("ZEPPELIN_CLASSPATH", new File("./target/test-classes").getAbsolutePath()); } @@ -384,7 +384,7 @@ public class RemoteInterpreterTest { intpA.open(); int concurrency = 3; - final List<String> results = new LinkedList<String>(); + final List<String> results = new LinkedList<>(); Scheduler scheduler = intpA.getScheduler(); for (int i = 0; i < concurrency; i++) { @@ -462,7 +462,7 @@ public class RemoteInterpreterTest { int concurrency = 4; final int timeToSleep = 1000; - final List<String> results = new LinkedList<String>(); + final List<String> results = new LinkedList<>(); long start = System.currentTimeMillis(); Scheduler scheduler = intpA.getScheduler(); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java index 02dba20..4bd2681 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/resource/DistributedResourcePoolTest.java @@ -55,7 +55,7 @@ public class DistributedResourcePoolTest { @Before public void setUp() throws Exception { - env = new HashMap<String, String>(); + env = new HashMap<>(); env.put("ZEPPELIN_CLASSPATH", new File("./target/test-classes").getAbsolutePath()); Properties p = new Properties(); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java index f17d88d..49de4a7 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java @@ -68,7 +68,7 @@ public class RemoteSchedulerTest implements RemoteInterpreterProcessListener { public void test() throws Exception { Properties p = new Properties(); final InterpreterGroup intpGroup = new InterpreterGroup(); - Map<String, String> env = new HashMap<String, String>(); + Map<String, String> env = new HashMap<>(); env.put("ZEPPELIN_CLASSPATH", new File("./target/test-classes").getAbsolutePath()); final RemoteInterpreter intpA = new RemoteInterpreter( @@ -157,7 +157,7 @@ public class RemoteSchedulerTest implements RemoteInterpreterProcessListener { public void testAbortOnPending() throws Exception { Properties p = new Properties(); final InterpreterGroup intpGroup = new InterpreterGroup(); - Map<String, String> env = new HashMap<String, String>(); + Map<String, String> env = new HashMap<>(); env.put("ZEPPELIN_CLASSPATH", new File("./target/test-classes").getAbsolutePath()); final RemoteInterpreter intpA = new RemoteInterpreter( http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/SleepingJob.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/SleepingJob.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/SleepingJob.java index 049c193..68b21ae 100644 --- a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/SleepingJob.java +++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/SleepingJob.java @@ -71,7 +71,7 @@ public class SleepingJob extends Job{ @Override public Map<String, Object> info() { - Map<String, Object> i = new HashMap<String, Object>(); + Map<String, Object> i = new HashMap<>(); i.put("LoopCount", Integer.toString(count)); return i; }
