Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@nielsbasjes
nielsbasjes committed Apr 16, 2021
1 parent a4c1a89 commit eeac19a
Show file tree
Hide file tree
Showing 77 changed files with 558 additions and 335 deletions.
2 changes: 1 addition & 1 deletion analyzer-it/pom.xml
View file
Expand Up @@ -42,7 +42,7 @@
</modules>

<dependencies>
<!-- The base logging implementation for this library -->
<!-- The default logging implementation for Yauaa -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions ...lization/base-tests/src/test/java/nl/example/serialization/AbstractSerializationTest.java
View file
Expand Up @@ -19,9 +19,8 @@

import nl.basjes.parse.useragent.UserAgent;
import nl.example.Demo;
import org.junit.jupiter.api.Test;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.io.IOException;

Expand Down
2 changes: 0 additions & 2 deletions ...ialization/java-default/src/test/java/nl/example/serialization/TestJavaSerialization.java
View file
Expand Up @@ -19,8 +19,6 @@

import org.junit.jupiter.api.Test;

import java.io.IOException;

import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;

class TestJavaSerialization {
Expand Down
2 changes: 0 additions & 2 deletions ...rialization/java-kryo-5/src/test/java/nl/example/serialization/TestKryoSerialization.java
View file
Expand Up @@ -19,8 +19,6 @@

import org.junit.jupiter.api.Test;

import java.io.IOException;

import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

Expand Down
2 changes: 1 addition & 1 deletion analyzer/pom.xml
View file
Expand Up @@ -83,7 +83,7 @@
<version>[2.10.0,)</version>
</dependency>

<!-- The base logging implementation for this library -->
<!-- The default logging implementation for Yauaa -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion analyzer/src/main/java/nl/basjes/parse/useragent/AbstractUserAgentAnalyzerDirect.java
View file
Expand Up @@ -84,8 +84,8 @@
import nl.basjes.parse.useragent.calculate.MajorVersionCalculator;
import nl.basjes.parse.useragent.parse.UserAgentTreeFlattener;
import org.antlr.v4.runtime.tree.ParseTree;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.yaml.snakeyaml.LoaderOptions;
Expand Down
2 changes: 1 addition & 1 deletion analyzer/src/main/java/nl/basjes/parse/useragent/UserAgent.java
View file
Expand Up @@ -28,8 +28,8 @@
import org.antlr.v4.runtime.atn.ATNConfigSet;
import org.antlr.v4.runtime.dfa.DFA;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.io.Serializable;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion analyzer/src/main/java/nl/basjes/parse/useragent/analyze/Matcher.java
View file
Expand Up @@ -20,8 +20,8 @@
import nl.basjes.parse.useragent.AgentField;
import nl.basjes.parse.useragent.UserAgent.MutableUserAgent;
import nl.basjes.parse.useragent.utils.YamlUtils;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.yaml.snakeyaml.nodes.MappingNode;
import org.yaml.snakeyaml.nodes.NodeTuple;

Expand Down
2 changes: 1 addition & 1 deletion analyzer/src/main/java/nl/basjes/parse/useragent/analyze/MatcherAction.java
View file
Expand Up @@ -55,8 +55,8 @@
import org.antlr.v4.runtime.Recognizer;
import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.tree.ParseTree;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.io.Serializable;
import java.util.HashMap;
Expand Down
2 changes: 1 addition & 1 deletion analyzer/src/main/java/nl/basjes/parse/useragent/analyze/MatcherExtractAction.java
View file
Expand Up @@ -21,8 +21,8 @@
import nl.basjes.parse.useragent.analyze.treewalker.steps.WalkList.WalkResult;
import nl.basjes.parse.useragent.parser.UserAgentTreeWalkerParser;
import org.antlr.v4.runtime.ParserRuleContext;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

public class MatcherExtractAction extends MatcherAction {
private static final Logger LOG = LogManager.getLogger(MatcherExtractAction.class);
Expand Down
2 changes: 1 addition & 1 deletion analyzer/src/main/java/nl/basjes/parse/useragent/analyze/MatcherFailIfFoundAction.java
View file
Expand Up @@ -21,8 +21,8 @@
import nl.basjes.parse.useragent.parser.UserAgentTreeWalkerParser;
import org.antlr.v4.runtime.ParserRuleContext;
import org.antlr.v4.runtime.tree.ParseTree;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

public class MatcherFailIfFoundAction extends MatcherAction {
private static final Logger LOG = LogManager.getLogger(MatcherFailIfFoundAction.class);
Expand Down
2 changes: 1 addition & 1 deletion analyzer/src/main/java/nl/basjes/parse/useragent/analyze/MatcherRequireAction.java
View file
Expand Up @@ -20,8 +20,8 @@
import nl.basjes.parse.useragent.analyze.treewalker.steps.WalkList.WalkResult;
import nl.basjes.parse.useragent.parser.UserAgentTreeWalkerParser;
import org.antlr.v4.runtime.ParserRuleContext;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

public class MatcherRequireAction extends MatcherAction {
private static final Logger LOG = LogManager.getLogger(MatcherRequireAction.class);
Expand Down
2 changes: 1 addition & 1 deletion analyzer/src/main/java/nl/basjes/parse/useragent/analyze/MatcherVariableAction.java
View file
Expand Up @@ -20,8 +20,8 @@
import nl.basjes.parse.useragent.analyze.treewalker.steps.WalkList.WalkResult;
import nl.basjes.parse.useragent.parser.UserAgentTreeWalkerParser;
import org.antlr.v4.runtime.ParserRuleContext;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.util.Set;

Expand Down
2 changes: 1 addition & 1 deletion ...r/src/main/java/nl/basjes/parse/useragent/analyze/treewalker/TreeExpressionEvaluator.java
View file
Expand Up @@ -33,8 +33,8 @@
import org.antlr.v4.runtime.ParserRuleContext;
import org.antlr.v4.runtime.tree.ParseTree;
import org.antlr.v4.runtime.tree.RuleNode;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.io.Serializable;

Expand Down
2 changes: 1 addition & 1 deletion analyzer/src/main/java/nl/basjes/parse/useragent/analyze/treewalker/steps/Step.java
View file
Expand Up @@ -23,8 +23,8 @@
import org.antlr.v4.runtime.ParserRuleContext;
import org.antlr.v4.runtime.tree.ParseTree;
import org.antlr.v4.runtime.tree.TerminalNode;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.io.Serializable;

Expand Down
2 changes: 1 addition & 1 deletion analyzer/src/main/java/nl/basjes/parse/useragent/analyze/treewalker/steps/WalkList.java
View file
Expand Up @@ -93,8 +93,8 @@
import org.antlr.v4.runtime.ParserRuleContext;
import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.tree.ParseTree;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.io.Serializable;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion analyzer/src/main/java/nl/basjes/parse/useragent/annotate/UserAgentAnnotationAnalyzer.java
View file
Expand Up @@ -20,8 +20,8 @@
import nl.basjes.parse.useragent.UserAgent;
import nl.basjes.parse.useragent.UserAgentAnalyzer;
import nl.basjes.parse.useragent.analyze.InvalidParserConfigurationException;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.core.GenericTypeResolver;

import java.lang.reflect.InvocationTargetException;
Expand Down
2 changes: 1 addition & 1 deletion analyzer/src/main/java/nl/basjes/parse/useragent/debug/DebugUserAgent.java
View file
Expand Up @@ -23,8 +23,8 @@
import nl.basjes.parse.useragent.analyze.Matcher;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
2 changes: 1 addition & 1 deletion analyzer/src/main/java/nl/basjes/parse/useragent/utils/YauaaVersion.java
View file
Expand Up @@ -19,8 +19,8 @@

import nl.basjes.parse.useragent.Version;
import nl.basjes.parse.useragent.analyze.InvalidParserConfigurationException;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.yaml.snakeyaml.nodes.MappingNode;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.nodes.NodeTuple;
Expand Down
4 changes: 2 additions & 2 deletions analyzer/src/test/java/nl/basjes/parse/useragent/TestCalculators.java
View file
Expand Up @@ -22,11 +22,11 @@
import nl.basjes.parse.useragent.calculate.CalculateDeviceBrand;
import nl.basjes.parse.useragent.calculate.ConcatNONDuplicatedCalculator;
import nl.basjes.parse.useragent.calculate.MajorVersionCalculator;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;

import java.util.ArrayList;
import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions analyzer/src/test/java/nl/basjes/parse/useragent/TestPredefinedBrowsers.java
View file
Expand Up @@ -18,9 +18,9 @@
package nl.basjes.parse.useragent;

import nl.basjes.parse.useragent.debug.UserAgentAnalyzerTester;
import org.junit.jupiter.api.Test;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.junit.jupiter.api.Test;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
4 changes: 2 additions & 2 deletions analyzer/src/test/java/nl/basjes/parse/useragent/TestPredefinedBrowsersPerField.java
View file
Expand Up @@ -18,10 +18,10 @@
package nl.basjes.parse.useragent;

import nl.basjes.parse.useragent.debug.UserAgentAnalyzerTester;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;

import java.util.Collections;
import java.util.Set;
Expand Down
4 changes: 2 additions & 2 deletions analyzer/src/test/java/nl/basjes/parse/useragent/TestUseragent.java
View file
Expand Up @@ -20,9 +20,9 @@
import nl.basjes.parse.useragent.AgentField.MutableAgentField;
import nl.basjes.parse.useragent.UserAgent.ImmutableUserAgent;
import nl.basjes.parse.useragent.UserAgent.MutableUserAgent;
import org.junit.jupiter.api.Test;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.junit.jupiter.api.Test;

import java.util.Arrays;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion analyzer/src/test/java/nl/basjes/parse/useragent/analyze/TestBuilder.java
View file
Expand Up @@ -23,8 +23,8 @@
import nl.basjes.parse.useragent.UserAgentAnalyzer;
import nl.basjes.parse.useragent.UserAgentAnalyzer.UserAgentAnalyzerBuilder;
import nl.basjes.parse.useragent.UserAgentAnalyzerDirect;
import org.junit.jupiter.api.Test;
import org.apache.logging.log4j.LogManager;
import org.junit.jupiter.api.Test;

import java.util.Arrays;

Expand Down
4 changes: 2 additions & 2 deletions analyzer/src/test/java/nl/basjes/parse/useragent/parse/TestUserAgentFlattening.java
View file
Expand Up @@ -20,9 +20,9 @@
import nl.basjes.parse.useragent.AbstractUserAgentAnalyzerDirect.GetAllPathsAnalyzer;
import nl.basjes.parse.useragent.UserAgent;
import nl.basjes.parse.useragent.UserAgentAnalyzer;
import org.junit.jupiter.api.Test;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.junit.jupiter.api.Test;

import java.util.List;

Expand Down
4 changes: 2 additions & 2 deletions analyzer/src/test/java/nl/basjes/parse/useragent/profile/TestMemoryFootprint.java
View file
Expand Up @@ -18,10 +18,10 @@
package nl.basjes.parse.useragent.profile;

import nl.basjes.parse.useragent.UserAgentAnalyzer;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;

import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
Expand Down
4 changes: 2 additions & 2 deletions analyzer/src/test/java/nl/basjes/parse/useragent/profile/TestPerformance.java
View file
Expand Up @@ -19,10 +19,10 @@

import nl.basjes.parse.useragent.UserAgentAnalyzer;
import nl.basjes.parse.useragent.debug.UserAgentAnalyzerTester;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;

import static org.junit.jupiter.api.Assertions.assertTrue;

Expand Down
4 changes: 2 additions & 2 deletions .../test/java/nl/basjes/parse/useragent/serialization/AbstractAnalyzerSerializationTest.java
View file
Expand Up @@ -20,9 +20,9 @@
import nl.basjes.parse.useragent.AbstractUserAgentAnalyzerDirect;
import nl.basjes.parse.useragent.AbstractUserAgentAnalyzerDirect.AbstractUserAgentAnalyzerDirectBuilder;
import nl.basjes.parse.useragent.debug.UserAgentAnalyzerTester;
import org.junit.jupiter.api.Test;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.junit.jupiter.api.Test;

import java.io.IOException;

Expand Down
4 changes: 2 additions & 2 deletions ...yzer/src/test/java/nl/basjes/parse/useragent/serialization/AbstractSerializationTest.java
View file
Expand Up @@ -19,9 +19,9 @@

import nl.basjes.parse.useragent.debug.UserAgentAnalyzerTester;
import nl.basjes.parse.useragent.debug.UserAgentAnalyzerTester.UserAgentAnalyzerTesterBuilder;
import org.junit.jupiter.api.Test;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.junit.jupiter.api.Test;

import java.io.IOException;

Expand Down
6 changes: 1 addition & 5 deletions benchmarks/pom.xml
View file
Expand Up @@ -56,7 +56,7 @@
<scope>provided</scope>
</dependency>

<!-- The base logging implementation for this library -->
<!-- The default logging implementation for Yauaa -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
Expand Down Expand Up @@ -96,10 +96,6 @@
<artifactId>yauaa</artifactId>
<version>${yauaa.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/src/test/java/nl/basjes/parse/useragent/benchmarks/RunBenchmarks.java
View file
Expand Up @@ -21,9 +21,9 @@
import nl.basjes.parse.useragent.UserAgentAnalyzer;
import nl.basjes.statistics.Counter;
import org.apache.commons.lang3.tuple.Triple;
import org.junit.jupiter.api.Test;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.junit.jupiter.api.Test;

import java.util.ArrayList;
import java.util.List;
Expand Down

0 comments on commit eeac19a

Please sign in to comment.