Repository: metron Updated Branches: refs/heads/master f9710ebee -> 695e90401
METRON-1063 address javadoc warnings in metron-stellar (dbist via ottobackwards) closes apache/metron#668 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/695e9040 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/695e9040 Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/695e9040 Branch: refs/heads/master Commit: 695e90401cf371993c7d08e6ab073a928d08cecb Parents: f9710eb Author: dbist <[email protected]> Authored: Tue Sep 19 08:11:15 2017 -0400 Committer: otto <[email protected]> Committed: Tue Sep 19 08:11:15 2017 -0400 ---------------------------------------------------------------------- .../metron/stellar/common/StellarCompiler.java | 31 +++++++++++++------- .../common/benchmark/StellarMicrobenchmark.java | 30 ++++++++++++------- .../stellar/common/shell/StellarExecutor.java | 30 +++++++++---------- .../metron/stellar/common/utils/JSONUtils.java | 6 +++- .../metron/stellar/common/utils/SerDeUtils.java | 17 ++++++----- .../common/utils/StellarProcessorUtils.java | 3 +- .../common/utils/VFSClassloaderUtil.java | 2 +- .../resolver/ClasspathFunctionResolver.java | 13 ++++---- 8 files changed, 78 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/695e9040/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/StellarCompiler.java ---------------------------------------------------------------------- diff --git a/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/StellarCompiler.java b/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/StellarCompiler.java index b669bc7..463389f 100644 --- a/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/StellarCompiler.java +++ b/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/StellarCompiler.java @@ -17,28 +17,37 @@ */ package org.apache.metron.stellar.common; +import com.google.common.base.Joiner; +import java.io.Serializable; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.apache.commons.lang3.StringEscapeUtils; -import org.apache.metron.stellar.dsl.Context; -import org.apache.metron.stellar.dsl.Context.ActivityType; -import org.apache.metron.stellar.dsl.Token; -import org.apache.metron.stellar.dsl.VariableResolver; -import org.apache.metron.stellar.dsl.functions.resolver.FunctionResolver; +import org.apache.commons.lang3.tuple.Pair; import org.apache.metron.stellar.common.evaluators.ArithmeticEvaluator; import org.apache.metron.stellar.common.evaluators.ComparisonExpressionWithOperatorEvaluator; import org.apache.metron.stellar.common.evaluators.NumberLiteralEvaluator; import org.apache.metron.stellar.common.generated.StellarBaseListener; import org.apache.metron.stellar.common.generated.StellarParser; -import com.google.common.base.Joiner; -import org.apache.commons.lang3.tuple.Pair; +import org.apache.metron.stellar.common.utils.ConversionUtils; +import org.apache.metron.stellar.dsl.Context; import org.apache.metron.stellar.dsl.FunctionMarker; import org.apache.metron.stellar.dsl.ParseException; import org.apache.metron.stellar.dsl.StellarFunction; -import org.apache.metron.stellar.common.utils.ConversionUtils; - -import java.io.Serializable; -import java.util.*; +import org.apache.metron.stellar.dsl.Token; +import org.apache.metron.stellar.dsl.VariableResolver; +import org.apache.metron.stellar.dsl.functions.resolver.FunctionResolver; import static java.lang.String.format; +import org.apache.metron.stellar.dsl.Context.ActivityType; public class StellarCompiler extends StellarBaseListener { private static Token<?> EXPRESSION_REFERENCE = new Token<>(null, Object.class); http://git-wip-us.apache.org/repos/asf/metron/blob/695e9040/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/benchmark/StellarMicrobenchmark.java ---------------------------------------------------------------------- diff --git a/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/benchmark/StellarMicrobenchmark.java b/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/benchmark/StellarMicrobenchmark.java index 69e5297..35fa673 100644 --- a/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/benchmark/StellarMicrobenchmark.java +++ b/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/benchmark/StellarMicrobenchmark.java @@ -21,21 +21,31 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.io.Files; -import org.apache.commons.cli.*; -import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; -import org.apache.metron.stellar.dsl.Context; -import org.apache.metron.stellar.dsl.MapVariableResolver; -import org.apache.metron.stellar.dsl.StellarFunctions; -import org.apache.metron.stellar.common.utils.JSONUtils; -import org.apache.metron.stellar.common.utils.cli.OptionHandler; - -import javax.annotation.Nullable; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.PrintWriter; import java.nio.charset.Charset; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import javax.annotation.Nullable; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.HelpFormatter; +import org.apache.commons.cli.Option; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.PosixParser; +import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; +import org.apache.metron.stellar.common.utils.JSONUtils; +import org.apache.metron.stellar.common.utils.cli.OptionHandler; +import org.apache.metron.stellar.dsl.Context; +import org.apache.metron.stellar.dsl.MapVariableResolver; +import org.apache.metron.stellar.dsl.StellarFunctions; public class StellarMicrobenchmark { http://git-wip-us.apache.org/repos/asf/metron/blob/695e9040/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/shell/StellarExecutor.java ---------------------------------------------------------------------- diff --git a/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/shell/StellarExecutor.java b/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/shell/StellarExecutor.java index febde40..1be38c3 100644 --- a/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/shell/StellarExecutor.java +++ b/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/shell/StellarExecutor.java @@ -23,36 +23,36 @@ package org.apache.metron.stellar.common.shell; import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; +import java.io.ByteArrayInputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; +import java.util.SortedMap; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; import org.apache.commons.collections4.trie.PatriciaTrie; import org.apache.commons.lang.StringUtils; import org.apache.curator.framework.CuratorFramework; +import org.apache.metron.stellar.common.StellarProcessor; import org.apache.metron.stellar.common.configuration.ConfigurationsUtils; +import org.apache.metron.stellar.common.utils.JSONUtils; import org.apache.metron.stellar.dsl.Context; import org.apache.metron.stellar.dsl.MapVariableResolver; import org.apache.metron.stellar.dsl.StellarFunctionInfo; import org.apache.metron.stellar.dsl.StellarFunctions; import org.apache.metron.stellar.dsl.VariableResolver; import org.apache.metron.stellar.dsl.functions.resolver.FunctionResolver; -import org.apache.metron.stellar.common.StellarProcessor; -import org.apache.metron.stellar.common.utils.JSONUtils; import org.jboss.aesh.console.Console; -import java.io.ByteArrayInputStream; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; -import java.util.Properties; -import java.util.SortedMap; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; - import static org.apache.metron.stellar.common.configuration.ConfigurationsUtils.readGlobalConfigBytesFromZookeeper; import static org.apache.metron.stellar.common.shell.StellarExecutor.OperationType.DOC; import static org.apache.metron.stellar.common.shell.StellarExecutor.OperationType.NORMAL; - -import static org.apache.metron.stellar.dsl.Context.Capabilities.*; +import static org.apache.metron.stellar.dsl.Context.Capabilities.GLOBAL_CONFIG; +import static org.apache.metron.stellar.dsl.Context.Capabilities.STELLAR_CONFIG; +import static org.apache.metron.stellar.dsl.Context.Capabilities.ZOOKEEPER_CLIENT; /** * Executes Stellar expressions and maintains state across multiple invocations. http://git-wip-us.apache.org/repos/asf/metron/blob/695e9040/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/JSONUtils.java ---------------------------------------------------------------------- diff --git a/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/JSONUtils.java b/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/JSONUtils.java index d99263b..d7e90cf 100644 --- a/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/JSONUtils.java +++ b/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/JSONUtils.java @@ -22,11 +22,15 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; -import java.io.*; public enum JSONUtils { INSTANCE; http://git-wip-us.apache.org/repos/asf/metron/blob/695e9040/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/SerDeUtils.java ---------------------------------------------------------------------- diff --git a/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/SerDeUtils.java b/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/SerDeUtils.java index 7bd9520..9e26776 100644 --- a/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/SerDeUtils.java +++ b/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/SerDeUtils.java @@ -34,21 +34,22 @@ import de.javakaffee.kryoserializers.guava.ImmutableMultimapSerializer; import de.javakaffee.kryoserializers.guava.ImmutableSetSerializer; import de.javakaffee.kryoserializers.jodatime.JodaLocalDateSerializer; import de.javakaffee.kryoserializers.jodatime.JodaLocalDateTimeSerializer; -import org.apache.commons.io.output.ByteArrayOutputStream; -import org.objenesis.instantiator.ObjectInstantiator; -import org.objenesis.strategy.InstantiatorStrategy; -import org.objenesis.strategy.StdInstantiatorStrategy; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.ByteArrayInputStream; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Modifier; import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.GregorianCalendar; import java.util.function.Function; +import org.apache.commons.io.output.ByteArrayOutputStream; +import org.objenesis.instantiator.ObjectInstantiator; +import org.objenesis.strategy.InstantiatorStrategy; +import org.objenesis.strategy.StdInstantiatorStrategy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static com.esotericsoftware.kryo.util.Util.className; http://git-wip-us.apache.org/repos/asf/metron/blob/695e9040/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/StellarProcessorUtils.java ---------------------------------------------------------------------- diff --git a/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/StellarProcessorUtils.java b/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/StellarProcessorUtils.java index 0fd89e6..5912657 100644 --- a/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/StellarProcessorUtils.java +++ b/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/StellarProcessorUtils.java @@ -53,7 +53,7 @@ public class StellarProcessorUtils { * @param rule * @param variables * @param context - * @return + * @return ret */ public static Object run(String rule, Map<String, Object> variables, Context context) { StellarProcessor processor = new StellarProcessor(); @@ -149,7 +149,6 @@ public class StellarProcessorUtils { * {@inheritDoc} * * @param action - * @implSpec If the action is an instance of {@code IntConsumer} then it is cast * to {@code IntConsumer} and passed to * {@link #tryAdvance(IntConsumer)}; otherwise * the action is adapted to an instance of {@code IntConsumer}, by http://git-wip-us.apache.org/repos/asf/metron/blob/695e9040/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/VFSClassloaderUtil.java ---------------------------------------------------------------------- diff --git a/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/VFSClassloaderUtil.java b/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/VFSClassloaderUtil.java index 6916e8f..803398c 100644 --- a/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/VFSClassloaderUtil.java +++ b/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/VFSClassloaderUtil.java @@ -51,7 +51,7 @@ public class VFSClassloaderUtil { * * FTP * * HTTP/S * * file - * @return + * @return vfs * @throws FileSystemException */ public static FileSystemManager generateVfs() throws FileSystemException { http://git-wip-us.apache.org/repos/asf/metron/blob/695e9040/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/dsl/functions/resolver/ClasspathFunctionResolver.java ---------------------------------------------------------------------- diff --git a/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/dsl/functions/resolver/ClasspathFunctionResolver.java b/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/dsl/functions/resolver/ClasspathFunctionResolver.java index 70f3bc4..41de982 100644 --- a/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/dsl/functions/resolver/ClasspathFunctionResolver.java +++ b/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/dsl/functions/resolver/ClasspathFunctionResolver.java @@ -18,11 +18,6 @@ package org.apache.metron.stellar.dsl.functions.resolver; -import static org.apache.metron.stellar.dsl.Context.Capabilities.STELLAR_CONFIG; -import static org.apache.metron.stellar.dsl.functions.resolver.ClasspathFunctionResolver.Config.STELLAR_SEARCH_EXCLUDES_KEY; -import static org.apache.metron.stellar.dsl.functions.resolver.ClasspathFunctionResolver.Config.STELLAR_SEARCH_INCLUDES_KEY; -import static org.apache.metron.stellar.dsl.functions.resolver.ClasspathFunctionResolver.Config.STELLAR_VFS_PATHS; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -38,9 +33,15 @@ import org.apache.metron.stellar.common.utils.VFSClassloaderUtil; import org.apache.metron.stellar.dsl.Context; import org.apache.metron.stellar.dsl.Stellar; import org.apache.metron.stellar.dsl.StellarFunction; + import org.atteo.classindex.ClassIndex; import org.reflections.util.FilterBuilder; +import static org.apache.metron.stellar.dsl.Context.Capabilities.STELLAR_CONFIG; +import static org.apache.metron.stellar.dsl.functions.resolver.ClasspathFunctionResolver.Config.STELLAR_SEARCH_EXCLUDES_KEY; +import static org.apache.metron.stellar.dsl.functions.resolver.ClasspathFunctionResolver.Config.STELLAR_SEARCH_INCLUDES_KEY; +import static org.apache.metron.stellar.dsl.functions.resolver.ClasspathFunctionResolver.Config.STELLAR_VFS_PATHS; + /** * Performs function resolution for Stellar by searching the classpath. * @@ -186,7 +187,7 @@ public class ClasspathFunctionResolver extends BaseFunctionResolver { include(STELLAR_SEARCH_INCLUDES_KEY.get(stellarConfig, String.class).split(STELLAR_SEARCH_DELIMS)); exclude(STELLAR_SEARCH_EXCLUDES_KEY.get(stellarConfig, String.class).split(STELLAR_SEARCH_DELIMS)); - Optional<ClassLoader> vfsLoader = null; + Optional<ClassLoader> vfsLoader = Optional.empty(); try { vfsLoader = VFSClassloaderUtil.configureClassloader(STELLAR_VFS_PATHS.get(stellarConfig, String.class)); if(vfsLoader.isPresent()) {
