FALCON-1197 Use diamond operator in merlin and merlin-core. Contributed by Ruslan Ostafiychuk
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/0015a3b7 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/0015a3b7 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/0015a3b7 Branch: refs/heads/master Commit: 0015a3b76a526e2b86d35ffaf9a1268a44c669ce Parents: 844dab2 Author: Ruslan Ostafiychuk <[email protected]> Authored: Wed May 6 11:43:11 2015 +0300 Committer: Ruslan Ostafiychuk <[email protected]> Committed: Wed May 6 12:10:49 2015 +0300 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 2 ++ .../regression/Entities/ClusterMerlin.java | 2 +- .../falcon/regression/Entities/FeedMerlin.java | 4 +-- .../regression/Entities/ProcessMerlin.java | 2 +- .../falcon/regression/core/bundle/Bundle.java | 20 ++++++------- .../core/enumsAndConstants/MerlinConstants.java | 4 +-- .../core/helpers/FalconClientBuilder.java | 2 +- .../regression/core/helpers/LineageHelper.java | 10 ++----- .../core/response/lineage/EdgesResult.java | 2 +- .../core/response/lineage/VerticesResult.java | 4 +-- .../core/supportClasses/HadoopFileEditor.java | 4 +-- .../core/supportClasses/JmsMessageConsumer.java | 2 +- .../falcon/regression/core/util/BundleUtil.java | 4 +-- .../regression/core/util/CleanupUtil.java | 2 +- .../falcon/regression/core/util/ExecUtil.java | 2 +- .../falcon/regression/core/util/HCatUtil.java | 4 +-- .../falcon/regression/core/util/HadoopUtil.java | 14 ++++----- .../regression/core/util/InstanceUtil.java | 20 ++++++------- .../falcon/regression/core/util/OozieUtil.java | 26 ++++++++--------- .../falcon/regression/core/util/TimeUtil.java | 6 ++-- .../falcon/regression/core/util/Util.java | 10 +++---- .../org/apache/falcon/request/BaseRequest.java | 2 +- .../security/FalconAuthorizationToken.java | 2 +- .../regression/testHelper/BaseTestClass.java | 6 ++-- .../regression/ui/pages/EntitiesPage.java | 2 +- .../falcon/regression/ui/pages/EntityPage.java | 4 +-- .../falcon/regression/ui/pages/ProcessPage.java | 12 ++++---- .../falcon/regression/CombinedActionsTest.java | 4 +-- .../regression/ELExpCurrentAndLastWeekTest.java | 2 +- .../falcon/regression/ELValidationsTest.java | 2 +- .../regression/FeedInstanceListingTest.java | 2 +- .../apache/falcon/regression/NewRetryTest.java | 6 ++-- .../entity/EntitiesPatternSearchTest.java | 6 ++-- .../regression/entity/ListEntitiesTest.java | 2 +- .../regression/hcat/HCatFeedOperationsTest.java | 4 +-- .../falcon/regression/hcat/HCatProcessTest.java | 30 ++++++++++---------- .../regression/hcat/HCatReplicationTest.java | 12 ++++---- .../regression/hcat/HCatRetentionTest.java | 10 +++---- .../regression/lineage/EntitySummaryTest.java | 4 +-- .../lineage/LineageApiProcessInstanceTest.java | 2 +- .../regression/lineage/LineageApiTest.java | 4 +-- .../regression/lineage/ProcessPipelineTest.java | 2 +- .../falcon/regression/prism/FeedDelayTest.java | 2 +- .../regression/prism/PrismFeedDeleteTest.java | 4 +-- .../regression/prism/PrismFeedUpdateTest.java | 2 +- .../prism/PrismProcessDeleteTest.java | 4 +-- .../prism/ProcessPartitionExpVariableTest.java | 2 +- .../prism/RescheduleKilledProcessTest.java | 2 +- .../falcon/regression/prism/RetentionTest.java | 6 ++-- .../falcon/regression/ui/LineageGraphTest.java | 6 ++-- 50 files changed, 145 insertions(+), 149 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index 870187b..5d2400c 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -72,6 +72,8 @@ Trunk (Unreleased) IMPROVEMENTS + FALCON-1197 Use diamond operator in merlin and merlin-core (Ruslan Ostafiychuk) + FALCON-1131 Fixing FeedClusterUpdateTest and name confilcts in FALCON-1113(Pragya M via Samarth Gupta) http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/ClusterMerlin.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/ClusterMerlin.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/ClusterMerlin.java index a99b307..5acf1eb 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/ClusterMerlin.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/ClusterMerlin.java @@ -69,7 +69,7 @@ public class ClusterMerlin extends Cluster { final String oldName = getName(); final String newName = TestEntityUtil.generateUniqueName(prefix, oldName); setName(newName); - final HashMap<String, String> nameMap = new HashMap<String, String>(1); + final HashMap<String, String> nameMap = new HashMap<>(1); nameMap.put(oldName, newName); return nameMap; } http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/FeedMerlin.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/FeedMerlin.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/FeedMerlin.java index 1b59227..9dba50a 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/FeedMerlin.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/FeedMerlin.java @@ -63,7 +63,7 @@ public class FeedMerlin extends Feed { } public static List<FeedMerlin> fromString(List<String> feedStrings) { - List<FeedMerlin> feeds = new ArrayList<FeedMerlin>(); + List<FeedMerlin> feeds = new ArrayList<>(); for (String feedString : feedStrings) { feeds.add(fromString(feedString)); } @@ -289,7 +289,7 @@ public class FeedMerlin extends Feed { final String oldName = getName(); final String newName = TestEntityUtil.generateUniqueName(prefix, oldName); setName(newName); - final HashMap<String, String> nameMap = new HashMap<String, String>(1); + final HashMap<String, String> nameMap = new HashMap<>(1); nameMap.put(oldName, newName); return nameMap; } http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/ProcessMerlin.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/ProcessMerlin.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/ProcessMerlin.java index 8732a44..4b06abc 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/ProcessMerlin.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/Entities/ProcessMerlin.java @@ -174,7 +174,7 @@ public class ProcessMerlin extends Process { final String oldName = getName(); final String newName = TestEntityUtil.generateUniqueName(prefix, oldName); setName(newName); - final HashMap<String, String> nameMap = new HashMap<String, String>(1); + final HashMap<String, String> nameMap = new HashMap<>(1); nameMap.put(oldName, newName); return nameMap; } http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java index 2f43972..a4635b4 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java @@ -136,14 +136,14 @@ public class Bundle { public Bundle(String clusterData, List<String> dataSets, String processData) { this.dataSets = dataSets; this.processData = processData; - this.clusters = new ArrayList<String>(); + this.clusters = new ArrayList<>(); this.clusters.add(clusterData); } public Bundle(Bundle bundle, String prefix) { - this.dataSets = new ArrayList<String>(bundle.getDataSets()); + this.dataSets = new ArrayList<>(bundle.getDataSets()); this.processData = bundle.getProcessData(); - this.clusters = new ArrayList<String>(); + this.clusters = new ArrayList<>(); for (String cluster : bundle.getClusters()) { this.clusters.add(BundleUtil.getEnvClusterXML(cluster, prefix).toString()); } @@ -154,7 +154,7 @@ public class Bundle { } public void setClusterData(List<String> pClusters) { - this.clusters = new ArrayList<String>(pClusters); + this.clusters = new ArrayList<>(pClusters); } /** * Unwraps cluster element to string and writes it to bundle. @@ -162,7 +162,7 @@ public class Bundle { * @param c Cluster object to be unwrapped and set into bundle */ public void writeClusterElement(org.apache.falcon.entity.v0.cluster.Cluster c) { - final List<String> newClusters = new ArrayList<String>(); + final List<String> newClusters = new ArrayList<>(); newClusters.add(c.toString()); setClusterData(newClusters); } @@ -178,7 +178,7 @@ public class Bundle { public List<String> getClusterNames() { - List<String> clusterNames = new ArrayList<String>(); + List<String> clusterNames = new ArrayList<>(); for (String cluster : clusters) { clusterNames.add(new ClusterMerlin(cluster).getName()); } @@ -216,13 +216,13 @@ public class Bundle { public void generateUniqueBundle(String prefix) { /* creating new names */ List<ClusterMerlin> clusterMerlinList = BundleUtil.getClustersFromStrings(clusters); - Map<String, String> clusterNameMap = new HashMap<String, String>(); + Map<String, String> clusterNameMap = new HashMap<>(); for (ClusterMerlin clusterMerlin : clusterMerlinList) { clusterNameMap.putAll(clusterMerlin.setUniqueName(prefix)); } List<FeedMerlin> feedMerlinList = FeedMerlin.fromString(dataSets); - Map<String, String> feedNameMap = new HashMap<String, String>(); + Map<String, String> feedNameMap = new HashMap<>(); for (FeedMerlin feedMerlin : feedMerlinList) { feedNameMap.putAll(feedMerlin.setUniqueName(prefix)); } @@ -726,7 +726,7 @@ public class Bundle { String endTime) { //generate and set clusters ClusterMerlin c = new ClusterMerlin(getClusters().get(0)); - List<String> newClusters = new ArrayList<String>(); + List<String> newClusters = new ArrayList<>(); final String clusterName = c.getName(); for (int i = 0; i < numberOfClusters; i++) { c.setName(clusterName + i); @@ -735,7 +735,7 @@ public class Bundle { setClusterData(newClusters); //generate and set newDataSets - List<String> newDataSets = new ArrayList<String>(); + List<String> newDataSets = new ArrayList<>(); for (int i = 0; i < numberOfInputs; i++) { final FeedMerlin feed = new FeedMerlin(getDataSets().get(0)); feed.setName(feed.getName() + "-input" + i); http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/enumsAndConstants/MerlinConstants.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/enumsAndConstants/MerlinConstants.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/enumsAndConstants/MerlinConstants.java index b8eafe4..7f0f5c7 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/enumsAndConstants/MerlinConstants.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/enumsAndConstants/MerlinConstants.java @@ -103,13 +103,13 @@ public final class MerlinConstants { LOGGER.info("user2Name: " + user2Name); LOGGER.info("user2Keytab: " + user2Keytab); USER2_NAME = user2Name; - keyTabMap = new HashMap<String, String>(); + keyTabMap = new HashMap<>(); keyTabMap.put(CURRENT_USER_NAME, currentUserKeytab); keyTabMap.put(user2Name, user2Keytab); keyTabMap.put(FALCON_SUPER_USER_NAME, Config.getProperty("falcon.super.user.keytab")); keyTabMap.put(FALCON_SUPER_USER2_NAME, Config.getProperty("falcon.super.user2.keytab")); keyTabMap.put(DIFFERENT_USER_NAME, Config.getProperty("other.user.keytab")); - passwordMap = new HashMap<String, String>(); + passwordMap = new HashMap<>(); passwordMap.put(DIFFERENT_USER_NAME, Config.getProperty("other.user.password")); } http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/FalconClientBuilder.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/FalconClientBuilder.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/FalconClientBuilder.java index a5d2046..2e6fca9 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/FalconClientBuilder.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/FalconClientBuilder.java @@ -95,7 +95,7 @@ public final class FalconClientBuilder implements Builder<CommandLine> { private FalconClientBuilder(String user) { this.user = user; - args = new ArrayList<String>(); + args = new ArrayList<>(); if (user == null) { suType = SuType.NONE; commandLine = suType.getCommandLine(null); http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/LineageHelper.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/LineageHelper.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/LineageHelper.java index 12464be..7726c9e 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/LineageHelper.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/LineageHelper.java @@ -212,13 +212,7 @@ public class LineageHelper { String responseString = null; try { responseString = runGetRequestSuccessfully(url); - } catch (URISyntaxException e) { - AssertUtil.fail(e); - } catch (IOException e) { - AssertUtil.fail(e); - } catch (AuthenticationException e) { - AssertUtil.fail(e); - } catch (InterruptedException e) { + } catch (URISyntaxException | InterruptedException | AuthenticationException | IOException e) { AssertUtil.fail(e); } return new GsonBuilder().create().fromJson(responseString, clazz); @@ -260,7 +254,7 @@ public class LineageHelper { } public VerticesResult getVertices(Vertex.FilterKey key, String value) { - Map<String, String> params = new TreeMap<String, String>(); + Map<String, String> params = new TreeMap<>(); params.put("key", key.toString()); params.put("value", value); return getVerticesResult(getUrl(URL.VERTICES, params)); http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/EdgesResult.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/EdgesResult.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/EdgesResult.java index 7bce1e4..5fdbd89 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/EdgesResult.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/EdgesResult.java @@ -39,7 +39,7 @@ public class EdgesResult extends GraphResult { } public List<Edge> filterEdgesByType(List<Edge> edges, Edge.LabelType edgeLabel) { - final List<Edge> result = new ArrayList<Edge>(); + final List<Edge> result = new ArrayList<>(); for (Edge edge : edges) { if (edge.getLabel() == edgeLabel) { result.add(edge); http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/VerticesResult.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/VerticesResult.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/VerticesResult.java index abb909c..df0fd2a 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/VerticesResult.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/response/lineage/VerticesResult.java @@ -40,7 +40,7 @@ public class VerticesResult extends GraphResult { public List<Vertex> filterVerticesByType(Vertex.VERTEX_TYPE vertexType, List<Vertex> vertexList) { - List<Vertex> result = new ArrayList<Vertex>(); + List<Vertex> result = new ArrayList<>(); for (Vertex vertex : vertexList) { if (vertex.getType() == vertexType) { result.add(vertex); @@ -54,7 +54,7 @@ public class VerticesResult extends GraphResult { } public List<Vertex> filterVerticesByName(String name, List<Vertex> vertexList) { - List<Vertex> result = new ArrayList<Vertex>(); + List<Vertex> result = new ArrayList<>(); for (Vertex vertex : vertexList) { if (vertex.getName().equals(name)) { result.add(vertex); http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/HadoopFileEditor.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/HadoopFileEditor.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/HadoopFileEditor.java index 5a8d0a0..5ea765a 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/HadoopFileEditor.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/HadoopFileEditor.java @@ -42,8 +42,8 @@ public class HadoopFileEditor { public HadoopFileEditor(FileSystem fs) { this.fs = fs; - paths = new ArrayList<String>(); - files = new ArrayList<String>(); + paths = new ArrayList<>(); + files = new ArrayList<>(); } /** http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/JmsMessageConsumer.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/JmsMessageConsumer.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/JmsMessageConsumer.java index 89a31b5..5ce60cd 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/JmsMessageConsumer.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/JmsMessageConsumer.java @@ -54,7 +54,7 @@ public class JmsMessageConsumer extends Thread { super(topicName); this.topicName = topicName; this.brokerURL = brokerURL; - receivedMessages = new ArrayList<MapMessage>(); + receivedMessages = new ArrayList<>(); setDaemon(true); } http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java index a825845..7baa7dd 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java @@ -102,7 +102,7 @@ public final class BundleUtil { File[] files = list.toArray(new File[list.size()]); Arrays.sort(files); String clusterData = ""; - final List<String> dataSets = new ArrayList<String>(); + final List<String> dataSets = new ArrayList<>(); String processData = ""; for (File file : files) { @@ -238,7 +238,7 @@ public final class BundleUtil { } public static List<ClusterMerlin> getClustersFromStrings(List<String> clusterStrings) { - List<ClusterMerlin> clusters = new ArrayList<ClusterMerlin>(); + List<ClusterMerlin> clusters = new ArrayList<>(); for (String clusterString : clusterStrings) { clusters.add(new ClusterMerlin(clusterString)); } http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/CleanupUtil.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/CleanupUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/CleanupUtil.java index 89ae254..a7695fb 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/CleanupUtil.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/CleanupUtil.java @@ -58,7 +58,7 @@ public final class CleanupUtil { LOGGER.error("Caught exception: " + ExceptionUtils.getStackTrace(e)); return null; } - List<String> entities = new ArrayList<String>(); + List<String> entities = new ArrayList<>(); if (entityList.getElements() != null) { for (EntityList.EntityElement entity : entityList.getElements()) { if (entity.name.startsWith(namePrefix)) { http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/ExecUtil.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/ExecUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/ExecUtil.java index 82c8919..0a8e0df 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/ExecUtil.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/ExecUtil.java @@ -72,7 +72,7 @@ public final class ExecUtil { session.connect(); Assert.assertTrue(session.isConnected(), "The session was not connected correctly!"); - List<String> data = new ArrayList<String>(); + List<String> data = new ArrayList<>(); ChannelExec channel = (ChannelExec) session.openChannel("exec"); channel.setPty(true); http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/HCatUtil.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/HCatUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/HCatUtil.java index 3ac0e6a..1b463cd 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/HCatUtil.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/HCatUtil.java @@ -61,10 +61,10 @@ public final class HCatUtil { List<String> partitionLocations, String partitionCol, String dbName, String tableName) throws HCatException { Assert.assertEquals(partitions.size(), partitionLocations.size(), "Number of locations is not same as number of partitions."); - final List<HCatAddPartitionDesc> partitionDesc = new ArrayList<HCatAddPartitionDesc>(); + final List<HCatAddPartitionDesc> partitionDesc = new ArrayList<>(); for (int i = 0; i < partitions.size(); ++i) { final String partition = partitions.get(i); - final Map<String, String> onePartition = new HashMap<String, String>(); + final Map<String, String> onePartition = new HashMap<>(); onePartition.put(partitionCol, partition); final String partitionLoc = partitionLocations.get(i); partitionDesc.add(HCatAddPartitionDesc.create(dbName, tableName, partitionLoc, onePartition).build()); http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/HadoopUtil.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/HadoopUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/HadoopUtil.java index b91725c..bb2fdfb 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/HadoopUtil.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/HadoopUtil.java @@ -70,7 +70,7 @@ public final class HadoopUtil { * @throws IOException */ public static List<String> getAllFilesHDFS(FileSystem fs, Path location) throws IOException { - List<String> files = new ArrayList<String>(); + List<String> files = new ArrayList<>(); if (!fs.exists(location)) { return files; } @@ -93,7 +93,7 @@ public final class HadoopUtil { */ public static List<Path> getAllDirsRecursivelyHDFS( FileSystem fs, Path location, int depth) throws IOException { - List<Path> returnList = new ArrayList<Path>(); + List<Path> returnList = new ArrayList<>(); FileStatus[] stats = fs.listStatus(location); for (FileStatus stat : stats) { if (isDir(stat)) { @@ -115,7 +115,7 @@ public final class HadoopUtil { */ public static List<Path> getAllFilesRecursivelyHDFS( FileSystem fs, Path location) throws IOException { - List<Path> returnList = new ArrayList<Path>(); + List<Path> returnList = new ArrayList<>(); RemoteIterator<LocatedFileStatus> remoteIterator; try { remoteIterator = fs.listFiles(location, true); @@ -203,7 +203,7 @@ public final class HadoopUtil { */ public static List<String> getHDFSSubFoldersName(FileSystem fs, String baseDir) throws IOException { - List<String> returnList = new ArrayList<String>(); + List<String> returnList = new ArrayList<>(); FileStatus[] stats = fs.listStatus(new Path(baseDir)); for (FileStatus stat : stats) { if (isDir(stat)) { @@ -242,7 +242,7 @@ public final class HadoopUtil { */ private static List<String> getAllFileNamesFromHDFS( FileSystem fs, String hdfsPath) throws IOException { - List<String> returnList = new ArrayList<String>(); + List<String> returnList = new ArrayList<>(); LOGGER.info("getting file from folder: " + hdfsPath); FileStatus[] stats = fs.listStatus(new Path(hdfsPath)); for (FileStatus stat : stats) { @@ -325,7 +325,7 @@ public final class HadoopUtil { LOGGER.info("Creating data in folders: \n" + remoteLocations); File input = new File(inputPath); File[] files = input.isDirectory() ? input.listFiles() : new File[]{input}; - List<Path> filePaths = new ArrayList<Path>(); + List<Path> filePaths = new ArrayList<>(); assert files != null; for (final File file : files) { if (!file.isDirectory()) { @@ -336,7 +336,7 @@ public final class HadoopUtil { if (!remotePathPrefix.endsWith("/") && !remoteLocations.get(0).startsWith("/")) { remotePathPrefix += "/"; } - List<String> locations = new ArrayList<String>(); + List<String> locations = new ArrayList<>(); for (String remoteDir : remoteLocations) { String remoteLocation = remotePathPrefix + remoteDir; remoteLocation = cutProtocol(remoteLocation); http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java index 723ea89..1ce1a13 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java @@ -156,7 +156,7 @@ public final class InstanceUtil { InstancesResult.Instance[] instances = instancesResult.getInstances(); LOGGER.info("instances: " + Arrays.toString(instances)); List<InstancesResult.WorkflowStatus> statuses = - new ArrayList<InstancesResult.WorkflowStatus>(); + new ArrayList<>(); for (InstancesResult.Instance instance : instances) { LOGGER.info("instance: " + instance + " status = " + instance.getStatus()); statuses.add(instance.getStatus()); @@ -203,7 +203,7 @@ public final class InstanceUtil { LOGGER.info("instances: " + Arrays.toString(instances)); Assert.assertNotNull(instances, "instances should be not null"); Assert.assertEquals(instances.length, totalCount, "Total Instances"); - List<InstancesResult.WorkflowStatus> statuses = new ArrayList<InstancesResult.WorkflowStatus>(); + List<InstancesResult.WorkflowStatus> statuses = new ArrayList<>(); for (InstancesResult.Instance instance : instances) { final InstancesResult.WorkflowStatus status = instance.getStatus(); LOGGER.info("status: " + status + ", instance: " + instance.getInstance()); @@ -228,7 +228,7 @@ public final class InstanceUtil { InstancesResult.Instance[] instances = instancesResult.getInstances(); LOGGER.info("Instances: " + Arrays.toString(instances)); Assert.assertNotNull(instances, "Instances should be not null"); - List<String> wfIds = new ArrayList<String>(); + List<String> wfIds = new ArrayList<>(); for (InstancesResult.Instance instance : instances) { LOGGER.warn(String.format( "instance: %s, status: %s, logs : %s", instance, instance.getStatus(), instance.getLogFile())); @@ -274,7 +274,7 @@ public final class InstanceUtil { String bundleID = OozieUtil.getBundles(oozieClient, processName, EntityType.PROCESS).get(0); List<String> workflowJobIds = OozieUtil.getWorkflowJobs(oozieClient, bundleID); - List<String> toBeReturned = new ArrayList<String>(); + List<String> toBeReturned = new ArrayList<>(); for (String jobId : workflowJobIds) { WorkflowJob wfJob = oozieClient.getJobInfo(jobId); LOGGER.info("wfJob.getId(): " + wfJob.getId() + " wfJob.getStartTime(): " @@ -298,7 +298,7 @@ public final class InstanceUtil { if (totalWorkflows != -1) { Assert.assertEquals(workflowIds.size(), totalWorkflows); } - final List<WorkflowJob.Status> statuses = new ArrayList<WorkflowJob.Status>(); + final List<WorkflowJob.Status> statuses = new ArrayList<>(); for (String wfId : workflowIds) { final WorkflowJob.Status status = oozieClient.getJobInfo(wfId).getStatus(); LOGGER.info("wfId: " + wfId + " status: " + status); @@ -329,7 +329,7 @@ public final class InstanceUtil { public static int getInstanceCountWithStatus(OozieClient oozieClient, String processName, CoordinatorAction.Status status, EntityType entityType) throws OozieClientException { List<CoordinatorAction> coordActions = getProcessInstanceList(oozieClient, processName, entityType); - List<CoordinatorAction.Status> statuses = new ArrayList<CoordinatorAction.Status>(); + List<CoordinatorAction.Status> statuses = new ArrayList<>(); for (CoordinatorAction action : coordActions) { statuses.add(action.getStatus()); } @@ -415,7 +415,7 @@ public final class InstanceUtil { conf = runConf.substring(runConf.indexOf("falconInPaths</name>") + 20); conf = conf.substring(conf.indexOf("<value>") + 7); conf = conf.substring(0, conf.indexOf("</value>")); - return new ArrayList<String>(Arrays.asList(conf.split(","))); + return new ArrayList<>(Arrays.asList(conf.split(","))); } public static int getInstanceRunIdFromCoord(OozieClient oozieClient, String coordID, int instanceNumber) @@ -455,7 +455,7 @@ public final class InstanceUtil { public static List<CoordinatorAction> getProcessInstanceListFromAllBundles( OozieClient oozieClient, String processName, EntityType entityType) throws OozieClientException { - List<CoordinatorAction> list = new ArrayList<CoordinatorAction>(); + List<CoordinatorAction> list = new ArrayList<>(); final List<String> bundleIds = OozieUtil.getBundles(oozieClient, processName, entityType); LOGGER.info("bundle size for process is " + bundleIds.size()); for (String bundleId : bundleIds) { @@ -526,7 +526,7 @@ public final class InstanceUtil { } else { filter = "name=FALCON_PROCESS_" + entityName; } - List<BundleJob> bundleJobs = new ArrayList<BundleJob>(); + List<BundleJob> bundleJobs = new ArrayList<>(); for (int retries = 0; retries < 20; ++retries) { bundleJobs = OozieUtil.getBundles(client, filter, 0, 10); if (bundleJobs.size() > 0) { @@ -546,7 +546,7 @@ public final class InstanceUtil { String.format("Bundle job %s is should be prep/running but is %s", bundleId, bundleStatus)); OozieUtil.waitForCoordinatorJobCreation(client, bundleId); List<CoordinatorJob> coords = client.getBundleJobInfo(bundleId).getCoordinators(); - List<String> cIds = new ArrayList<String>(); + List<String> cIds = new ArrayList<>(); if (entityType == EntityType.PROCESS) { for (CoordinatorJob coord : coords) { cIds.add(coord.getId()); http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/OozieUtil.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/OozieUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/OozieUtil.java index 138b45f..15b0497 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/OozieUtil.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/OozieUtil.java @@ -71,7 +71,7 @@ public final class OozieUtil { } public static List<String> getBundleIds(List<BundleJob> bundles) { - List<String> ids = new ArrayList<String>(); + List<String> ids = new ArrayList<>(); for (BundleJob bundle : bundles) { LOGGER.info("Bundle Id: " + bundle.getId()); ids.add(bundle.getId()); @@ -85,7 +85,7 @@ public final class OozieUtil { } public static List<Job.Status> getBundleStatuses(List<BundleJob> bundles) { - List<Job.Status> statuses = new ArrayList<Job.Status>(); + List<Job.Status> statuses = new ArrayList<>(); for (BundleJob bundle : bundles) { LOGGER.info("bundle: " + bundle); statuses.add(bundle.getStatus()); @@ -129,7 +129,7 @@ public final class OozieUtil { OozieClient oozieClient) throws OozieClientException { LOGGER.info("Connecting to oozie: " + oozieClient.getOozieUrl()); - List<String> jobIds = new ArrayList<String>(); + List<String> jobIds = new ArrayList<>(); LOGGER.info("using bundleId:" + bundleID); waitForCoordinatorJobCreation(oozieClient, bundleID); final String coordinatorId = @@ -195,7 +195,7 @@ public final class OozieUtil { public static List<DateTime> getStartTimeForRunningCoordinators(ColoHelper prismHelper, String bundleID) throws OozieClientException { - List<DateTime> startTimes = new ArrayList<DateTime>(); + List<DateTime> startTimes = new ArrayList<>(); OozieClient oozieClient = prismHelper.getClusterHelper().getOozieClient(); BundleJob bundleJob = oozieClient.getBundleJobInfo(bundleID); @@ -282,13 +282,13 @@ public final class OozieUtil { if (actions != null) { missingDependencies = actions.get(0).getMissingDependencies().split("#"); } - return new ArrayList<String>(Arrays.asList(missingDependencies)); + return new ArrayList<>(Arrays.asList(missingDependencies)); } public static List<String> getWorkflowJobs(OozieClient oozieClient, String bundleID) throws OozieClientException { waitForCoordinatorJobCreation(oozieClient, bundleID); - List<String> workflowIds = new ArrayList<String>(); + List<String> workflowIds = new ArrayList<>(); List<CoordinatorJob> coordJobs = oozieClient.getBundleJobInfo(bundleID).getCoordinators(); CoordinatorJob coordJobInfo = oozieClient.getCoordJobInfo(coordJobs.get(0).getId()); @@ -301,7 +301,7 @@ public final class OozieUtil { public static List<String> getWorkflow(OozieClient oozieClient, String bundleID) throws OozieClientException { waitForCoordinatorJobCreation(oozieClient, bundleID); - List<String> workflowIds = new ArrayList<String>(); + List<String> workflowIds = new ArrayList<>(); String coordId = getDefaultCoordIDFromBundle(oozieClient, bundleID); CoordinatorJob coordJobInfo = oozieClient.getCoordJobInfo(coordId); for (CoordinatorAction action : coordJobInfo.getActions()) { @@ -349,7 +349,7 @@ public final class OozieUtil { String bundleId, EntityType type) throws OozieClientException { Map<Date, CoordinatorAction.Status> actions = getActionsNominalTimeAndStatus(oozieClient, bundleId, type); - List<String> nominalTime = new ArrayList<String>(); + List<String> nominalTime = new ArrayList<>(); for (Date date : actions.keySet()) { nominalTime.add(date.toString()); } @@ -358,7 +358,7 @@ public final class OozieUtil { public static Map<Date, CoordinatorAction.Status> getActionsNominalTimeAndStatus(OozieClient oozieClient, String bundleId, EntityType type) throws OozieClientException { - Map<Date, CoordinatorAction.Status> result = new TreeMap<Date, CoordinatorAction.Status>(); + Map<Date, CoordinatorAction.Status> result = new TreeMap<>(); List<CoordinatorAction> actions = getDefaultOozieCoord(oozieClient, bundleId, type).getActions(); for (CoordinatorAction action : actions) { result.put(action.getNominalTime(), action.getStatus()); @@ -449,7 +449,7 @@ public final class OozieUtil { private static List<String> getMissingDependenciesForInstance(OozieClient oozieClient, List<CoordinatorJob> coords, int instanceNumber) throws OozieClientException { - ArrayList<String> missingPaths = new ArrayList<String>(); + ArrayList<String> missingPaths = new ArrayList<>(); for (CoordinatorJob coord : coords) { CoordinatorJob temp = oozieClient.getCoordJobInfo(coord.getId()); CoordinatorAction instance = temp.getActions().get(instanceNumber); @@ -481,7 +481,7 @@ public final class OozieUtil { private static List<List<String>> getMissingDependenciesForBundle(OozieClient oozieClient, List<CoordinatorJob> coords) throws OozieClientException, IOException { - List<List<String>> missingDependencies = new ArrayList<List<String>>(); + List<List<String>> missingDependencies = new ArrayList<>(); for (CoordinatorJob coord : coords) { CoordinatorJob temp = oozieClient.getCoordJobInfo(coord.getId()); for (int instanceNumber = 0; instanceNumber < temp.getActions().size(); @@ -533,7 +533,7 @@ public final class OozieUtil { throws OozieClientException { final OozieClient oozieClient = helper.getOozieClient(); List<CoordinatorJob> coords = getBundleCoordinators(oozieClient, bundleId); - List<String> replicationCoordID = new ArrayList<String>(); + List<String> replicationCoordID = new ArrayList<>(); for (CoordinatorJob coord : coords) { if (coord.getAppName().contains("FEED_REPLICATION")) { replicationCoordID.add(coord.getId()); @@ -556,7 +556,7 @@ public final class OozieUtil { //sequence start from 0 List<String> bundleIds = getBundles(oozieClient, entityName, entityType); - Map<Integer, String> bundleMap = new TreeMap<Integer, String>(); + Map<Integer, String> bundleMap = new TreeMap<>(); String bundleID; for (String strID : bundleIds) { LOGGER.info("getSequenceBundleID: " + strID); http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/TimeUtil.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/TimeUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/TimeUtil.java index 8157b7f..c5dd0fd 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/TimeUtil.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/TimeUtil.java @@ -103,7 +103,7 @@ public final class TimeUtil { if (minuteSkip == 0) { minuteSkip = 1; } - List<String> dates = new ArrayList<String>(); + List<String> dates = new ArrayList<>(); while (!startDate.isAfter(endDate)) { dates.add(formatter.print(startDate)); startDate = startDate.plusMinutes(minuteSkip); @@ -120,7 +120,7 @@ public final class TimeUtil { */ public static List<String> convertDatesToString(List<DateTime> dates, DateTimeFormatter formatter) { - List<String> dateString = new ArrayList<String>(); + List<String> dateString = new ArrayList<>(); formatter.withZoneUTC(); for (DateTime date : dates) { dateString.add(formatter.print(date)); @@ -154,7 +154,7 @@ public final class TimeUtil { */ public static List<DateTime> getDatesOnEitherSide(DateTime startDate, DateTime endDate, int skip, FreqType freqType) { - final List<DateTime> dates = new ArrayList<DateTime>(); + final List<DateTime> dates = new ArrayList<>(); if (!startDate.isAfter(endDate)) { dates.add(startDate); } http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java index a3d8e87..0cce072 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java @@ -189,7 +189,7 @@ public final class Util { */ public static List<String> getHadoopDataFromDir(FileSystem fs, String feed, String dir) throws IOException { - List<String> finalResult = new ArrayList<String>(); + List<String> finalResult = new ArrayList<>(); String feedPath = new FeedMerlin(feed).getFeedPath(); int depth = feedPath.split(dir)[1].split("/").length - 1; List<Path> results = HadoopUtil.getAllDirsRecursivelyHDFS(fs, new Path(dir), depth); @@ -232,7 +232,7 @@ public final class Util { coloHelper.getProcessHelper().getUsername(), coloHelper.getProcessHelper().getIdentityFile() ); - List<String> finalList = new ArrayList<String>(); + List<String> finalList = new ArrayList<>(); for (String line : raw) { finalList.add(line.split(",")[0]); } @@ -250,7 +250,7 @@ public final class Util { coloHelper.getProcessHelper().getUsername(), coloHelper.getProcessHelper().getIdentityFile() ); - List<String> finalList = new ArrayList<String>(); + List<String> finalList = new ArrayList<>(); for (String line : raw) { finalList.add(line.split(",")[0]); } @@ -428,7 +428,7 @@ public final class Util { * @return request type */ public static String getMethodType(String url) { - List<String> postList = new ArrayList<String>(); + List<String> postList = new ArrayList<>(); postList.add("/entities/validate"); postList.add("/entities/submit"); postList.add("/entities/submitAndSchedule"); @@ -443,7 +443,7 @@ public final class Util { return "post"; } } - List<String> deleteList = new ArrayList<String>(); + List<String> deleteList = new ArrayList<>(); deleteList.add("/entities/delete"); for (String item : deleteList) { if (url.toLowerCase().contains(item)) { http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/request/BaseRequest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/request/BaseRequest.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/request/BaseRequest.java index 0ee1e4a..a70ceeb 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/request/BaseRequest.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/request/BaseRequest.java @@ -99,7 +99,7 @@ public class BaseRequest { this.user = (null == user) ? RequestKeys.CURRENT_USER : user; this.uri = new URI(url); target = new HttpHost(uri.getHost(), uri.getPort(), uri.getScheme()); - this.headers = new ArrayList<Header>(); + this.headers = new ArrayList<>(); this.requestData = data; } http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin-core/src/main/java/org/apache/falcon/security/FalconAuthorizationToken.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/security/FalconAuthorizationToken.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/security/FalconAuthorizationToken.java index 0dfdd9b..7ab8f9a 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/security/FalconAuthorizationToken.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/security/FalconAuthorizationToken.java @@ -44,7 +44,7 @@ public final class FalconAuthorizationToken { // Use a hashmap so that we can cache the tokens. private final ConcurrentHashMap<String, AuthenticatedURL.Token> tokens = - new ConcurrentHashMap<String, AuthenticatedURL.Token>(); + new ConcurrentHashMap<>(); private FalconAuthorizationToken() { } http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/testHelper/BaseTestClass.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/testHelper/BaseTestClass.java b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/testHelper/BaseTestClass.java index a3bd096..28dbdf3 100644 --- a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/testHelper/BaseTestClass.java +++ b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/testHelper/BaseTestClass.java @@ -57,8 +57,8 @@ public class BaseTestClass { // loginFromKeytab as the current user prism = new ColoHelper(PRISM_PREFIX); servers = getServers(); - serverFS = new ArrayList<FileSystem>(); - serverOC = new ArrayList<OozieClient>(); + serverFS = new ArrayList<>(); + serverOC = new ArrayList<>(); try { for (ColoHelper server : servers) { serverFS.add(server.getClusterHelper().getHadoopFS()); @@ -92,7 +92,7 @@ public class BaseTestClass { } private List<ColoHelper> getServers() { - ArrayList<ColoHelper> returnList = new ArrayList<ColoHelper>(); + ArrayList<ColoHelper> returnList = new ArrayList<>(); for (String serverName : serverNames) { returnList.add(new ColoHelper(serverName)); } http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/EntitiesPage.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/EntitiesPage.java b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/EntitiesPage.java index 16ff525..b175470 100644 --- a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/EntitiesPage.java +++ b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/EntitiesPage.java @@ -110,7 +110,7 @@ public class EntitiesPage extends Page { private Map<String, String> getEntitiesOnPage() { LOGGER.info("Reading all entities on page..."); List<WebElement> lines = driver.findElements(By.xpath(ENTITIES_TABLE)); - Map<String, String> entities = new HashMap<String, String>(); + Map<String, String> entities = new HashMap<>(); for (WebElement line : lines) { WebElement name = line.findElement(By.xpath("./td[1]/a")); WebElement status = line.findElement(By.xpath("./td[2]")); http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/EntityPage.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/EntityPage.java b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/EntityPage.java index 88a744b..6b6d17f 100644 --- a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/EntityPage.java +++ b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/EntityPage.java @@ -53,7 +53,7 @@ public class EntityPage<T> extends Page { * @return page of defined CLUSTER entity */ public static EntityPage<Cluster> getClusterPage(WebDriver driver, ColoHelper helper, String entityName) { - return new EntityPage<Cluster>(driver, helper, EntityType.CLUSTER, Cluster.class, entityName); + return new EntityPage<>(driver, helper, EntityType.CLUSTER, Cluster.class, entityName); } /** @@ -62,7 +62,7 @@ public class EntityPage<T> extends Page { * @return page of defined FEED entity */ public static EntityPage<Feed> getFeedPage(WebDriver driver, ColoHelper helper, String entityName) { - return new EntityPage<Feed>(driver, helper, EntityType.FEED, Feed.class, entityName); + return new EntityPage<>(driver, helper, EntityType.FEED, Feed.class, entityName); } /** http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/ProcessPage.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/ProcessPage.java b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/ProcessPage.java index c66fea6..36fb1fe 100644 --- a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/ProcessPage.java +++ b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/pages/ProcessPage.java @@ -118,7 +118,7 @@ public class ProcessPage extends EntityPage<Process> { "Vertices blocks with names not found"); List<WebElement> blocks = driver.findElements(By.xpath(VERTICES_TEXT)); LOGGER.info(blocks.size() + " elements found"); - map = new HashMap<String, List<String>>(); + map = new HashMap<>(); for (WebElement block : blocks) { waitForElement(block, ".[contains(.,'/')]", DEFAULT_TIMEOUT, "Expecting text to contain '/' :" + block.getText()); @@ -130,7 +130,7 @@ public class ProcessPage extends EntityPage<Process> { if (map.containsKey(name)) { map.get(name).add(nominalTime); } else { - List<String> instances = new ArrayList<String>(); + List<String> instances = new ArrayList<>(); instances.add(nominalTime); map.put(name, instances); } @@ -144,7 +144,7 @@ public class ProcessPage extends EntityPage<Process> { */ public List<String> getAllVerticesNames() { LOGGER.info("Getting all vertices names from lineage graph..."); - List<String> list = new ArrayList<String>(); + List<String> list = new ArrayList<>(); if (isLineageOpened) { waitForElement(CLOSE_LINEAGE_LINK_TEMPLATE, DEFAULT_TIMEOUT, "Close Lineage button not found"); @@ -185,7 +185,7 @@ public class ProcessPage extends EntityPage<Process> { waitForElement(LINEAGE_INFO_PANEL_LIST, DEFAULT_TIMEOUT, "Info panel not found"); List<WebElement> infoBlocks = driver.findElements(By.xpath(LINEAGE_INFO_PANEL_LIST)); LOGGER.info(infoBlocks.size() + " values found"); - map = new HashMap<String, String>(); + map = new HashMap<>(); for (WebElement infoBlock : infoBlocks) { String text = infoBlock.getText(); String[] values = text.split("\n"); @@ -202,7 +202,7 @@ public class ProcessPage extends EntityPage<Process> { public HashMap<String, String> getLegends() { HashMap<String, String> map = null; if (isLineageOpened) { - map = new HashMap<String, String>(); + map = new HashMap<>(); List<WebElement> legends = driver.findElements(By.xpath(LINEAGE_LEGENDS_ELEMENTS)); for (WebElement legend : legends) { String value = legend.getText(); @@ -245,7 +245,7 @@ public class ProcessPage extends EntityPage<Process> { List<Point[]> pathsEndpoints = null; LOGGER.info("Getting edges from lineage graph..."); if (isLineageOpened) { - pathsEndpoints = new ArrayList<Point[]>(); + pathsEndpoints = new ArrayList<>(); List<WebElement> paths = driver.findElements(By.xpath(EDGE)); LOGGER.info(paths.size() + " edges found"); for (WebElement path : paths) { http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/CombinedActionsTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/CombinedActionsTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/CombinedActionsTest.java index ff7b2b2..0c24f7e 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/CombinedActionsTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/CombinedActionsTest.java @@ -127,10 +127,10 @@ public class CombinedActionsTest extends BaseTestClass { final List<String> dataset = HadoopUtil.flattenAndPutDataInFolder(clusterFS, LOCALHCATDATA, inputHDFSDir, dataDates); - ArrayList<HCatFieldSchema> cols = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> cols = new ArrayList<>(); cols.add(HCatUtil.getStringSchema(COL1NAME, COL1NAME + " comment")); cols.add(HCatUtil.getStringSchema(COL2NAME, COL2NAME + " comment")); - ArrayList<HCatFieldSchema> partitionCols = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> partitionCols = new ArrayList<>(); partitionCols.add(HCatUtil.getStringSchema(PARTITIONCOLUMN, PARTITIONCOLUMN + " partition")); clusterHC.createTable(HCatCreateTableDesc http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpCurrentAndLastWeekTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpCurrentAndLastWeekTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpCurrentAndLastWeekTest.java index 8c5d330..bdfdbd5 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpCurrentAndLastWeekTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpCurrentAndLastWeekTest.java @@ -157,7 +157,7 @@ public class ELExpCurrentAndLastWeekTest extends BaseTestClass { private List<String> getQADepedencyList(Bundle bundle, String firstDep, String endDep) { String path = baseTestDir + "/testData/"; - List<String> returnList = new ArrayList<String>(); + List<String> returnList = new ArrayList<>(); List<String> dataSets = TimeUtil.getMinuteDatesOnEitherSide(firstDep, endDep, bundle.getInitialDatasetFrequency()); for (String str : dataSets) { http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELValidationsTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELValidationsTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELValidationsTest.java index 37f1149..f5664c2 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELValidationsTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELValidationsTest.java @@ -237,7 +237,7 @@ public class ELValidationsTest extends BaseTestClass { nominalTime.setTimeZone(tz); LOGGER.info("nominalTime: " + initialTime.getTime()); LOGGER.info("finalTime: " + finalTime.getTime()); - List<String> returnList = new ArrayList<String>(); + List<String> returnList = new ArrayList<>(); while (!initialTime.getTime().equals(finalTime.getTime())) { LOGGER.info("initialTime: " + initialTime.getTime()); returnList.add(getPath(path, initialTime)); http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceListingTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceListingTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceListingTest.java index 753b39a..ab885a8 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceListingTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceListingTest.java @@ -239,7 +239,7 @@ public class FeedInstanceListingTest extends BaseTestClass{ LOGGER.info("instances: " + Arrays.toString(instances)); Assert.assertNotNull(instances, "instances should be not null"); Assert.assertEquals(instances.length, totalCount, "Total Instances"); - List<String> statuses = new ArrayList<String>(); + List<String> statuses = new ArrayList<>(); for (FeedInstanceResult.Instance instance : instances) { Assert.assertNotNull(instance.getCluster()); Assert.assertNotNull(instance.getInstance()); http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NewRetryTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NewRetryTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NewRetryTest.java index aec7e39..081938f 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NewRetryTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NewRetryTest.java @@ -933,7 +933,7 @@ public class NewRetryTest extends BaseTestClass { maxNumberOfRetries = 0; } LOGGER.info("coordinator: " + coordinator); - HashMap<String, Boolean> workflowMap = new HashMap<String, Boolean>(); + HashMap<String, Boolean> workflowMap = new HashMap<>(); if (coordinator == null || coordinator.getActions().size() == 0) { return false; @@ -1052,7 +1052,7 @@ public class NewRetryTest extends BaseTestClass { private HashMap<String, Integer> getFailureRetriesForEachWorkflow(OozieClient oozieClient, CoordinatorJob coordinator) throws Exception { - HashMap<String, Integer> workflowRetryMap = new HashMap<String, Integer>(); + HashMap<String, Integer> workflowRetryMap = new HashMap<>(); for (CoordinatorAction action : coordinator.getActions()) { if (null == action.getExternalId()) { @@ -1068,7 +1068,7 @@ public class NewRetryTest extends BaseTestClass { private DateTime[] getFailureTimeBoundaries(OozieClient oozieClient, String bundleId) throws Exception { - List<DateTime> dateList = new ArrayList<DateTime>(); + List<DateTime> dateList = new ArrayList<>(); CoordinatorJob coordinator = getDefaultOozieCoordinator(oozieClient, bundleId); http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/EntitiesPatternSearchTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/EntitiesPatternSearchTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/EntitiesPatternSearchTest.java index 7387e2b..6e7bbc5 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/EntitiesPatternSearchTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/EntitiesPatternSearchTest.java @@ -142,8 +142,8 @@ public class EntitiesPatternSearchTest extends BaseTestClass { private void validateOutputPatternList(EntityElement[] entityElements, EntityElement[] outputelements, String pattern) { - List<String> actualOutputElements = new ArrayList<String>(); - List<String> expectedOutputElements = new ArrayList<String>(); + List<String> actualOutputElements = new ArrayList<>(); + List<String> expectedOutputElements = new ArrayList<>(); for(EntityElement e : entityElements) { if (getOutputEntity(e.name, pattern)) { expectedOutputElements.add(e.name); @@ -184,7 +184,7 @@ public class EntitiesPatternSearchTest extends BaseTestClass { } private List<String> getPatternName() { - List<String> nameList = new ArrayList<String>(); + List<String> nameList = new ArrayList<>(); nameList.add("New-Entity-Definition"); nameList.add("NewEntityDefinition"); nameList.add("newentitydefine"); http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/ListEntitiesTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/ListEntitiesTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/ListEntitiesTest.java index e3fcaf1..1c33821 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/ListEntitiesTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/ListEntitiesTest.java @@ -291,7 +291,7 @@ public class ListEntitiesTest extends BaseTestClass { } private String getRandomTags() { - List<String> tagsList = new ArrayList<String>(); + List<String> tagsList = new ArrayList<>(); Random r = new Random(); if (r.nextInt(4) == 0) { tagsList.add(tags[0]); http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java index 4d2ac2d..89a6714 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java @@ -78,7 +78,7 @@ public class HCatFeedOperationsTest extends BaseTestClass { clusterHC = cluster.getClusterHelper().getHCatClient(); cluster2HC = cluster2.getClusterHelper().getHCatClient(); //create an empty table for feed operations - ArrayList<HCatFieldSchema> partitions = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> partitions = new ArrayList<>(); partitions.add(HCatUtil.getStringSchema("year", "yearPartition")); createEmptyTable(clusterHC, dbName, tableName, partitions); @@ -255,7 +255,7 @@ public class HCatFeedOperationsTest extends BaseTestClass { private static void createEmptyTable(HCatClient cli, String dbName, String tabName, List<HCatFieldSchema> partitionCols) throws HCatException{ - ArrayList<HCatFieldSchema> cols = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> cols = new ArrayList<>(); cols.add(HCatUtil.getStringSchema("id", "id comment")); HCatCreateTableDesc tableDesc = HCatCreateTableDesc .create(dbName, tabName, cols) http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatProcessTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatProcessTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatProcessTest.java index 7d05d6b..03e1797 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatProcessTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatProcessTest.java @@ -142,10 +142,10 @@ public class HCatProcessTest extends BaseTestClass { final List<String> dataset = HadoopUtil .flattenAndPutDataInFolder(clusterFS, localHCatData, inputHDFSDir, dataDates); - ArrayList<HCatFieldSchema> cols = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> cols = new ArrayList<>(); cols.add(HCatUtil.getStringSchema(col1Name, col1Name + " comment")); cols.add(HCatUtil.getStringSchema(col2Name, col2Name + " comment")); - ArrayList<HCatFieldSchema> partitionCols = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> partitionCols = new ArrayList<>(); partitionCols.add(HCatUtil.getStringSchema(partitionColumn, partitionColumn + " partition")); clusterHC.createTable(HCatCreateTableDesc @@ -204,10 +204,10 @@ public class HCatProcessTest extends BaseTestClass { final List<String> dataset2 = HadoopUtil .flattenAndPutDataInFolder(clusterFS, localHCatData, inputHDFSDir2, dataDates); - ArrayList<HCatFieldSchema> cols = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> cols = new ArrayList<>(); cols.add(HCatUtil.getStringSchema(col1Name, col1Name + " comment")); cols.add(HCatUtil.getStringSchema(col2Name, col2Name + " comment")); - ArrayList<HCatFieldSchema> partitionCols = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> partitionCols = new ArrayList<>(); partitionCols.add(HCatUtil.getStringSchema(partitionColumn, partitionColumn + " partition")); clusterHC.createTable(HCatCreateTableDesc @@ -295,10 +295,10 @@ public class HCatProcessTest extends BaseTestClass { final List<String> dataset = HadoopUtil .flattenAndPutDataInFolder(clusterFS, localHCatData, inputHDFSDir, dataDates); - ArrayList<HCatFieldSchema> cols = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> cols = new ArrayList<>(); cols.add(HCatUtil.getStringSchema(col1Name, col1Name + " comment")); cols.add(HCatUtil.getStringSchema(col2Name, col2Name + " comment")); - ArrayList<HCatFieldSchema> partitionCols = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> partitionCols = new ArrayList<>(); partitionCols.add(HCatUtil.getStringSchema(partitionColumn, partitionColumn + " partition")); clusterHC.createTable(HCatCreateTableDesc @@ -377,10 +377,10 @@ public class HCatProcessTest extends BaseTestClass { final List<String> dataset2 = HadoopUtil .flattenAndPutDataInFolder(clusterFS, localHCatData, inputHDFSDir2, dataDates); - ArrayList<HCatFieldSchema> cols = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> cols = new ArrayList<>(); cols.add(HCatUtil.getStringSchema(col1Name, col1Name + " comment")); cols.add(HCatUtil.getStringSchema(col2Name, col2Name + " comment")); - ArrayList<HCatFieldSchema> partitionCols = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> partitionCols = new ArrayList<>(); partitionCols.add(HCatUtil.getStringSchema(partitionColumn, partitionColumn + " partition")); clusterHC.createTable(HCatCreateTableDesc @@ -488,10 +488,10 @@ public class HCatProcessTest extends BaseTestClass { final List<String> dataset = HadoopUtil .flattenAndPutDataInFolder(clusterFS, localHCatData, inputHDFSDir, dataDates); - ArrayList<HCatFieldSchema> cols = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> cols = new ArrayList<>(); cols.add(HCatUtil.getStringSchema(col1Name, col1Name + " comment")); cols.add(HCatUtil.getStringSchema(col2Name, col2Name + " comment")); - ArrayList<HCatFieldSchema> partitionCols = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> partitionCols = new ArrayList<>(); partitionCols.add(HCatUtil.getStringSchema(partitionColumn, partitionColumn + " partition")); clusterHC.createTable(HCatCreateTableDesc @@ -550,10 +550,10 @@ public class HCatProcessTest extends BaseTestClass { final List<String> dataset = HadoopUtil. flattenAndPutDataInFolder(clusterFS, localHCatData, inputHDFSDir, dataDates); - ArrayList<HCatFieldSchema> cols = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> cols = new ArrayList<>(); cols.add(HCatUtil.getStringSchema(col1Name, col1Name + " comment")); cols.add(HCatUtil.getStringSchema(col2Name, col2Name + " comment")); - ArrayList<HCatFieldSchema> partitionCols = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> partitionCols = new ArrayList<>(); partitionCols.add(HCatUtil.getStringSchema(partitionColumn, partitionColumn + " partition")); clusterHC.createTable(HCatCreateTableDesc @@ -603,10 +603,10 @@ public class HCatProcessTest extends BaseTestClass { String databaseName, String tableName) throws HCatException { Assert.assertEquals(partitions.size(), partitionLocations.size(), "Number of locations is not same as number of partitions."); - final List<HCatAddPartitionDesc> partitionDesc = new ArrayList<HCatAddPartitionDesc>(); + final List<HCatAddPartitionDesc> partitionDesc = new ArrayList<>(); for (int i = 0; i < partitions.size(); ++i) { final String partition = partitions.get(i); - final Map<String, String> onePartition = new HashMap<String, String>(); + final Map<String, String> onePartition = new HashMap<>(); onePartition.put(partitionCol, partition); final String partitionLoc = partitionLocations.get(i); partitionDesc.add( @@ -622,7 +622,7 @@ public class HCatProcessTest extends BaseTestClass { DateTimeFormatter formatter = DateTimeFormat.forPattern(datePattern); LOGGER.info("generating data between " + formatter.print(startDateJoda) + " and " + formatter.print(endDateJoda)); - List<String> dates = new ArrayList<String>(); + List<String> dates = new ArrayList<>(); dates.add(formatter.print(startDateJoda)); while (!startDateJoda.isAfter(endDateJoda)) { startDateJoda = startDateJoda.plusMinutes(skipMinutes); http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java index cd1b538..59a2077 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java @@ -157,10 +157,10 @@ public class HCatReplicationTest extends BaseTestClass { final String col2Name = "value"; final String partitionColumn = "dt"; - ArrayList<HCatFieldSchema> cols = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> cols = new ArrayList<>(); cols.add(HCatUtil.getStringSchema(col1Name, col1Name + " comment")); cols.add(HCatUtil.getStringSchema(col2Name, col2Name + " comment")); - ArrayList<HCatFieldSchema> partitionCols = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> partitionCols = new ArrayList<>(); // create table on cluster 1 and add data to it. partitionCols.add(HCatUtil.getStringSchema(partitionColumn, partitionColumn + " partition")); @@ -241,10 +241,10 @@ public class HCatReplicationTest extends BaseTestClass { final String col2Name = "value"; final String partitionColumn = "dt"; - ArrayList<HCatFieldSchema> cols = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> cols = new ArrayList<>(); cols.add(HCatUtil.getStringSchema(col1Name, col1Name + " comment")); cols.add(HCatUtil.getStringSchema(col2Name, col2Name + " comment")); - ArrayList<HCatFieldSchema> partitionCols = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> partitionCols = new ArrayList<>(); // create table on cluster 1 and add data to it. partitionCols.add(HCatUtil.getStringSchema(partitionColumn, partitionColumn + " partition")); @@ -317,10 +317,10 @@ public class HCatReplicationTest extends BaseTestClass { HCatException { Assert.assertEquals(partitions.size(), partitionLocations.size(), "Number of locations is not same as number of partitions."); - final List<HCatAddPartitionDesc> partitionDesc = new ArrayList<HCatAddPartitionDesc>(); + final List<HCatAddPartitionDesc> partitionDesc = new ArrayList<>(); for (int i = 0; i < partitions.size(); ++i) { final String partition = partitions.get(i); - final Map<String, String> onePartition = new HashMap<String, String>(); + final Map<String, String> onePartition = new HashMap<>(); onePartition.put(partitionCol, partition); final String partitionLoc = partitionLocations.get(i); partitionDesc http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatRetentionTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatRetentionTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatRetentionTest.java index 2213c1d..d639c21 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatRetentionTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatRetentionTest.java @@ -152,7 +152,7 @@ public class HCatRetentionTest extends BaseTestClass { private static List<String> getHadoopDataFromDir(FileSystem fs, String hadoopPath, String dir, FreqType freqType) throws IOException { - List<String> finalResult = new ArrayList<String>(); + List<String> finalResult = new ArrayList<>(); final int dirDepth = freqType.getDirDepth(); List<Path> results = HadoopUtil.getAllDirsRecursivelyHDFS(fs, @@ -183,7 +183,7 @@ public class HCatRetentionTest extends BaseTestClass { FreqType freqType, DateTime endDateUTC, List<String> inputData) { - List<String> finalData = new ArrayList<String>(); + List<String> finalData = new ArrayList<>(); //convert the end date to the same format final String endLimit = @@ -200,8 +200,8 @@ public class HCatRetentionTest extends BaseTestClass { private static void createPartitionedTable(HCatClient client, String dbName, String tableName, String tableLoc, FreqType dataType) throws HCatException { - ArrayList<HCatFieldSchema> cols = new ArrayList<HCatFieldSchema>(); - ArrayList<HCatFieldSchema> ptnCols = new ArrayList<HCatFieldSchema>(); + ArrayList<HCatFieldSchema> cols = new ArrayList<>(); + ArrayList<HCatFieldSchema> ptnCols = new ArrayList<>(); //client.dropDatabase("sample_db", true, HCatClient.DropDBMode.CASCADE); @@ -240,7 +240,7 @@ public class HCatRetentionTest extends BaseTestClass { List<String> dataFolders) throws HCatException { //Adding specific partitions that map to an external location - Map<String, String> ptn = new HashMap<String, String>(); + Map<String, String> ptn = new HashMap<>(); for (int i = 0; i < dataDates.size(); ++i) { final String dataFolder = dataFolders.get(i); final DateTime dataDate = dataDates.get(i); http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/EntitySummaryTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/EntitySummaryTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/EntitySummaryTest.java index 67b80d8..849f67a 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/EntitySummaryTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/EntitySummaryTest.java @@ -184,7 +184,7 @@ public class EntitySummaryTest extends BaseTestClass { OozieClientException, InterruptedException { String entityName = Util.readEntityName(entity); AbstractEntityHelper helper; - List<String> names = new ArrayList<String>(); + List<String> names = new ArrayList<>(); for (int i = 1; i <= 7; i++) { String uniqueName = entityName + i; names.add(uniqueName); @@ -322,7 +322,7 @@ public class EntitySummaryTest extends BaseTestClass { bundles[0].submitFeeds(prism); String clusterName = Util.readEntityName(bundles[0].getClusters().get(0)); String originName = bundles[0].getProcessName(); - List<String> pNames = new ArrayList<String>(); + List<String> pNames = new ArrayList<>(); //schedule 3 processes with different pipelines. 1st and 3d processes have same tag value. for (int i = 1; i <= 3; i++) { String uniqueName = originName + "-" + i; http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiProcessInstanceTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiProcessInstanceTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiProcessInstanceTest.java index 6d41f9e..b14de64 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiProcessInstanceTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiProcessInstanceTest.java @@ -168,7 +168,7 @@ public class LineageApiProcessInstanceTest extends BaseTestClass { Assert.assertEquals(piVertices.size(), piResult.getInstances().length, "Number of process instances should be same weather it is retrieved from lineage api " + "or falcon rest api"); - final List<String> allowedPITimes = new ArrayList<String>(); + final List<String> allowedPITimes = new ArrayList<>(); for (InstancesResult.Instance processInstance : piResult.getInstances()) { allowedPITimes.add(processInstance.getInstance()); } http://git-wip-us.apache.org/repos/asf/falcon/blob/0015a3b7/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java index 9b31df9..ca3f2fa 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java @@ -367,7 +367,7 @@ public class LineageApiTest extends BaseTestClass { @Test public void testVerticesFilterBlankValue() throws Exception { - Map<String, String> params = new TreeMap<String, String>(); + Map<String, String> params = new TreeMap<>(); params.put("key", Vertex.FilterKey.name.toString()); params.put("value", ""); HttpResponse response = lineageHelper @@ -383,7 +383,7 @@ public class LineageApiTest extends BaseTestClass { @Test public void testVerticesFilterBlankKey() throws Exception { - Map<String, String> params = new TreeMap<String, String>(); + Map<String, String> params = new TreeMap<>(); params.put("key", ""); params.put("value", "someValue"); HttpResponse response = lineageHelper.runGetRequest(
