Repository: zeppelin Updated Branches: refs/heads/master 2f79852d3 -> 99b975f5c
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-server/src/main/java/org/apache/zeppelin/server/ActiveDirectoryGroupRealm.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ActiveDirectoryGroupRealm.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ActiveDirectoryGroupRealm.java index 556f404..0c7c56d 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ActiveDirectoryGroupRealm.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ActiveDirectoryGroupRealm.java @@ -304,7 +304,7 @@ public class ActiveDirectoryGroupRealm extends AbstractLdapRealm { * @return a collection of roles that are implied by the given role names. */ protected Collection<String> getRoleNamesForGroups(Collection<String> groupNames) { - Set<String> roleNames = new HashSet<String>(groupNames.size()); + Set<String> roleNames = new HashSet<>(groupNames.size()); if (groupRolesMap != null) { for (String groupName : groupNames) { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-server/src/main/java/org/apache/zeppelin/server/JsonResponse.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/JsonResponse.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/JsonResponse.java index 8b5eed9..838e492 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/JsonResponse.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/JsonResponse.java @@ -75,7 +75,7 @@ public class JsonResponse<T> { */ public JsonResponse<T> addCookie(NewCookie newCookie) { if (cookies == null) { - cookies = new ArrayList<NewCookie>(); + cookies = new ArrayList<>(); } cookies.add(newCookie); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-server/src/main/java/org/apache/zeppelin/server/LdapGroupRealm.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/LdapGroupRealm.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/LdapGroupRealm.java index a718c77..e53027c 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/LdapGroupRealm.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/LdapGroupRealm.java @@ -56,7 +56,7 @@ public class LdapGroupRealm extends JndiLdapRealm { LdapContext ldapContext, String userDnTemplate) throws NamingException { try { - Set<String> roleNames = new LinkedHashSet<String>(); + Set<String> roleNames = new LinkedHashSet<>(); SearchControls searchCtls = new SearchControls(); searchCtls.setSearchScope(SearchControls.SUBTREE_SCOPE); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java index 5e8e3d5..9d6b813 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java @@ -302,7 +302,7 @@ public class ZeppelinServer extends Application { @Override public Set<Class<?>> getClasses() { - Set<Class<?>> classes = new HashSet<Class<?>>(); + Set<Class<?>> classes = new HashSet<>(); return classes; } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java index a3dff40..2ddb79b 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java @@ -86,8 +86,7 @@ public class NotebookServer extends WebSocketServlet implements Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").create(); final Map<String, List<NotebookSocket>> noteSocketMap = new HashMap<>(); final Queue<NotebookSocket> connectedSockets = new ConcurrentLinkedQueue<>(); - final Map<String, Queue<NotebookSocket>> userConnectedSockets = - new ConcurrentHashMap<String, Queue<NotebookSocket>>(); + final Map<String, Queue<NotebookSocket>> userConnectedSockets = new ConcurrentHashMap<>(); private Notebook notebook() { return ZeppelinServer.notebook; @@ -154,7 +153,7 @@ public class NotebookServer extends WebSocketServlet implements throw new Exception("Anonymous access not allowed "); } - HashSet<String> userAndRoles = new HashSet<String>(); + HashSet<String> userAndRoles = new HashSet<>(); userAndRoles.add(messagereceived.principal); if (!messagereceived.roles.equals("")) { HashSet<String> roles = gson.fromJson(messagereceived.roles, http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-server/src/test/java/com/webautomation/ScreenCaptureHtmlUnitDriver.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/java/com/webautomation/ScreenCaptureHtmlUnitDriver.java b/zeppelin-server/src/test/java/com/webautomation/ScreenCaptureHtmlUnitDriver.java index edb4ac9..adad807 100644 --- a/zeppelin-server/src/test/java/com/webautomation/ScreenCaptureHtmlUnitDriver.java +++ b/zeppelin-server/src/test/java/com/webautomation/ScreenCaptureHtmlUnitDriver.java @@ -114,8 +114,8 @@ public class ScreenCaptureHtmlUnitDriver extends HtmlUnitDriver implements Takes // http://stackoverflow.com/questions/2244272/how-can-i-tell-htmlunits-webclient-to-download-images-and-css protected byte[] downloadCssAndImages(WebClient webClient, HtmlPage page) throws Exception { WebWindow currentWindow = webClient.getCurrentWindow(); - Map<String, String> urlMapping = new HashMap<String, String>(); - Map<String, byte[]> files = new HashMap<String, byte[]>(); + Map<String, String> urlMapping = new HashMap<>(); + Map<String, byte[]> files = new HashMap<>(); WebWindow window = null; try { window = webClient.getWebWindowByName(page.getUrl().toString()+"_screenshot"); @@ -199,7 +199,7 @@ public class ScreenCaptureHtmlUnitDriver extends HtmlUnitDriver implements Takes } List<String> getLinksFromCss(String css) { - List<String> result = new LinkedList<String>(); + List<String> result = new LinkedList<>(); Matcher m = cssUrlPattern.matcher(css); while (m.find()) { // find next match result.add( m.group(2)); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-server/src/test/java/org/apache/zeppelin/AbstractZeppelinIT.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/AbstractZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/AbstractZeppelinIT.java index 9ef4af0..2aeaadb 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/AbstractZeppelinIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/AbstractZeppelinIT.java @@ -88,7 +88,7 @@ abstract public class AbstractZeppelinIT { } protected WebElement pollingWait(final By locator, final long timeWait) { - Wait<WebDriver> wait = new FluentWait<WebDriver>(driver) + Wait<WebDriver> wait = new FluentWait<>(driver) .withTimeout(timeWait, TimeUnit.SECONDS) .pollingEvery(1, TimeUnit.SECONDS) .ignoring(NoSuchElementException.class); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-server/src/test/java/org/apache/zeppelin/CommandExecutor.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/CommandExecutor.java b/zeppelin-server/src/test/java/org/apache/zeppelin/CommandExecutor.java index fd8a66f..6a55f3e 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/CommandExecutor.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/CommandExecutor.java @@ -40,7 +40,7 @@ public class CommandExecutor { private static IGNORE_ERRORS DEFAULT_BEHAVIOUR_ON_ERRORS = IGNORE_ERRORS.TRUE; public static Object executeCommandLocalHost(String[] command, boolean printToConsole, ProcessData.Types_Of_Data type, IGNORE_ERRORS ignore_errors) { - List<String> subCommandsAsList = new ArrayList<String>(Arrays.asList(command)); + List<String> subCommandsAsList = new ArrayList<>(Arrays.asList(command)); String mergedCommand = StringUtils.join(subCommandsAsList, " "); LOG.info("Sending command \"" + mergedCommand + "\" to localhost"); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter1.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter1.java b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter1.java index 5ff3bf0..b8343c0 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter1.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter1.java @@ -29,7 +29,7 @@ import org.apache.zeppelin.scheduler.Scheduler; import org.apache.zeppelin.scheduler.SchedulerFactory; public class MockInterpreter1 extends Interpreter{ - Map<String, Object> vars = new HashMap<String, Object>(); + Map<String, Object> vars = new HashMap<>(); public MockInterpreter1(Properties property) { super(property); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java index de2607f..6d0d0a9 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java @@ -340,7 +340,7 @@ public abstract class AbstractTestRestApi { @Override public boolean matchesSafely(HttpMethodBase httpMethodBase) { - method = (method == null) ? new WeakReference<HttpMethodBase>(httpMethodBase) : method; + method = (method == null) ? new WeakReference<>(httpMethodBase) : method; return httpMethodBase.getStatusCode() == expectedStatusCode; } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/Helium.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/Helium.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/Helium.java index a07f5f0..79eb3a6 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/Helium.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/Helium.java @@ -42,7 +42,7 @@ import java.util.Map; */ public class Helium { Logger logger = LoggerFactory.getLogger(Helium.class); - private List<HeliumRegistry> registry = new LinkedList<HeliumRegistry>(); + private List<HeliumRegistry> registry = new LinkedList<>(); private final HeliumConf heliumConf; private final String heliumConfPath; @@ -75,7 +75,7 @@ public class Helium { public List<HeliumRegistry> getAllRegistry() { synchronized (this.registry) { - List list = new LinkedList<HeliumRegistry>(); + List list = new LinkedList<>(); for (HeliumRegistry r : registry) { list.add(r); } @@ -88,7 +88,7 @@ public class Helium { if (!heliumConfFile.isFile()) { logger.warn("{} does not exists", path); HeliumConf conf = new HeliumConf(); - LinkedList<HeliumRegistry> defaultRegistry = new LinkedList<HeliumRegistry>(); + LinkedList<HeliumRegistry> defaultRegistry = new LinkedList<>(); defaultRegistry.add(new HeliumLocalRegistry("local", defaultLocalRegistryPath)); conf.setRegistry(defaultRegistry); this.registry = conf.getRegistry(); @@ -117,7 +117,7 @@ public class Helium { } public List<HeliumPackageSearchResult> getAllPackageInfo() { - List<HeliumPackageSearchResult> list = new LinkedList<HeliumPackageSearchResult>(); + List<HeliumPackageSearchResult> list = new LinkedList<>(); synchronized (registry) { for (HeliumRegistry r : registry) { try { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumConf.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumConf.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumConf.java index 2a93caa..2c535d4 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumConf.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumConf.java @@ -23,7 +23,7 @@ import java.util.List; * Helium config. This object will be persisted to conf/heliumc.conf */ public class HeliumConf { - List<HeliumRegistry> registry = new LinkedList<HeliumRegistry>(); + List<HeliumRegistry> registry = new LinkedList<>(); public List<HeliumRegistry> getRegistry() { return registry; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumLocalRegistry.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumLocalRegistry.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumLocalRegistry.java index ef28835..e54349b 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumLocalRegistry.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumLocalRegistry.java @@ -46,7 +46,7 @@ public class HeliumLocalRegistry extends HeliumRegistry { @Override public synchronized List<HeliumPackage> getAll() throws IOException { - List<HeliumPackage> result = new LinkedList<HeliumPackage>(); + List<HeliumPackage> result = new LinkedList<>(); File file = new File(uri()); File [] files = file.listFiles(); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumPackageSuggestion.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumPackageSuggestion.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumPackageSuggestion.java index 45c1640..9df6abc 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumPackageSuggestion.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumPackageSuggestion.java @@ -25,8 +25,7 @@ import java.util.List; * Suggested apps */ public class HeliumPackageSuggestion { - private final List<HeliumPackageSearchResult> available = - new LinkedList<HeliumPackageSearchResult>(); + private final List<HeliumPackageSearchResult> available = new LinkedList<>(); /* * possible future improvement http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/install/InstallInterpreter.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/install/InstallInterpreter.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/install/InstallInterpreter.java index da67d9f..7f3ef99 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/install/InstallInterpreter.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/install/InstallInterpreter.java @@ -56,7 +56,7 @@ public class InstallInterpreter { this.interpreterListFile = interpreterListFile; this.interpreterBaseDir = interpreterBaseDir; this.localRepoDir = localRepoDir; - availableInterpreters = new LinkedList<AvailableInterpreterInfo>(); + availableInterpreters = new LinkedList<>(); readAvailableInterpreters(); } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NoteInfo.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NoteInfo.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NoteInfo.java index 9783c76..d316dfb 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NoteInfo.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NoteInfo.java @@ -26,7 +26,7 @@ import java.util.Map; public class NoteInfo { String id; String name; - private Map<String, Object> config = new HashMap<String, Object>(); + private Map<String, Object> config = new HashMap<>(); public NoteInfo(String id, String name, Map<String, Object> config) { super(); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java index 0b21f8d..1b4b779 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java @@ -166,7 +166,7 @@ public class Notebook implements NoteEventListener { } if (subject != null && !"anonymous".equals(subject.getUser())) { - Set<String> owners = new HashSet<String>(); + Set<String> owners = new HashSet<>(); owners.add(subject.getUser()); notebookAuthorization.setOwners(note.getId(), owners); } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NotebookAuthorization.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NotebookAuthorization.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NotebookAuthorization.java index 75dc61b..c199c96 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NotebookAuthorization.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/NotebookAuthorization.java @@ -180,11 +180,11 @@ public class NotebookAuthorization { Map<String, Set<String>> noteAuthInfo = authInfo.get(noteId); Set<String> entities = null; if (noteAuthInfo == null) { - entities = new HashSet<String>(); + entities = new HashSet<>(); } else { entities = noteAuthInfo.get("owners"); if (entities == null) { - entities = new HashSet<String>(); + entities = new HashSet<>(); } } return entities; @@ -194,11 +194,11 @@ public class NotebookAuthorization { Map<String, Set<String>> noteAuthInfo = authInfo.get(noteId); Set<String> entities = null; if (noteAuthInfo == null) { - entities = new HashSet<String>(); + entities = new HashSet<>(); } else { entities = noteAuthInfo.get("readers"); if (entities == null) { - entities = new HashSet<String>(); + entities = new HashSet<>(); } } return entities; @@ -208,11 +208,11 @@ public class NotebookAuthorization { Map<String, Set<String>> noteAuthInfo = authInfo.get(noteId); Set<String> entities = null; if (noteAuthInfo == null) { - entities = new HashSet<String>(); + entities = new HashSet<>(); } else { entities = noteAuthInfo.get("writers"); if (entities == null) { - entities = new HashSet<String>(); + entities = new HashSet<>(); } } return entities; @@ -234,7 +234,7 @@ public class NotebookAuthorization { // return true if b is empty or if (a intersection b) is non-empty private boolean isMember(Set<String> a, Set<String> b) { - Set<String> intersection = new HashSet<String>(b); + Set<String> intersection = new HashSet<>(b); intersection.retainAll(a); return (b.isEmpty() || (intersection.size() > 0)); } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java index ad580ed..a1daeb5 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java @@ -65,7 +65,7 @@ public class Paragraph extends Job implements Serializable, Cloneable { /** * Applicaiton states in this paragraph */ - private final List<ApplicationState> apps = new LinkedList<ApplicationState>(); + private final List<ApplicationState> apps = new LinkedList<>(); @VisibleForTesting Paragraph() { @@ -85,7 +85,7 @@ public class Paragraph extends Job implements Serializable, Cloneable { user = null; dateUpdated = null; settings = new GUI(); - config = new HashMap<String, Object>(); + config = new HashMap<>(); } public Paragraph(Note note, JobListener listener, InterpreterFactory factory) { @@ -97,7 +97,7 @@ public class Paragraph extends Job implements Serializable, Cloneable { authenticationInfo = null; dateUpdated = null; settings = new GUI(); - config = new HashMap<String, Object>(); + config = new HashMap<>(); } private static String generateId() { @@ -453,7 +453,7 @@ public class Paragraph extends Job implements Serializable, Cloneable { resourcePool = intpGroup.getInterpreterGroup(getUser(), note.getId()).getResourcePool(); } - List<InterpreterContextRunner> runners = new LinkedList<InterpreterContextRunner>(); + List<InterpreterContextRunner> runners = new LinkedList<>(); for (Paragraph p : note.getParagraphs()) { runners.add(new ParagraphRunner(note, note.getId(), p.getId())); } @@ -549,7 +549,7 @@ public class Paragraph extends Job implements Serializable, Cloneable { public List<ApplicationState> getAllApplicationStates() { synchronized (apps) { - return new LinkedList<ApplicationState>(apps); + return new LinkedList<>(apps); } } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/AzureNotebookRepo.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/AzureNotebookRepo.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/AzureNotebookRepo.java index 70bec4f..05f2fdc 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/AzureNotebookRepo.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/AzureNotebookRepo.java @@ -86,7 +86,7 @@ public class AzureNotebookRepo implements NotebookRepo { @Override public List<NoteInfo> list(AuthenticationInfo subject) throws IOException { - List<NoteInfo> infos = new LinkedList<NoteInfo>(); + List<NoteInfo> infos = new LinkedList<>(); NoteInfo info = null; for (ListFileItem item : rootDir.listFilesAndDirectories()) { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java index fcc5045..445776e 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java @@ -53,7 +53,7 @@ public class NotebookRepoSync implements NotebookRepo { private static ZeppelinConfiguration config; private static final String defaultStorage = "org.apache.zeppelin.notebook.repo.VFSNotebookRepo"; - private List<NotebookRepo> repos = new ArrayList<NotebookRepo>(); + private List<NotebookRepo> repos = new ArrayList<>(); private final boolean oneWaySync; /** @@ -324,9 +324,9 @@ public class NotebookRepoSync implements NotebookRepo { NotebookRepo sourceRepo, List<NoteInfo> destNotes, NotebookRepo destRepo, AuthenticationInfo subject) throws IOException { - List <String> pushIDs = new ArrayList<String>(); - List <String> pullIDs = new ArrayList<String>(); - List <String> delDstIDs = new ArrayList<String>(); + List <String> pushIDs = new ArrayList<>(); + List <String> pullIDs = new ArrayList<>(); + List <String> delDstIDs = new ArrayList<>(); NoteInfo dnote; Date sdate, ddate; @@ -373,7 +373,7 @@ public class NotebookRepoSync implements NotebookRepo { } } - Map<String, List<String>> map = new HashMap<String, List<String>>(); + Map<String, List<String>> map = new HashMap<>(); map.put(pushKey, pushIDs); map.put(pullKey, pullIDs); map.put(delDstKey, delDstIDs); @@ -430,7 +430,7 @@ public class NotebookRepoSync implements NotebookRepo { int repoBound = Math.min(repoCount, getMaxRepoNum()); int errorCount = 0; String errorMessage = ""; - List<Revision> allRepoCheckpoints = new ArrayList<Revision>(); + List<Revision> allRepoCheckpoints = new ArrayList<>(); Revision rev = null; for (int i = 0; i < repoBound; i++) { try { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepo.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepo.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepo.java index 5f3ad96..39bee3a 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepo.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepo.java @@ -127,7 +127,7 @@ public class VFSNotebookRepo implements NotebookRepo { FileObject[] children = rootDir.getChildren(); - List<NoteInfo> infos = new LinkedList<NoteInfo>(); + List<NoteInfo> infos = new LinkedList<>(); for (FileObject f : children) { String fileName = f.getName().getBaseName(); if (f.isHidden() http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinClient.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinClient.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinClient.java index 1d7fe7e..c40b504 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinClient.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinClient.java @@ -185,7 +185,7 @@ public class ZeppelinClient { private Message zeppelinGetNoteMsg(String noteId) { Message getNoteMsg = new Message(Message.OP.GET_NOTE); - HashMap<String, Object> data = new HashMap<String, Object>(); + HashMap<String, Object> data = new HashMap<>(); data.put("id", noteId); getNoteMsg.data = data; return getNoteMsg; @@ -227,7 +227,7 @@ public class ZeppelinClient { } public void handleMsgFromZeppelin(String message, String noteId) { - Map<String, String> meta = new HashMap<String, String>(); + Map<String, String> meta = new HashMap<>(); meta.put("token", zeppelinhubToken); meta.put("noteId", noteId); Message zeppelinMsg = deserialize(message); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/utils/ZeppelinhubUtils.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/utils/ZeppelinhubUtils.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/utils/ZeppelinhubUtils.java index c13abe5..bc5e2dd 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/utils/ZeppelinhubUtils.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/utils/ZeppelinhubUtils.java @@ -37,7 +37,7 @@ public class ZeppelinhubUtils { LOG.error("Cannot create Live message: token is null or empty"); return ZeppelinhubMessage.EMPTY.serialize(); } - HashMap<String, Object> data = new HashMap<String, Object>(); + HashMap<String, Object> data = new HashMap<>(); data.put("token", token); return ZeppelinhubMessage .newMessage(ZeppelinHubOp.LIVE, data, new HashMap<String, String>()) @@ -49,7 +49,7 @@ public class ZeppelinhubUtils { LOG.error("Cannot create Dead message: token is null or empty"); return ZeppelinhubMessage.EMPTY.serialize(); } - HashMap<String, Object> data = new HashMap<String, Object>(); + HashMap<String, Object> data = new HashMap<>(); data.put("token", token); return ZeppelinhubMessage .newMessage(ZeppelinHubOp.DEAD, data, new HashMap<String, String>()) @@ -61,7 +61,7 @@ public class ZeppelinhubUtils { LOG.error("Cannot create Ping message: token is null or empty"); return ZeppelinhubMessage.EMPTY.serialize(); } - HashMap<String, Object> data = new HashMap<String, Object>(); + HashMap<String, Object> data = new HashMap<>(); data.put("token", token); return ZeppelinhubMessage .newMessage(ZeppelinHubOp.PING, data, new HashMap<String, String>()) http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/socket/Message.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/socket/Message.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/socket/Message.java index b78203c..ebddd4a 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/socket/Message.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/socket/Message.java @@ -144,7 +144,7 @@ public class Message { } public OP op; - public Map<String, Object> data = new HashMap<String, Object>(); + public Map<String, Object> data = new HashMap<>(); public String ticket = "anonymous"; public String principal = "anonymous"; public String roles = ""; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/utility/IdHashes.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/utility/IdHashes.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/utility/IdHashes.java index 04021e7..98aaac8 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/utility/IdHashes.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/utility/IdHashes.java @@ -38,7 +38,7 @@ public class IdHashes { */ private static String encode(Long value) { - List<Character> result = new ArrayList<Character>(); + List<Character> result = new ArrayList<>(); BigInteger base = new BigInteger("" + DICTIONARY.length); int exponent = 1; BigInteger remaining = new BigInteger(value.toString()); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java index 294817c..1c5d32a 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java @@ -86,7 +86,7 @@ public class HeliumApplicationFactoryTest implements JobListenerFactory { depResolver = new DependencyResolver(tmpDir.getAbsolutePath() + "/local-repo"); factory = new InterpreterFactory(conf, new InterpreterOption(true), null, null, heliumAppFactory, depResolver, false); - HashMap<String, String> env = new HashMap<String, String>(); + HashMap<String, String> env = new HashMap<>(); env.put("ZEPPELIN_CLASSPATH", new File("./target/test-classes").getAbsolutePath()); factory.setEnv(env); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumTestRegistry.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumTestRegistry.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumTestRegistry.java index d99f73f..873ab27 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumTestRegistry.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumTestRegistry.java @@ -22,7 +22,7 @@ import java.util.LinkedList; import java.util.List; public class HeliumTestRegistry extends HeliumRegistry { - List<HeliumPackage> infos = new LinkedList<HeliumPackage>(); + List<HeliumPackage> infos = new LinkedList<>(); public HeliumTestRegistry(String name, String uri) { super(name, uri); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java index a2a799a..f15cdd0 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterFactoryTest.java @@ -73,7 +73,7 @@ public class InterpreterFactoryTest { new File(tmpDir, "conf").mkdirs(); FileUtils.copyDirectory(new File("src/test/resources/interpreter"), new File(tmpDir, "interpreter")); - Map<String, InterpreterProperty> propertiesMockInterpreter1 = new HashMap<String, InterpreterProperty>(); + Map<String, InterpreterProperty> propertiesMockInterpreter1 = new HashMap<>(); propertiesMockInterpreter1.put("PROPERTY_1", new InterpreterProperty("PROPERTY_1", "", "VALUE_1", "desc")); propertiesMockInterpreter1.put("property_2", new InterpreterProperty("", "property_2", "value_2", "desc")); MockInterpreter1.register("mock1", "mock1", "org.apache.zeppelin.interpreter.mock.MockInterpreter1", propertiesMockInterpreter1); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter1.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter1.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter1.java index d690b67..e462f72 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter1.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter1.java @@ -30,7 +30,7 @@ import org.apache.zeppelin.scheduler.Scheduler; import org.apache.zeppelin.scheduler.SchedulerFactory; public class MockInterpreter1 extends Interpreter{ -Map<String, Object> vars = new HashMap<String, Object>(); +Map<String, Object> vars = new HashMap<>(); public MockInterpreter1(Properties property) { super(property); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter11.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter11.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter11.java index fd1e4f6..fc30726 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter11.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter11.java @@ -30,7 +30,7 @@ import org.apache.zeppelin.scheduler.Scheduler; import org.apache.zeppelin.scheduler.SchedulerFactory; public class MockInterpreter11 extends Interpreter{ - Map<String, Object> vars = new HashMap<String, Object>(); + Map<String, Object> vars = new HashMap<>(); public MockInterpreter11(Properties property) { super(property); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter2.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter2.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter2.java index 169bc3c..93f99ae 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter2.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockInterpreter2.java @@ -30,7 +30,7 @@ import org.apache.zeppelin.scheduler.Scheduler; import org.apache.zeppelin.scheduler.SchedulerFactory; public class MockInterpreter2 extends Interpreter{ - Map<String, Object> vars = new HashMap<String, Object>(); + Map<String, Object> vars = new HashMap<>(); public MockInterpreter2(Properties property) { super(property); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/99b975f5/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java index c590c16..abeda2e 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java @@ -294,7 +294,7 @@ public class NotebookTest implements JobListenerFactory{ factory.setInterpreters("user", note.getId(), factory.getDefaultInterpreterSettingList()); Paragraph p = note.addParagraph(); - Map config = new HashMap<String, Object>(); + Map config = new HashMap<>(); p.setConfig(config); p.setText("p1"); Date dateFinished = p.getDateFinished(); @@ -327,7 +327,7 @@ public class NotebookTest implements JobListenerFactory{ factory.setInterpreters(anonymous.getUser(), note.getId(), factory.getDefaultInterpreterSettingList()); Paragraph p = note.addParagraph(); - Map config = new HashMap<String, Object>(); + Map config = new HashMap<>(); p.setConfig(config); p.setText("sleep 1000"); @@ -612,40 +612,40 @@ public class NotebookTest implements JobListenerFactory{ NotebookAuthorization notebookAuthorization = notebook.getNotebookAuthorization(); // empty owners, readers or writers means note is public assertEquals(notebookAuthorization.isOwner(note.getId(), - new HashSet<String>(Arrays.asList("user2"))), true); + new HashSet<>(Arrays.asList("user2"))), true); assertEquals(notebookAuthorization.isReader(note.getId(), - new HashSet<String>(Arrays.asList("user2"))), true); + new HashSet<>(Arrays.asList("user2"))), true); assertEquals(notebookAuthorization.isWriter(note.getId(), - new HashSet<String>(Arrays.asList("user2"))), true); + new HashSet<>(Arrays.asList("user2"))), true); notebookAuthorization.setOwners(note.getId(), - new HashSet<String>(Arrays.asList("user1"))); + new HashSet<>(Arrays.asList("user1"))); notebookAuthorization.setReaders(note.getId(), - new HashSet<String>(Arrays.asList("user1", "user2"))); + new HashSet<>(Arrays.asList("user1", "user2"))); notebookAuthorization.setWriters(note.getId(), - new HashSet<String>(Arrays.asList("user1"))); + new HashSet<>(Arrays.asList("user1"))); assertEquals(notebookAuthorization.isOwner(note.getId(), - new HashSet<String>(Arrays.asList("user2"))), false); + new HashSet<>(Arrays.asList("user2"))), false); assertEquals(notebookAuthorization.isOwner(note.getId(), - new HashSet<String>(Arrays.asList("user1"))), true); + new HashSet<>(Arrays.asList("user1"))), true); assertEquals(notebookAuthorization.isReader(note.getId(), - new HashSet<String>(Arrays.asList("user3"))), false); + new HashSet<>(Arrays.asList("user3"))), false); assertEquals(notebookAuthorization.isReader(note.getId(), - new HashSet<String>(Arrays.asList("user2"))), true); + new HashSet<>(Arrays.asList("user2"))), true); assertEquals(notebookAuthorization.isWriter(note.getId(), - new HashSet<String>(Arrays.asList("user2"))), false); + new HashSet<>(Arrays.asList("user2"))), false); assertEquals(notebookAuthorization.isWriter(note.getId(), - new HashSet<String>(Arrays.asList("user1"))), true); + new HashSet<>(Arrays.asList("user1"))), true); // Test clearing of permssions notebookAuthorization.setReaders(note.getId(), Sets.<String>newHashSet()); assertEquals(notebookAuthorization.isReader(note.getId(), - new HashSet<String>(Arrays.asList("user2"))), true); + new HashSet<>(Arrays.asList("user2"))), true); assertEquals(notebookAuthorization.isReader(note.getId(), - new HashSet<String>(Arrays.asList("user3"))), true); + new HashSet<>(Arrays.asList("user3"))), true); notebook.removeNote(note.getId(), anonymous); }
