You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by le...@apache.org on 2016/12/07 15:33:18 UTC
[2/2] incubator-metron git commit: METRON-612 Clean up Error Prone
generated warnings (justinleet) closes apache/incubator-metron#389
METRON-612 Clean up Error Prone generated warnings (justinleet) closes apache/incubator-metron#389
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/e15f4ba0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/e15f4ba0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/e15f4ba0
Branch: refs/heads/master
Commit: e15f4ba09ff34476f9ce07f11ab6360a28e99023
Parents: cf15a3d
Author: justinleet <ju...@gmail.com>
Authored: Wed Dec 7 10:28:27 2016 -0500
Committer: leet <le...@apache.org>
Committed: Wed Dec 7 10:28:27 2016 -0500
----------------------------------------------------------------------
.../metron/maas/discovery/ServiceDiscoverer.java | 1 +
.../org/apache/metron/maas/queue/QueueHandler.java | 8 +++++---
.../metron/maas/service/ContainerTracker.java | 2 +-
.../metron/maas/service/MaasIntegrationTest.java | 1 +
.../metron/profiler/client/HBaseProfilerClient.java | 1 +
.../metron/profiler/client/stellar/GetProfile.java | 2 +-
.../functions/resolver/BaseFunctionResolver.java | 2 +-
.../transformation/SimpleFieldTransformation.java | 2 +-
.../org/apache/metron/common/utils/SerDeUtils.java | 3 +++
.../apache/metron/common/stellar/StellarTest.java | 8 ++++----
.../metron/common/utils/ConversionUtilsTest.java | 6 +++---
.../dataloads/bulk/ElasticsearchDataPruner.java | 6 +++---
.../metron/dataloads/bulk/HDFSDataPruner.java | 13 +++++++------
.../dataloads/bulk/ThreatIntelBulkLoader.java | 2 +-
.../dataloads/extractor/ExtractorHandler.java | 5 +++--
.../metron/dataloads/extractor/Extractors.java | 5 +++--
.../dataloads/extractor/csv/LookupConverters.java | 9 +++------
.../dataloads/extractor/inputformat/Formats.java | 5 +++--
.../metron/dataloads/hbase/mr/BulkLoadMapper.java | 9 +++------
.../metron/dataloads/bulk/HDFSDataPrunerTest.java | 6 +++---
.../metron/dataloads/extractor/ExtractorTest.java | 3 ++-
.../ElasticsearchIndexingIntegrationTest.java | 2 ++
.../components/ElasticSearchComponent.java | 2 ++
.../enrichment/adapters/cif/AbstractCIFAdapter.java | 1 +
.../enrichment/adapters/cif/CIFHbaseAdapter.java | 1 +
.../adapters/host/AbstractHostAdapter.java | 2 ++
.../enrichment/bolt/GenericEnrichmentBolt.java | 1 +
.../org/apache/metron/enrichment/bolt/JoinBolt.java | 1 +
.../accesstracker/PersistentAccessTracker.java | 2 +-
.../stellar/SimpleHBaseEnrichmentFunctions.java | 2 +-
.../enrichment/adapters/geo/GeoAdapterTest.java | 2 +-
.../adapters/host/HostFromJSONListAdapterTest.java | 2 +-
.../simplehbase/SimpleHBaseAdapterTest.java | 2 +-
.../threatintel/ThreatIntelAdapterTest.java | 2 +-
.../enrichment/bolt/EnrichmentSplitterBoltTest.java | 1 +
.../enrichment/bolt/GenericEnrichmentBoltTest.java | 1 +
.../integration/EnrichmentIntegrationTest.java | 3 +++
.../enrichment/integration/mock/MockGeoAdapter.java | 3 +++
.../components/FluxTopologyComponent.java | 16 ++++------------
.../apache/metron/parsers/bro/BasicBroParser.java | 1 +
.../org/apache/metron/parsers/bro/JSONCleaner.java | 6 +++---
.../metron/parsers/filters/BroMessageFilter.java | 2 ++
.../parsers/filters/GenericMessageFilter.java | 1 +
.../paloalto/BasicPaloAltoFirewallParser.java | 1 +
.../parsers/sourcefire/BasicSourcefireParser.java | 1 +
.../apache/metron/parsers/AbstractConfigTest.java | 5 ++++-
.../apache/metron/parsers/AbstractSchemaTest.java | 9 ++++++++-
.../apache/metron/parsers/SampleGrokParserTest.java | 5 +++++
.../metron/parsers/asa/BasicAsaParserTest.java | 16 ++++++++--------
.../metron/parsers/asa/GrokAsaParserTest.java | 2 ++
.../metron/parsers/bro/BasicBroParserTest.java | 16 ++++++++--------
.../apache/metron/parsers/bro/BroParserTest.java | 1 +
.../parsers/fireeye/BasicFireEyeParserTest.java | 2 ++
.../parsers/integration/ParserIntegrationTest.java | 2 ++
.../metron/parsers/ise/BasicIseParserTest.java | 2 ++
.../parsers/lancope/BasicLancopeParserTest.java | 4 ++--
.../paloalto/BasicPaloAltoFirewallParserTest.java | 2 ++
.../sourcefire/BasicSourcefireParserTest.java | 2 ++
.../SimpleHbaseEnrichmentWriterIntegrationTest.java | 2 ++
.../integration/WriterBoltIntegrationTest.java | 2 ++
.../metron/spout/pcap/PartitionHDFSWriter.java | 2 ++
.../org/apache/metron/pcap/QueryPcapFilterTest.java | 4 ++--
.../apache/metron/pcap/MetronEthernetDecoder.java | 5 +++++
.../org/apache/metron/pcap/PcapByteInputStream.java | 2 ++
.../apache/metron/pcap/PcapByteOutputStream.java | 3 +++
.../apache/metron/pcap/PcapPacketComparator.java | 3 ++-
.../org/apache/metron/pcap/filter/PcapFilters.java | 1 +
.../java/org/apache/metron/pcap/mr/PcapJob.java | 2 +-
.../org/apache/storm/kafka/CallbackCollector.java | 8 ++++----
.../org/apache/storm/kafka/CallbackKafkaSpout.java | 5 +++--
.../integration/SolrIndexingIntegrationTest.java | 2 ++
.../metron/solr/writer/MetronSolrClientTest.java | 2 +-
.../apache/metron/solr/writer/SolrWriterTest.java | 4 ++--
.../org/apache/metron/test/bolt/BaseBoltTest.java | 2 +-
.../org/apache/metron/test/bolt/PrintingBolt.java | 3 +++
.../metron/test/converters/BinaryConverters.java | 8 +++-----
.../metron/test/converters/HexStringConverter.java | 1 +
.../org/apache/metron/test/mock/MockHTable.java | 6 +++++-
.../test/spouts/GenericInternalTestSpout.java | 7 ++++---
.../apache/metron/writer/hdfs/SourceHandler.java | 3 +--
80 files changed, 190 insertions(+), 112 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-analytics/metron-maas-common/src/main/java/org/apache/metron/maas/discovery/ServiceDiscoverer.java
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-maas-common/src/main/java/org/apache/metron/maas/discovery/ServiceDiscoverer.java b/metron-analytics/metron-maas-common/src/main/java/org/apache/metron/maas/discovery/ServiceDiscoverer.java
index c3701bb..b05f161 100644
--- a/metron-analytics/metron-maas-common/src/main/java/org/apache/metron/maas/discovery/ServiceDiscoverer.java
+++ b/metron-analytics/metron-maas-common/src/main/java/org/apache/metron/maas/discovery/ServiceDiscoverer.java
@@ -351,6 +351,7 @@ public class ServiceDiscoverer implements Closeable{
/**
* Close the discoverer service
*/
+ @Override
public void close() {
if(cache != null) {
CloseableUtils.closeQuietly(cache);
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-analytics/metron-maas-common/src/main/java/org/apache/metron/maas/queue/QueueHandler.java
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-maas-common/src/main/java/org/apache/metron/maas/queue/QueueHandler.java b/metron-analytics/metron-maas-common/src/main/java/org/apache/metron/maas/queue/QueueHandler.java
index 1333635..9e803b8 100644
--- a/metron-analytics/metron-maas-common/src/main/java/org/apache/metron/maas/queue/QueueHandler.java
+++ b/metron-analytics/metron-maas-common/src/main/java/org/apache/metron/maas/queue/QueueHandler.java
@@ -17,6 +17,8 @@
*/
package org.apache.metron.maas.queue;
+import org.apache.metron.maas.config.ModelRequest;
+
import java.util.Map;
import java.util.function.Function;
@@ -28,12 +30,12 @@ public enum QueueHandler {
* A distributed queue using zookeeper.
*/
ZOOKEEPER(config -> {
- Queue ret = new ZKQueue();
+ Queue<ModelRequest> ret = new ZKQueue();
ret.configure(config);
return ret;
});
- Function<Map<String, Object>, Queue> queueCreator;
- QueueHandler(Function<Map<String, Object>, Queue> creator) {
+ Function<Map<String, Object>, Queue<ModelRequest>> queueCreator;
+ QueueHandler(Function<Map<String, Object>, Queue<ModelRequest>> creator) {
this.queueCreator = creator;
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/service/ContainerTracker.java
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/service/ContainerTracker.java b/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/service/ContainerTracker.java
index 7149dcc..57cd694 100644
--- a/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/service/ContainerTracker.java
+++ b/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/service/ContainerTracker.java
@@ -29,7 +29,7 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingDeque;
public class ContainerTracker {
- private TreeMap<Integer, BlockingQueue<Container>> acceptedContainersByResource = Maps.newTreeMap();
+ private final TreeMap<Integer, BlockingQueue<Container>> acceptedContainersByResource = Maps.newTreeMap();
private HashMap<Model, List<Container>> launchedContainers = Maps.newHashMap();
int minimumContainerSize;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-analytics/metron-maas-service/src/test/java/org/apache/metron/maas/service/MaasIntegrationTest.java
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-maas-service/src/test/java/org/apache/metron/maas/service/MaasIntegrationTest.java b/metron-analytics/metron-maas-service/src/test/java/org/apache/metron/maas/service/MaasIntegrationTest.java
index 06d4619..bab36ae 100644
--- a/metron-analytics/metron-maas-service/src/test/java/org/apache/metron/maas/service/MaasIntegrationTest.java
+++ b/metron-analytics/metron-maas-service/src/test/java/org/apache/metron/maas/service/MaasIntegrationTest.java
@@ -155,6 +155,7 @@ public class MaasIntegrationTest {
LOG.info("Running DS Client");
final AtomicBoolean result = new AtomicBoolean(false);
Thread t = new Thread() {
+ @Override
public void run() {
try {
result.set(client.run());
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-analytics/metron-profiler-client/src/main/java/org/apache/metron/profiler/client/HBaseProfilerClient.java
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-profiler-client/src/main/java/org/apache/metron/profiler/client/HBaseProfilerClient.java b/metron-analytics/metron-profiler-client/src/main/java/org/apache/metron/profiler/client/HBaseProfilerClient.java
index 1d11f42..42df6c2 100644
--- a/metron-analytics/metron-profiler-client/src/main/java/org/apache/metron/profiler/client/HBaseProfilerClient.java
+++ b/metron-analytics/metron-profiler-client/src/main/java/org/apache/metron/profiler/client/HBaseProfilerClient.java
@@ -92,6 +92,7 @@ public class HBaseProfilerClient implements ProfilerClient {
* @param <T> The type of values stored by the profile.
* @return A list of values.
*/
+ @Override
public <T> List<T> fetch(Class<T> clazz, String profile, String entity, List<Object> groups, long start, long end) {
byte[] columnFamily = Bytes.toBytes(columnBuilder.getColumnFamily());
byte[] columnQualifier = columnBuilder.getColumnQualifier("value");
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-analytics/metron-profiler-client/src/main/java/org/apache/metron/profiler/client/stellar/GetProfile.java
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-profiler-client/src/main/java/org/apache/metron/profiler/client/stellar/GetProfile.java b/metron-analytics/metron-profiler-client/src/main/java/org/apache/metron/profiler/client/stellar/GetProfile.java
index 2f13967..57472c3 100644
--- a/metron-analytics/metron-profiler-client/src/main/java/org/apache/metron/profiler/client/stellar/GetProfile.java
+++ b/metron-analytics/metron-profiler-client/src/main/java/org/apache/metron/profiler/client/stellar/GetProfile.java
@@ -309,7 +309,7 @@ public class GetProfile implements StellarFunction {
TableProvider provider;
try {
Class<? extends TableProvider> clazz = (Class<? extends TableProvider>) Class.forName(clazzName);
- provider = clazz.newInstance();
+ provider = clazz.getConstructor().newInstance();
} catch (Exception e) {
provider = new HTableProvider();
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-common/src/main/java/org/apache/metron/common/dsl/functions/resolver/BaseFunctionResolver.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/src/main/java/org/apache/metron/common/dsl/functions/resolver/BaseFunctionResolver.java b/metron-platform/metron-common/src/main/java/org/apache/metron/common/dsl/functions/resolver/BaseFunctionResolver.java
index c67d56f..ccb0ac2 100644
--- a/metron-platform/metron-common/src/main/java/org/apache/metron/common/dsl/functions/resolver/BaseFunctionResolver.java
+++ b/metron-platform/metron-common/src/main/java/org/apache/metron/common/dsl/functions/resolver/BaseFunctionResolver.java
@@ -193,7 +193,7 @@ public abstract class BaseFunctionResolver implements FunctionResolver, Serializ
*/
public static StellarFunction createFunction(Class<? extends StellarFunction> clazz) {
try {
- return clazz.newInstance();
+ return clazz.getConstructor().newInstance();
} catch (Exception e) {
LOG.error("Unable to load " + clazz.getName() + " because " + e.getMessage(), e);
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-common/src/main/java/org/apache/metron/common/field/transformation/SimpleFieldTransformation.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/src/main/java/org/apache/metron/common/field/transformation/SimpleFieldTransformation.java b/metron-platform/metron-common/src/main/java/org/apache/metron/common/field/transformation/SimpleFieldTransformation.java
index 86e6f51..71b830c 100644
--- a/metron-platform/metron-common/src/main/java/org/apache/metron/common/field/transformation/SimpleFieldTransformation.java
+++ b/metron-platform/metron-common/src/main/java/org/apache/metron/common/field/transformation/SimpleFieldTransformation.java
@@ -33,7 +33,7 @@ public abstract class SimpleFieldTransformation implements FieldTransformation {
, Context context
)
{
- Object value = (input == null || input.values() == null && input.values().isEmpty())
+ Object value = (input == null)
? null
: Iterables.getFirst(input.values(), null)
;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-common/src/main/java/org/apache/metron/common/utils/SerDeUtils.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/src/main/java/org/apache/metron/common/utils/SerDeUtils.java b/metron-platform/metron-common/src/main/java/org/apache/metron/common/utils/SerDeUtils.java
index a284f58..f2921b9 100644
--- a/metron-platform/metron-common/src/main/java/org/apache/metron/common/utils/SerDeUtils.java
+++ b/metron-platform/metron-common/src/main/java/org/apache/metron/common/utils/SerDeUtils.java
@@ -117,6 +117,7 @@ public class SerDeUtils {
return fallbackStrategy;
}
+ @Override
public ObjectInstantiator newInstantiatorOf (final Class type) {
if (!Util.isAndroid) {
// Use ReflectASM if the class is not a non-static member class.
@@ -127,6 +128,7 @@ public class SerDeUtils {
try {
final ConstructorAccess access = ConstructorAccess.get(type);
return new ObjectInstantiator() {
+ @Override
public Object newInstance () {
try {
return access.newInstance();
@@ -150,6 +152,7 @@ public class SerDeUtils {
}
final Constructor constructor = ctor;
return new ObjectInstantiator() {
+ @Override
public Object newInstance () {
try {
return constructor.newInstance();
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/StellarTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/StellarTest.java b/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/StellarTest.java
index fa9d9cc..f284212 100644
--- a/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/StellarTest.java
+++ b/metron-platform/metron-common/src/test/java/org/apache/metron/common/stellar/StellarTest.java
@@ -292,11 +292,11 @@ public class StellarTest {
}
{
String query = "TO_LONG(foo)";
- Assert.assertEquals(new Long(232321L),run(query,ImmutableMap.of("foo","00232321")));
+ Assert.assertEquals(232321L,run(query,ImmutableMap.of("foo","00232321")));
}
{
String query = "TO_LONG(foo)";
- Assert.assertEquals(Long.MAX_VALUE,run(query,ImmutableMap.of("foo",new Long(Long.MAX_VALUE).toString())));
+ Assert.assertEquals(Long.MAX_VALUE,run(query,ImmutableMap.of("foo", Long.toString(Long.MAX_VALUE))));
}
}
@Test
@@ -443,8 +443,8 @@ public class StellarTest {
@Test
public void testToDouble() {
- Assert.assertEquals(new Double(5.1), run("TO_DOUBLE(foo)", ImmutableMap.of("foo", 5.1d)));
- Assert.assertEquals(new Double(5.1), run("TO_DOUBLE(foo)", ImmutableMap.of("foo", "5.1")));
+ Assert.assertEquals(5.1d, run("TO_DOUBLE(foo)", ImmutableMap.of("foo", 5.1d)));
+ Assert.assertEquals(5.1d, run("TO_DOUBLE(foo)", ImmutableMap.of("foo", "5.1")));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-common/src/test/java/org/apache/metron/common/utils/ConversionUtilsTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/src/test/java/org/apache/metron/common/utils/ConversionUtilsTest.java b/metron-platform/metron-common/src/test/java/org/apache/metron/common/utils/ConversionUtilsTest.java
index acffeeb..90d00e4 100644
--- a/metron-platform/metron-common/src/test/java/org/apache/metron/common/utils/ConversionUtilsTest.java
+++ b/metron-platform/metron-common/src/test/java/org/apache/metron/common/utils/ConversionUtilsTest.java
@@ -24,9 +24,9 @@ import org.junit.Test;
public class ConversionUtilsTest {
@Test
public void testIntegerConversions() {
- Object o = new Integer(1);
- Assert.assertEquals(new Integer(1), ConversionUtils.convert(o, Integer.class));
- Assert.assertEquals(new Integer(1), ConversionUtils.convert("1", Integer.class));
+ Object o = 1;
+ Assert.assertEquals(Integer.valueOf(1), ConversionUtils.convert(o, Integer.class));
+ Assert.assertEquals(Integer.valueOf(1), ConversionUtils.convert("1", Integer.class));
Assert.assertNull(ConversionUtils.convert("foo", Integer.class));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/bulk/ElasticsearchDataPruner.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/bulk/ElasticsearchDataPruner.java b/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/bulk/ElasticsearchDataPruner.java
index ddbb61b..7529a51 100644
--- a/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/bulk/ElasticsearchDataPruner.java
+++ b/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/bulk/ElasticsearchDataPruner.java
@@ -110,14 +110,14 @@ public class ElasticsearchDataPruner extends DataPruner {
deleteIndex(indexClient.admin(), indexStringArray);
}
- return new Long(indexArray.length);
+ return (long) indexArray.length;
}
- public Boolean deleteIndex(AdminClient adminClient, String... index) {
+ public boolean deleteIndex(AdminClient adminClient, String... index) {
boolean isAcknowledged = adminClient.indices().delete(adminClient.indices().prepareDelete(index).request()).actionGet().isAcknowledged();
- return new Boolean(isAcknowledged);
+ return isAcknowledged;
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/bulk/HDFSDataPruner.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/bulk/HDFSDataPruner.java b/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/bulk/HDFSDataPruner.java
index 097253c..915ba95 100644
--- a/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/bulk/HDFSDataPruner.java
+++ b/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/bulk/HDFSDataPruner.java
@@ -137,9 +137,10 @@ public class HDFSDataPruner extends DataPruner {
}
+ @Override
public Long prune() throws IOException {
- Long filesPruned = new Long(0);
+ long filesPruned = 0L;
FileStatus[] filesToDelete = fileSystem.globStatus(globPath, new HDFSDataPruner.DateFileFilter(this));
@@ -157,7 +158,7 @@ public class HDFSDataPruner extends DataPruner {
return filesPruned;
}
- class DateFileFilter extends Configured implements PathFilter {
+ static class DateFileFilter extends Configured implements PathFilter {
HDFSDataPruner pruner;
Boolean failOnError = false;
@@ -177,8 +178,8 @@ public class HDFSDataPruner extends DataPruner {
public boolean accept(Path path) {
try {
- if(pruner.LOG.isDebugEnabled()) {
- pruner.LOG.debug("ACCEPT - working with file: " + path);
+ if(LOG.isDebugEnabled()) {
+ LOG.debug("ACCEPT - working with file: " + path);
}
if (pruner.fileSystem.isDirectory(path)) {
@@ -187,7 +188,7 @@ public class HDFSDataPruner extends DataPruner {
}
} catch (IOException e) {
- pruner.LOG.error("IOException", e);
+ LOG.error("IOException", e);
if (failOnError) {
throw new RuntimeException(e);
@@ -211,7 +212,7 @@ public class HDFSDataPruner extends DataPruner {
} catch (IOException e) {
- pruner.LOG.error("IOException", e);
+ LOG.error("IOException", e);
if (failOnError) {
throw new RuntimeException(e);
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/bulk/ThreatIntelBulkLoader.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/bulk/ThreatIntelBulkLoader.java b/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/bulk/ThreatIntelBulkLoader.java
index 4e2da61..5ba0a91 100644
--- a/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/bulk/ThreatIntelBulkLoader.java
+++ b/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/bulk/ThreatIntelBulkLoader.java
@@ -245,7 +245,7 @@ public class ThreatIntelBulkLoader {
);
}
- HbaseConverter converter = (HbaseConverter) Class.forName(converterClass).newInstance();
+ HbaseConverter converter = (HbaseConverter) Class.forName(converterClass).getConstructor().newInstance();
Job job = createJob(conf, input, table, cf, extractorConfigContents, ts, converter);
System.out.println(conf);
boolean jobRet = job.waitForCompletion(true);
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/extractor/ExtractorHandler.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/extractor/ExtractorHandler.java b/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/extractor/ExtractorHandler.java
index 5d17cbe..89477d8 100644
--- a/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/extractor/ExtractorHandler.java
+++ b/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/extractor/ExtractorHandler.java
@@ -24,6 +24,7 @@ import org.codehaus.jackson.map.ObjectMapper;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.Map;
@@ -49,7 +50,7 @@ public class ExtractorHandler {
public void setInputFormatHandler(String handler) {
try {
this.inputFormatHandler= Formats.create(handler);
- } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
+ } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
throw new IllegalStateException("Unable to create an inputformathandler", e);
}
}
@@ -60,7 +61,7 @@ public class ExtractorHandler {
public void setExtractor(String extractor) {
try {
this.extractor = Extractors.create(extractor);
- } catch (ClassNotFoundException | IllegalAccessException | InstantiationException e) {
+ } catch (ClassNotFoundException | IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) {
throw new IllegalStateException("Unable to create an extractor", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/extractor/Extractors.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/extractor/Extractors.java b/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/extractor/Extractors.java
index bbd4c22..771a1e3 100644
--- a/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/extractor/Extractors.java
+++ b/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/extractor/Extractors.java
@@ -20,6 +20,7 @@ package org.apache.metron.dataloads.extractor;
import org.apache.metron.dataloads.extractor.csv.CSVExtractor;
import org.apache.metron.dataloads.extractor.stix.StixExtractor;
+import java.lang.reflect.InvocationTargetException;
import java.util.Map;
public enum Extractors implements ExtractorCreator {
@@ -45,13 +46,13 @@ public enum Extractors implements ExtractorCreator {
public Extractor create() {
return _creator.create();
}
- public static Extractor create(String extractorName) throws ClassNotFoundException, IllegalAccessException, InstantiationException {
+ public static Extractor create(String extractorName) throws ClassNotFoundException, IllegalAccessException, InstantiationException, NoSuchMethodException, InvocationTargetException {
try {
ExtractorCreator ec = Extractors.valueOf(extractorName);
return ec.create();
}
catch(IllegalArgumentException iae) {
- Extractor ex = (Extractor) Class.forName(extractorName).newInstance();
+ Extractor ex = (Extractor) Class.forName(extractorName).getConstructor().newInstance();
return ex;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/extractor/csv/LookupConverters.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/extractor/csv/LookupConverters.java b/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/extractor/csv/LookupConverters.java
index abced09..396d7b1 100644
--- a/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/extractor/csv/LookupConverters.java
+++ b/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/extractor/csv/LookupConverters.java
@@ -23,6 +23,7 @@ import org.apache.metron.enrichment.converter.EnrichmentValue;
import org.apache.metron.enrichment.lookup.LookupKey;
import org.apache.metron.enrichment.lookup.LookupValue;
+import java.lang.reflect.InvocationTargetException;
import java.util.Map;
public enum LookupConverters {
@@ -54,12 +55,8 @@ public enum LookupConverters {
}
catch(Throwable t) {
try {
- return (LookupConverter) Class.forName(name).newInstance();
- } catch (InstantiationException e) {
- throw new IllegalStateException("Unable to parse " + name, e);
- } catch (IllegalAccessException e) {
- throw new IllegalStateException("Unable to parse " + name, e);
- } catch (ClassNotFoundException e) {
+ return (LookupConverter) Class.forName(name).getConstructor().newInstance();
+ } catch (InstantiationException | IllegalAccessException | ClassNotFoundException | NoSuchMethodException | InvocationTargetException e) {
throw new IllegalStateException("Unable to parse " + name, e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/extractor/inputformat/Formats.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/extractor/inputformat/Formats.java b/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/extractor/inputformat/Formats.java
index 7e58455..b8be233 100644
--- a/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/extractor/inputformat/Formats.java
+++ b/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/extractor/inputformat/Formats.java
@@ -22,6 +22,7 @@ import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
import java.util.Map;
public enum Formats implements InputFormatHandler{
@@ -42,13 +43,13 @@ public enum Formats implements InputFormatHandler{
_handler.set(job, path, config);
}
- public static InputFormatHandler create(String handlerName) throws ClassNotFoundException, IllegalAccessException, InstantiationException {
+ public static InputFormatHandler create(String handlerName) throws ClassNotFoundException, IllegalAccessException, InstantiationException, NoSuchMethodException, InvocationTargetException {
try {
InputFormatHandler ec = Formats.valueOf(handlerName);
return ec;
}
catch(IllegalArgumentException iae) {
- InputFormatHandler ex = (InputFormatHandler) Class.forName(handlerName).newInstance();
+ InputFormatHandler ex = (InputFormatHandler) Class.forName(handlerName).getConstructor().newInstance();
return ex;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/hbase/mr/BulkLoadMapper.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/hbase/mr/BulkLoadMapper.java b/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/hbase/mr/BulkLoadMapper.java
index 558ac16..3a8b196 100644
--- a/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/hbase/mr/BulkLoadMapper.java
+++ b/metron-platform/metron-data-management/src/main/java/org/apache/metron/dataloads/hbase/mr/BulkLoadMapper.java
@@ -28,6 +28,7 @@ import org.apache.metron.enrichment.converter.HbaseConverter;
import org.apache.metron.enrichment.lookup.LookupKV;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
public class BulkLoadMapper extends Mapper<Object, Text, ImmutableBytesWritable, Put>
{
@@ -59,12 +60,8 @@ public class BulkLoadMapper extends Mapper<Object, Text, ImmutableBytesWritable,
extractor = ExtractorHandler.load(configStr).getExtractor();
columnFamily = configuration.get(COLUMN_FAMILY_KEY);
try {
- converter = (HbaseConverter) Class.forName(configuration.get(CONVERTER_KEY)).newInstance();
- } catch (InstantiationException e) {
- throw new IllegalStateException("Unable to create converter object: " + configuration.get(CONVERTER_KEY), e);
- } catch (IllegalAccessException e) {
- throw new IllegalStateException("Unable to create converter object: " + configuration.get(CONVERTER_KEY), e);
- } catch (ClassNotFoundException e) {
+ converter = (HbaseConverter) Class.forName(configuration.get(CONVERTER_KEY)).getConstructor().newInstance();
+ } catch (InstantiationException | IllegalAccessException | ClassNotFoundException | NoSuchMethodException | InvocationTargetException e) {
throw new IllegalStateException("Unable to create converter object: " + configuration.get(CONVERTER_KEY), e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-data-management/src/test/java/org/apache/metron/dataloads/bulk/HDFSDataPrunerTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-data-management/src/test/java/org/apache/metron/dataloads/bulk/HDFSDataPrunerTest.java b/metron-platform/metron-data-management/src/test/java/org/apache/metron/dataloads/bulk/HDFSDataPrunerTest.java
index f8f4c81..1e8a09e 100644
--- a/metron-platform/metron-data-management/src/test/java/org/apache/metron/dataloads/bulk/HDFSDataPrunerTest.java
+++ b/metron-platform/metron-data-management/src/test/java/org/apache/metron/dataloads/bulk/HDFSDataPrunerTest.java
@@ -113,7 +113,7 @@ public class HDFSDataPrunerTest {
HDFSDataPruner pruner = new HDFSDataPruner(yesterday, 30, "file:///", dataPath.getAbsolutePath() + "/file-*");
pruner.fileSystem = testFS;
- HDFSDataPruner.DateFileFilter filter = pruner.new DateFileFilter(pruner, true);
+ HDFSDataPruner.DateFileFilter filter = new HDFSDataPruner.DateFileFilter(pruner, true);
UnitTestHelper.setLog4jLevel(HDFSDataPruner.class, Level.FATAL);
try {
filter.accept(new Path("foo"));
@@ -133,7 +133,7 @@ public class HDFSDataPrunerTest {
HDFSDataPruner pruner = new HDFSDataPruner(yesterday, 30, "file:///", dataPath.getAbsolutePath() + "/file-*");
pruner.fileSystem = testFS;
- HDFSDataPruner.DateFileFilter filter = pruner.new DateFileFilter(pruner, false);
+ HDFSDataPruner.DateFileFilter filter = new HDFSDataPruner.DateFileFilter(pruner, false);
assertFalse("Should ignore directories",filter.accept(new Path("/tmp")));
}
@@ -148,7 +148,7 @@ public class HDFSDataPrunerTest {
HDFSDataPruner pruner = new HDFSDataPruner(yesterday, 30, "file:///", dataPath.getAbsolutePath() + "/file-*");
pruner.fileSystem = testFS;
- HDFSDataPruner.DateFileFilter filter = pruner.new DateFileFilter(pruner, true);
+ HDFSDataPruner.DateFileFilter filter = new HDFSDataPruner.DateFileFilter(pruner, true);
UnitTestHelper.setLog4jLevel(HDFSDataPruner.class, Level.FATAL);
try {
filter.accept(new Path("foo"));
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-data-management/src/test/java/org/apache/metron/dataloads/extractor/ExtractorTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-data-management/src/test/java/org/apache/metron/dataloads/extractor/ExtractorTest.java b/metron-platform/metron-data-management/src/test/java/org/apache/metron/dataloads/extractor/ExtractorTest.java
index eac6ad2..9703cc2 100644
--- a/metron-platform/metron-data-management/src/test/java/org/apache/metron/dataloads/extractor/ExtractorTest.java
+++ b/metron-platform/metron-data-management/src/test/java/org/apache/metron/dataloads/extractor/ExtractorTest.java
@@ -25,6 +25,7 @@ import org.junit.Assert;
import org.junit.Test;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -49,7 +50,7 @@ public class ExtractorTest {
}
}
@Test
- public void testDummyExtractor() throws IllegalAccessException, InstantiationException, ClassNotFoundException, IOException {
+ public void testDummyExtractor() throws IllegalAccessException, InstantiationException, ClassNotFoundException, IOException, NoSuchMethodException, InvocationTargetException {
Extractor extractor = Extractors.create(DummyExtractor.class.getName());
LookupKV results = Iterables.getFirst(extractor.extract(null), null);
EnrichmentKey key = (EnrichmentKey) results.getKey();
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchIndexingIntegrationTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchIndexingIntegrationTest.java b/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchIndexingIntegrationTest.java
index 137216a..7e9f231 100644
--- a/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchIndexingIntegrationTest.java
+++ b/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/ElasticsearchIndexingIntegrationTest.java
@@ -62,6 +62,7 @@ public class ElasticsearchIndexingIntegrationTest extends IndexingIntegrationTes
return new Processor<List<Map<String, Object>>>() {
List<Map<String, Object>> docs = null;
List<byte[]> errors = null;
+ @Override
public ReadinessState process(ComponentRunner runner) {
ElasticSearchComponent elasticSearchComponent = runner.getComponent("search", ElasticSearchComponent.class);
KafkaComponent kafkaComponent = runner.getComponent("kafka", KafkaComponent.class);
@@ -88,6 +89,7 @@ public class ElasticsearchIndexingIntegrationTest extends IndexingIntegrationTes
}
}
+ @Override
public ProcessorResult<List<Map<String, Object>>> getResult() {
ProcessorResult.Builder<List<Map<String,Object>>> builder = new ProcessorResult.Builder();
return builder.withResult(docs).withProcessErrors(errors).build();
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/components/ElasticSearchComponent.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/components/ElasticSearchComponent.java b/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/components/ElasticSearchComponent.java
index d67361b..7766fe3 100644
--- a/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/components/ElasticSearchComponent.java
+++ b/metron-platform/metron-elasticsearch/src/test/java/org/apache/metron/elasticsearch/integration/components/ElasticSearchComponent.java
@@ -90,6 +90,7 @@ public class ElasticSearchComponent implements InMemoryComponent {
}
dir.mkdirs();
}
+ @Override
public void start() throws UnableToStartException {
File logDir= new File(indexDir, "/logs");
File dataDir= new File(indexDir, "/data");
@@ -175,6 +176,7 @@ public class ElasticSearchComponent implements InMemoryComponent {
}
+ @Override
public void stop() {
node.close();
node = null;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/adapters/cif/AbstractCIFAdapter.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/adapters/cif/AbstractCIFAdapter.java b/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/adapters/cif/AbstractCIFAdapter.java
index 73a7ad5..60ccc5e 100644
--- a/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/adapters/cif/AbstractCIFAdapter.java
+++ b/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/adapters/cif/AbstractCIFAdapter.java
@@ -35,6 +35,7 @@ public abstract class AbstractCIFAdapter implements EnrichmentAdapter<CacheKey>,
protected static final Logger LOG = LoggerFactory
.getLogger(AbstractCIFAdapter.class);
+ @Override
abstract public boolean initializeAdapter();
abstract public String enrichByIP(String metadata);
abstract public String enrichByDomain(String metadata);
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/adapters/cif/CIFHbaseAdapter.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/adapters/cif/CIFHbaseAdapter.java b/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/adapters/cif/CIFHbaseAdapter.java
index 22d1ff4..4f81149 100644
--- a/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/adapters/cif/CIFHbaseAdapter.java
+++ b/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/adapters/cif/CIFHbaseAdapter.java
@@ -60,6 +60,7 @@ public class CIFHbaseAdapter implements EnrichmentAdapter<CacheKey>,Serializable
}
+ @Override
public JSONObject enrich(CacheKey k) {
String metadata = k.coerceValue(String.class);
JSONObject output = new JSONObject();
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/adapters/host/AbstractHostAdapter.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/adapters/host/AbstractHostAdapter.java b/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/adapters/host/AbstractHostAdapter.java
index 329456f..9432613 100644
--- a/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/adapters/host/AbstractHostAdapter.java
+++ b/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/adapters/host/AbstractHostAdapter.java
@@ -37,7 +37,9 @@ public abstract class AbstractHostAdapter implements EnrichmentAdapter<CacheKey>
protected static final Logger LOG = LoggerFactory
.getLogger(AbstractHostAdapter.class);
+ @Override
abstract public boolean initializeAdapter();
+ @Override
abstract public JSONObject enrich(CacheKey metadata);
@Override
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/bolt/GenericEnrichmentBolt.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/bolt/GenericEnrichmentBolt.java b/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/bolt/GenericEnrichmentBolt.java
index dc2e4f3..592adc5 100644
--- a/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/bolt/GenericEnrichmentBolt.java
+++ b/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/bolt/GenericEnrichmentBolt.java
@@ -141,6 +141,7 @@ public class GenericEnrichmentBolt extends ConfiguredEnrichmentBolt {
if (this.adapter == null)
throw new IllegalStateException("Adapter must be specified");
loader = new CacheLoader<CacheKey, JSONObject>() {
+ @Override
public JSONObject load(CacheKey key) throws Exception {
return adapter.enrich(key);
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/bolt/JoinBolt.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/bolt/JoinBolt.java b/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/bolt/JoinBolt.java
index b31418c..101d056 100644
--- a/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/bolt/JoinBolt.java
+++ b/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/bolt/JoinBolt.java
@@ -76,6 +76,7 @@ public abstract class JoinBolt<V> extends ConfiguredEnrichmentBolt {
throw new IllegalStateException("maxTimeRetain must be specified");
}
loader = new CacheLoader<String, Map<String, V>>() {
+ @Override
public Map<String, V> load(String key) throws Exception {
return new HashMap<>();
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/lookup/accesstracker/PersistentAccessTracker.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/lookup/accesstracker/PersistentAccessTracker.java b/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/lookup/accesstracker/PersistentAccessTracker.java
index 13ecfd5..3dad675 100644
--- a/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/lookup/accesstracker/PersistentAccessTracker.java
+++ b/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/lookup/accesstracker/PersistentAccessTracker.java
@@ -100,7 +100,7 @@ public class PersistentAccessTracker implements AccessTracker {
}
}
- Object sync = new Object();
+ final Object sync = new Object();
HTableInterface accessTrackerTable;
String accessTrackerColumnFamily;
AccessTracker underlyingTracker;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/stellar/SimpleHBaseEnrichmentFunctions.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/stellar/SimpleHBaseEnrichmentFunctions.java b/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/stellar/SimpleHBaseEnrichmentFunctions.java
index 6d21d03..d2454fe 100644
--- a/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/stellar/SimpleHBaseEnrichmentFunctions.java
+++ b/metron-platform/metron-enrichment/src/main/java/org/apache/metron/enrichment/stellar/SimpleHBaseEnrichmentFunctions.java
@@ -103,7 +103,7 @@ public class SimpleHBaseEnrichmentFunctions {
private static TableProvider createProvider(String tableProviderClass) {
try {
Class<? extends TableProvider> providerClazz = (Class<? extends TableProvider>) Class.forName(tableProviderClass);
- return providerClazz.newInstance();
+ return providerClazz.getConstructor().newInstance();
} catch (Exception e) {
return new HTableProvider();
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/geo/GeoAdapterTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/geo/GeoAdapterTest.java b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/geo/GeoAdapterTest.java
index 529474f..f899cf9 100644
--- a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/geo/GeoAdapterTest.java
+++ b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/geo/GeoAdapterTest.java
@@ -108,7 +108,7 @@ public class GeoAdapterTest {
Assert.assertNotNull(actualMessage.get("locID"));
Assert.assertEquals(expectedMessage, actualMessage);
- actualMessage = geo.enrich(new CacheKey("dummy", new Long(10L), null));
+ actualMessage = geo.enrich(new CacheKey("dummy", 10L, null));
Assert.assertEquals(actualMessage,new JSONObject());
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/host/HostFromJSONListAdapterTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/host/HostFromJSONListAdapterTest.java b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/host/HostFromJSONListAdapterTest.java
index c4a2ed0..cd2ba17 100644
--- a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/host/HostFromJSONListAdapterTest.java
+++ b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/host/HostFromJSONListAdapterTest.java
@@ -78,7 +78,7 @@ public class HostFromJSONListAdapterTest {
JSONObject actualMessage = hja.enrich(new CacheKey("dummy", ip, null));
Assert.assertNotNull(actualMessage);
Assert.assertEquals(expectedMessage, actualMessage);
- actualMessage = hja.enrich(new CacheKey("dummy",new Long(10L), null));
+ actualMessage = hja.enrich(new CacheKey("dummy", 10L, null));
JSONObject emptyJson = new JSONObject();
Assert.assertEquals(emptyJson, actualMessage);
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/simplehbase/SimpleHBaseAdapterTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/simplehbase/SimpleHBaseAdapterTest.java b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/simplehbase/SimpleHBaseAdapterTest.java
index 6e44026..98fbc89 100644
--- a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/simplehbase/SimpleHBaseAdapterTest.java
+++ b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/simplehbase/SimpleHBaseAdapterTest.java
@@ -146,7 +146,7 @@ public class SimpleHBaseAdapterTest {
SensorEnrichmentConfig broSc = JSONUtils.INSTANCE.load(sourceConfigStr, SensorEnrichmentConfig.class);
JSONObject actualMessage = sha.enrich(new CacheKey("test", "test", broSc));
Assert.assertEquals(actualMessage, new JSONObject());
- actualMessage = sha.enrich(new CacheKey("ip_dst_addr", new Long(10L), broSc));
+ actualMessage = sha.enrich(new CacheKey("ip_dst_addr", 10L, broSc));
Assert.assertEquals(actualMessage,new JSONObject());
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/threatintel/ThreatIntelAdapterTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/threatintel/ThreatIntelAdapterTest.java b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/threatintel/ThreatIntelAdapterTest.java
index 31d62e1..af7102a 100644
--- a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/threatintel/ThreatIntelAdapterTest.java
+++ b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/adapters/threatintel/ThreatIntelAdapterTest.java
@@ -133,7 +133,7 @@ public class ThreatIntelAdapterTest {
Assert.assertNotNull(actualMessage);
Assert.assertEquals(expectedMessage, actualMessage);
- actualMessage = tia.enrich(new CacheKey("ip_dst_addr", new Long(10L), broSc));
+ actualMessage = tia.enrich(new CacheKey("ip_dst_addr", 10L, broSc));
Assert.assertEquals(actualMessage,new JSONObject());
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/bolt/EnrichmentSplitterBoltTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/bolt/EnrichmentSplitterBoltTest.java b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/bolt/EnrichmentSplitterBoltTest.java
index d5b6e6a..f3a1f2f 100644
--- a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/bolt/EnrichmentSplitterBoltTest.java
+++ b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/bolt/EnrichmentSplitterBoltTest.java
@@ -89,6 +89,7 @@ public class EnrichmentSplitterBoltTest extends BaseEnrichmentBoltTest {
}
+ @Override
public void removeTimingFields(JSONObject message) {
ImmutableSet keys = ImmutableSet.copyOf(message.keySet());
for(Object key: keys) {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/bolt/GenericEnrichmentBoltTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/bolt/GenericEnrichmentBoltTest.java b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/bolt/GenericEnrichmentBoltTest.java
index a3c6b22..27acda3 100644
--- a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/bolt/GenericEnrichmentBoltTest.java
+++ b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/bolt/GenericEnrichmentBoltTest.java
@@ -129,6 +129,7 @@ public class GenericEnrichmentBoltTest extends BaseEnrichmentBoltTest {
@Mock
public EnrichmentAdapter<CacheKey> enrichmentAdapter;
+ @Override
@Before
public void initMocks() {
MockitoAnnotations.initMocks(this);
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/integration/EnrichmentIntegrationTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/integration/EnrichmentIntegrationTest.java b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/integration/EnrichmentIntegrationTest.java
index d9c1dec..b7d6350 100644
--- a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/integration/EnrichmentIntegrationTest.java
+++ b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/integration/EnrichmentIntegrationTest.java
@@ -269,6 +269,7 @@ public class EnrichmentIntegrationTest extends BaseIntegrationTest {
this._predicate = predicate;
}
+ @Override
public boolean apply(EvaluationPayload payload) {
return _predicate.apply(payload);
}
@@ -439,6 +440,7 @@ public class EnrichmentIntegrationTest extends BaseIntegrationTest {
List<byte[]> errors = null;
List<byte[]> invalids = null;
+ @Override
public ReadinessState process(ComponentRunner runner) {
KafkaComponent kafkaComponent = runner.getComponent("kafka", KafkaComponent.class);
List<byte[]> messages = kafkaComponent.readMessages(Constants.INDEXING_TOPIC);
@@ -458,6 +460,7 @@ public class EnrichmentIntegrationTest extends BaseIntegrationTest {
}
}
+ @Override
public ProcessorResult<List<Map<String, Object>>> getResult()
{
ProcessorResult.Builder<List<Map<String,Object>>> builder = new ProcessorResult.Builder();
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/integration/mock/MockGeoAdapter.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/integration/mock/MockGeoAdapter.java b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/integration/mock/MockGeoAdapter.java
index a724bcd..b0491b8 100644
--- a/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/integration/mock/MockGeoAdapter.java
+++ b/metron-platform/metron-enrichment/src/test/java/org/apache/metron/enrichment/integration/mock/MockGeoAdapter.java
@@ -41,6 +41,7 @@ public class MockGeoAdapter implements EnrichmentAdapter<CacheKey>,
}
+ @Override
public JSONObject enrich(CacheKey cache ) {
JSONObject enriched = new JSONObject();
enriched.put("locID", DEFAULT_LOC_ID);
@@ -54,10 +55,12 @@ public class MockGeoAdapter implements EnrichmentAdapter<CacheKey>,
return enriched;
}
+ @Override
public boolean initializeAdapter() {
return true;
}
+ @Override
public void cleanup() {
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-integration-test/src/main/java/org/apache/metron/integration/components/FluxTopologyComponent.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-integration-test/src/main/java/org/apache/metron/integration/components/FluxTopologyComponent.java b/metron-platform/metron-integration-test/src/main/java/org/apache/metron/integration/components/FluxTopologyComponent.java
index 6ebb6eb..1c1f907 100644
--- a/metron-platform/metron-integration-test/src/main/java/org/apache/metron/integration/components/FluxTopologyComponent.java
+++ b/metron-platform/metron-integration-test/src/main/java/org/apache/metron/integration/components/FluxTopologyComponent.java
@@ -106,6 +106,7 @@ public class FluxTopologyComponent implements InMemoryComponent {
return "localhost:2000";
}
+ @Override
public void start() throws UnableToStartException {
try {
stormCluster = new LocalCluster();
@@ -129,6 +130,7 @@ public class FluxTopologyComponent implements InMemoryComponent {
}
}
+ @Override
public void stop() {
if (stormCluster != null) {
stormCluster.shutdown();
@@ -161,19 +163,9 @@ public class FluxTopologyComponent implements InMemoryComponent {
private static TopologyDef loadYaml(String topologyName, File yamlFile, Properties properties) throws IOException {
File tmpFile = File.createTempFile(topologyName, "props");
tmpFile.deleteOnExit();
- FileWriter propWriter = null;
- try {
- propWriter = new FileWriter(tmpFile);
+ try (FileWriter propWriter = new FileWriter(tmpFile)){
properties.store(propWriter, topologyName + " properties");
- } finally {
- if (propWriter != null) {
- propWriter.close();
- return FluxParser.parseFile(yamlFile.getAbsolutePath(), false, true, tmpFile.getAbsolutePath(), false);
- }
-
- return null;
+ return FluxParser.parseFile(yamlFile.getAbsolutePath(), false, true, tmpFile.getAbsolutePath(), false);
}
}
-
-
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/bro/BasicBroParser.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/bro/BasicBroParser.java b/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/bro/BasicBroParser.java
index df52205..17bdb2c 100644
--- a/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/bro/BasicBroParser.java
+++ b/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/bro/BasicBroParser.java
@@ -53,6 +53,7 @@ public class BasicBroParser extends BasicParser {
}
+ @Override
@SuppressWarnings("unchecked")
public List<JSONObject> parse(byte[] msg) {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/bro/JSONCleaner.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/bro/JSONCleaner.java b/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/bro/JSONCleaner.java
index 41d97f4..bed1f25 100644
--- a/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/bro/JSONCleaner.java
+++ b/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/bro/JSONCleaner.java
@@ -70,9 +70,9 @@ public class JSONCleaner implements Serializable {
//cleaner.clean(jsonText);
Map obj=new HashMap();
obj.put("name","foo");
- obj.put("num",new Integer(100));
- obj.put("balance",new Double(1000.21));
- obj.put("is_vip",new Boolean(true));
+ obj.put("num", 100);
+ obj.put("balance", 1000.21);
+ obj.put("is_vip", true);
obj.put("nickname",null);
Map obj1 = new HashMap();
obj1.put("sourcefile", obj);
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/filters/BroMessageFilter.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/filters/BroMessageFilter.java b/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/filters/BroMessageFilter.java
index 87129fc..9d51519 100644
--- a/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/filters/BroMessageFilter.java
+++ b/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/filters/BroMessageFilter.java
@@ -42,6 +42,7 @@ public class BroMessageFilter implements MessageFilter<JSONObject>{
_known_protocols = new HashSet<>();
}
+ @Override
public void configure(Map<String, Object> config) {
Object protocolsObj = config.get("bro.filter.source.known.protocols");
Object keyObj = config.get("bro.filter.source.key");
@@ -67,6 +68,7 @@ public class BroMessageFilter implements MessageFilter<JSONObject>{
* @return False if message if filtered and True if message is not filtered
*/
+ @Override
public boolean emitTuple(JSONObject message, Context context) {
String protocol = (String) message.get(_key);
return _known_protocols.contains(protocol);
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/filters/GenericMessageFilter.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/filters/GenericMessageFilter.java b/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/filters/GenericMessageFilter.java
index 3104180..1441787 100644
--- a/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/filters/GenericMessageFilter.java
+++ b/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/filters/GenericMessageFilter.java
@@ -31,6 +31,7 @@ public class GenericMessageFilter implements MessageFilter<JSONObject>{
public GenericMessageFilter() {
}
+ @Override
public boolean emitTuple(JSONObject message, Context context) {
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/paloalto/BasicPaloAltoFirewallParser.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/paloalto/BasicPaloAltoFirewallParser.java b/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/paloalto/BasicPaloAltoFirewallParser.java
index e6b9274..e7e78d4 100644
--- a/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/paloalto/BasicPaloAltoFirewallParser.java
+++ b/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/paloalto/BasicPaloAltoFirewallParser.java
@@ -101,6 +101,7 @@ public class BasicPaloAltoFirewallParser extends BasicParser {
}
+ @Override
@SuppressWarnings({"unchecked", "unused"})
public List<JSONObject> parse(byte[] msg) {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/sourcefire/BasicSourcefireParser.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/sourcefire/BasicSourcefireParser.java b/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/sourcefire/BasicSourcefireParser.java
index 0bc2671..969e469 100644
--- a/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/sourcefire/BasicSourcefireParser.java
+++ b/metron-platform/metron-parsers/src/main/java/org/apache/metron/parsers/sourcefire/BasicSourcefireParser.java
@@ -52,6 +52,7 @@ public class BasicSourcefireParser extends BasicParser {
}
+ @Override
@SuppressWarnings({ "unchecked", "unused" })
public List<JSONObject> parse(byte[] msg) {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/AbstractConfigTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/AbstractConfigTest.java b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/AbstractConfigTest.java
index 7f8ee7e..26ce051 100644
--- a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/AbstractConfigTest.java
+++ b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/AbstractConfigTest.java
@@ -184,6 +184,7 @@ public class AbstractConfigTest extends AbstractTestContext {
/**
* Skip Tests
*/
+ @Override
public boolean skipTests(Object mode){
if(mode.toString().equals("local")){
return true;
@@ -197,6 +198,7 @@ public class AbstractConfigTest extends AbstractTestContext {
* @return the mode.
*/
+ @Override
public Object getMode() {
return mode;
}
@@ -206,6 +208,7 @@ public class AbstractConfigTest extends AbstractTestContext {
* @param mode the mode.
*/
+ @Override
public void setMode(Object mode) {
this.mode = mode;
@@ -213,7 +216,7 @@ public class AbstractConfigTest extends AbstractTestContext {
/**
- * @param readSchemaFromFile
+ * @param schemaJsonString
*/
public void setSchemaJsonString(String schemaJsonString) {
this.schemaJsonString=schemaJsonString;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/AbstractSchemaTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/AbstractSchemaTest.java b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/AbstractSchemaTest.java
index 22c736e..b1cc597 100644
--- a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/AbstractSchemaTest.java
+++ b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/AbstractSchemaTest.java
@@ -107,6 +107,7 @@ public class AbstractSchemaTest extends AbstractConfigTest{
* @throws Exception
*/
+ @Override
protected boolean validateJsonData(final String jsonSchema, final String jsonData)
throws Exception {
@@ -122,6 +123,7 @@ public class AbstractSchemaTest extends AbstractConfigTest{
return report.toString().contains("success");
}
+ @Override
protected String readSchemaFromFile(URL schema_url) throws Exception {
BufferedReader br = new BufferedReader(new FileReader(
schema_url.getFile()));
@@ -145,6 +147,7 @@ public class AbstractSchemaTest extends AbstractConfigTest{
/**
* Skip Tests
*/
+ @Override
public boolean skipTests(Object mode){
if(mode.toString().equals("local")){
return true;
@@ -158,6 +161,7 @@ public class AbstractSchemaTest extends AbstractConfigTest{
* @return the mode.
*/
+ @Override
public Object getMode() {
return mode;
}
@@ -167,6 +171,7 @@ public class AbstractSchemaTest extends AbstractConfigTest{
* @param mode the mode.
*/
+ @Override
public void setMode(Object mode) {
this.mode = mode;
@@ -175,9 +180,10 @@ public class AbstractSchemaTest extends AbstractConfigTest{
/**
- * @param readSchemaFromFile
+ * @param schemaJsonString
*/
+ @Override
public void setSchemaJsonString(String schemaJsonString) {
this.schemaJsonString=schemaJsonString;
}
@@ -188,6 +194,7 @@ public class AbstractSchemaTest extends AbstractConfigTest{
* @return
*/
+ @Override
public String getSchemaJsonString() {
return this.schemaJsonString;
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/SampleGrokParserTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/SampleGrokParserTest.java b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/SampleGrokParserTest.java
index 89eb30c..e060559 100644
--- a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/SampleGrokParserTest.java
+++ b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/SampleGrokParserTest.java
@@ -68,24 +68,29 @@ public class SampleGrokParserTest extends GrokParserTest {
}
+ @Override
public String getGrokPath() {
return "../metron-integration-test/src/main/sample/patterns/test";
}
+ @Override
public String getGrokPatternLabel() {
return "YAF_DELIMITED";
}
+ @Override
public List<String> getTimeFields() {
return new ArrayList<String>() {{
add("end_time");
}};
}
+ @Override
public String getDateFormat() {
return "yyyy-MM-dd HH:mm:ss";
}
+ @Override
public String getTimestampField() {
return "start_time";
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/asa/BasicAsaParserTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/asa/BasicAsaParserTest.java b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/asa/BasicAsaParserTest.java
index 5bb5e70..7c0ef0a 100644
--- a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/asa/BasicAsaParserTest.java
+++ b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/asa/BasicAsaParserTest.java
@@ -84,8 +84,8 @@ public class BasicAsaParserTest {
assertEquals(asaJson.get("original_string"), rawMessage);
assertTrue(asaJson.get("ip_src_addr").equals("10.30.9.121"));
assertTrue(asaJson.get("ip_dst_addr").equals("192.168.135.51"));
- assertTrue(asaJson.get("ip_src_port").equals(new Integer(54580)));
- assertTrue(asaJson.get("ip_dst_port").equals(new Integer(42028)));
+ assertTrue(asaJson.get("ip_src_port").equals(54580));
+ assertTrue(asaJson.get("ip_dst_port").equals(42028));
assertTrue((long) asaJson.get("timestamp") == 1470358894000L);
}
@@ -96,8 +96,8 @@ public class BasicAsaParserTest {
assertEquals(asaJson.get("original_string"), rawMessage);
assertTrue(asaJson.get("ip_src_addr").equals("10.25.177.164"));
assertTrue(asaJson.get("ip_dst_addr").equals("10.2.52.71"));
- assertTrue(asaJson.get("ip_src_port").equals(new Integer(63279)));
- assertTrue(asaJson.get("ip_dst_port").equals(new Integer(161)));
+ assertTrue(asaJson.get("ip_src_port").equals(63279));
+ assertTrue(asaJson.get("ip_dst_port").equals(161));
assertTrue((long) asaJson.get("timestamp") == 1470358945000L);
}
@@ -117,8 +117,8 @@ public class BasicAsaParserTest {
assertEquals(asaJson.get("original_string"), rawMessage);
assertTrue(asaJson.get("ip_src_addr").equals("10.22.8.110"));
assertTrue(asaJson.get("ip_dst_addr").equals("192.111.72.8"));
- assertTrue(asaJson.get("ip_src_port").equals(new Integer(49886)));
- assertTrue(asaJson.get("ip_dst_port").equals(new Integer(8612)));
+ assertTrue(asaJson.get("ip_src_port").equals(49886));
+ assertTrue(asaJson.get("ip_dst_port").equals(8612));
assertTrue((long) asaJson.get("timestamp") == 1452005555000L);
}
@@ -146,8 +146,8 @@ public class BasicAsaParserTest {
assertEquals(asaJson.get("original_string"), rawMessage);
assertTrue(asaJson.get("ip_src_addr").equals("2001:db8:85a3::8a2e:370:7334"));
assertTrue(asaJson.get("ip_dst_addr").equals("2001:0db8:85a3:0000:0000:8a2e:0370:7334"));
- assertTrue(asaJson.get("ip_src_port").equals(new Integer(49886)));
- assertTrue(asaJson.get("ip_dst_port").equals(new Integer(8612)));
+ assertTrue(asaJson.get("ip_src_port").equals(49886));
+ assertTrue(asaJson.get("ip_dst_port").equals(8612));
assertTrue((long) asaJson.get("timestamp") == 1452005555000L);
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/asa/GrokAsaParserTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/asa/GrokAsaParserTest.java b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/asa/GrokAsaParserTest.java
index 8e9da0d..9ed0b54 100644
--- a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/asa/GrokAsaParserTest.java
+++ b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/asa/GrokAsaParserTest.java
@@ -76,6 +76,7 @@ public class GrokAsaParserTest extends AbstractConfigTest{
* (non-Javadoc)
* @see junit.framework.TestCase#setUp()
*/
+ @Override
public void setUp() throws Exception {
super.setUp("org.apache.metron.parsers.asa.GrokAsaParserTest");
setGrokAsaStrings(super.readTestDataFromFile(this.getConfig().getString("logFile")));
@@ -87,6 +88,7 @@ public class GrokAsaParserTest extends AbstractConfigTest{
*
* @throws java.lang.Exception
*/
+ @Override
public void tearDown() throws Exception {
grokAsaParser = null;
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/bro/BasicBroParserTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/bro/BasicBroParserTest.java b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/bro/BasicBroParserTest.java
index ca9f199..7aefe88 100644
--- a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/bro/BasicBroParserTest.java
+++ b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/bro/BasicBroParserTest.java
@@ -53,14 +53,14 @@ public class BasicBroParserTest extends TestCase {
*/
public void testDecimalFormatAssumptions() {
Pair[] pairs = {
- Pair.of(new Double(12345678), "12345678.0"),
- Pair.of(new Double(12345678.0), "12345678.0"),
- Pair.of(new Double(12345678.1), "12345678.1"),
- Pair.of(new Double(12345678.11), "12345678.11"),
- Pair.of(new Double(12345678.111), "12345678.111"),
- Pair.of(new Double(12345678.1111), "12345678.1111"),
- Pair.of(new Double(12345678.11111), "12345678.11111"),
- Pair.of(new Double(12345678.111111), "12345678.111111")
+ Pair.of(12345678d, "12345678.0"),
+ Pair.of(12345678.0d, "12345678.0"),
+ Pair.of(12345678.1d, "12345678.1"),
+ Pair.of(12345678.11d, "12345678.11"),
+ Pair.of(12345678.111d, "12345678.111"),
+ Pair.of(12345678.1111d, "12345678.1111"),
+ Pair.of(12345678.11111d, "12345678.11111"),
+ Pair.of(12345678.111111d, "12345678.111111")
};
for (Pair pair : pairs) {
assertEquals("Format did not match", pair.getRight(), BasicBroParser.DECIMAL_FORMAT.get().format(pair.getLeft()));
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/bro/BroParserTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/bro/BroParserTest.java b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/bro/BroParserTest.java
index 2dd11c5..8d81e14 100644
--- a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/bro/BroParserTest.java
+++ b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/bro/BroParserTest.java
@@ -86,6 +86,7 @@ public class BroParserTest extends AbstractConfigTest {
/**
* @throws java.lang.Exception
*/
+ @Override
public void setUp() throws Exception {
super.setUp("org.apache.metron.parsers.bro.BroParserTest");
setInputStrings(super.readTestDataFromFile(this.getConfig().getString("logFile")));
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/fireeye/BasicFireEyeParserTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/fireeye/BasicFireEyeParserTest.java b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/fireeye/BasicFireEyeParserTest.java
index 129619d..0368b5e 100644
--- a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/fireeye/BasicFireEyeParserTest.java
+++ b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/fireeye/BasicFireEyeParserTest.java
@@ -74,6 +74,7 @@ public class BasicFireEyeParserTest extends AbstractConfigTest
/**
* @throws java.lang.Exception
*/
+ @Override
public void setUp() throws Exception {
super.setUp("org.apache.metron.parsers.fireeye.BasicFireEyeParserTest");
setInputStrings(super.readTestDataFromFile(this.getConfig().getString("logFile")));
@@ -85,6 +86,7 @@ public class BasicFireEyeParserTest extends AbstractConfigTest
*
* @throws java.lang.Exception
*/
+ @Override
public void tearDown() throws Exception {
parser = null;
setInputStrings(null);
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/integration/ParserIntegrationTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/integration/ParserIntegrationTest.java b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/integration/ParserIntegrationTest.java
index 73d1269..55dec1c 100644
--- a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/integration/ParserIntegrationTest.java
+++ b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/integration/ParserIntegrationTest.java
@@ -77,6 +77,7 @@ public abstract class ParserIntegrationTest extends BaseIntegrationTest {
List<byte[]> errors = null;
List<byte[]> invalids = null;
+ @Override
public ReadinessState process(ComponentRunner runner) {
KafkaComponent kafkaComponent = runner.getComponent("kafka", KafkaComponent.class);
List<byte[]> outputMessages = kafkaComponent.readMessages(Constants.ENRICHMENT_TOPIC);
@@ -94,6 +95,7 @@ public abstract class ParserIntegrationTest extends BaseIntegrationTest {
}
}
+ @Override
public ProcessorResult<List<byte[]>> getResult() {
ProcessorResult.Builder<List<byte[]>> builder = new ProcessorResult.Builder();
return builder.withResult(messages).withProcessErrors(errors).withProcessInvalids(invalids).build();
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/ise/BasicIseParserTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/ise/BasicIseParserTest.java b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/ise/BasicIseParserTest.java
index 751e414..c448c70 100644
--- a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/ise/BasicIseParserTest.java
+++ b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/ise/BasicIseParserTest.java
@@ -81,6 +81,7 @@ public class BasicIseParserTest extends AbstractSchemaTest {
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception {
super.setUp("org.apache.metron.parsers.lancope.BasicLancopeParserTest");
setInputStrings(super.readTestDataFromFile(this.getConfig().getString("logFile")));
@@ -97,6 +98,7 @@ public class BasicIseParserTest extends AbstractSchemaTest {
* @see junit.framework.TestCase#tearDown()
*/
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/lancope/BasicLancopeParserTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/lancope/BasicLancopeParserTest.java b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/lancope/BasicLancopeParserTest.java
index 4d8a2d0..bbb4e88 100644
--- a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/lancope/BasicLancopeParserTest.java
+++ b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/lancope/BasicLancopeParserTest.java
@@ -76,7 +76,7 @@ public class BasicLancopeParserTest extends AbstractSchemaTest {
* (non-Javadoc)
* @see junit.framework.TestCase#setUp()
*/
-
+ @Override
protected void setUp() throws Exception {
super.setUp("org.apache.metron.parsers.lancope.BasicLancopeParserTest");
setInputStrings(super.readTestDataFromFile(this.getConfig().getString("logFile")));
@@ -91,7 +91,7 @@ public class BasicLancopeParserTest extends AbstractSchemaTest {
* (non-Javadoc)
* @see junit.framework.TestCase#tearDown()
*/
-
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/paloalto/BasicPaloAltoFirewallParserTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/paloalto/BasicPaloAltoFirewallParserTest.java b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/paloalto/BasicPaloAltoFirewallParserTest.java
index 0c0947b..6edd546 100644
--- a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/paloalto/BasicPaloAltoFirewallParserTest.java
+++ b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/paloalto/BasicPaloAltoFirewallParserTest.java
@@ -73,6 +73,7 @@ public class BasicPaloAltoFirewallParserTest extends AbstractConfigTest {
/**
* @throws java.lang.Exception
*/
+ @Override
public void setUp() throws Exception {
super.setUp("org.apache.metron.parsers.paloalto.BasicPaloAltoFirewallParserTest");
setPAStrings(super.readTestDataFromFile(this.getConfig().getString("logFile")));
@@ -84,6 +85,7 @@ public class BasicPaloAltoFirewallParserTest extends AbstractConfigTest {
*
* @throws java.lang.Exception
*/
+ @Override
public void tearDown() throws Exception {
paParser = null;
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e15f4ba0/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/sourcefire/BasicSourcefireParserTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/sourcefire/BasicSourcefireParserTest.java b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/sourcefire/BasicSourcefireParserTest.java
index 2ce035c..f5056ba 100644
--- a/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/sourcefire/BasicSourcefireParserTest.java
+++ b/metron-platform/metron-parsers/src/test/java/org/apache/metron/parsers/sourcefire/BasicSourcefireParserTest.java
@@ -75,6 +75,7 @@ public class BasicSourcefireParserTest extends AbstractConfigTest
/**
* @throws java.lang.Exception
*/
+ @Override
public void setUp() throws Exception {
super.setUp("org.apache.metron.parsing.test.BasicSoureceFireParserTest");
setSourceFireStrings(super.readTestDataFromFile(this.getConfig().getString("logFile")));
@@ -86,6 +87,7 @@ public class BasicSourcefireParserTest extends AbstractConfigTest
*
* @throws java.lang.Exception
*/
+ @Override
public void tearDown() throws Exception {
sourceFireParser = null;
}