diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.java index c330cc3e1..edd7da7c0 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.java @@ -125,7 +125,7 @@ public final class CpeMemoryIndex { } indexSearcher = new IndexSearcher(indexReader); searchingAnalyzer = createSearchingAnalyzer(); - queryParser = new QueryParser(LuceneUtils.CURRENT_VERSION, Fields.DOCUMENT_KEY, searchingAnalyzer); + queryParser = new QueryParser(Fields.DOCUMENT_KEY, searchingAnalyzer); openState = true; } } diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/AlphaNumericTokenizer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/AlphaNumericTokenizer.java index 09435d7ab..a8f0c07ba 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/AlphaNumericTokenizer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/AlphaNumericTokenizer.java @@ -19,7 +19,6 @@ package org.owasp.dependencycheck.data.lucene; import java.io.Reader; import org.apache.lucene.analysis.util.CharTokenizer; -import org.apache.lucene.util.Version; /** * Tokenizes the input breaking it into tokens when non-alpha/numeric characters are found. @@ -31,11 +30,10 @@ public class AlphaNumericTokenizer extends CharTokenizer { /** * Constructs a new AlphaNumericTokenizer. * - * @param matchVersion the lucene version * @param in the Reader */ - public AlphaNumericTokenizer(Version matchVersion, Reader in) { - super(matchVersion, in); + public AlphaNumericTokenizer(Reader in) { + super(in); } /** diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/FieldAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/FieldAnalyzer.java index e1810e38f..8eb1c1b35 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/FieldAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/FieldAnalyzer.java @@ -59,7 +59,7 @@ public class FieldAnalyzer extends Analyzer { */ @Override protected TokenStreamComponents createComponents(String fieldName, Reader reader) { - final Tokenizer source = new AlphaNumericTokenizer(version, reader); + final Tokenizer source = new AlphaNumericTokenizer(reader); TokenStream stream = source; @@ -72,7 +72,7 @@ public class FieldAnalyzer extends Analyzer { | WordDelimiterFilter.SPLIT_ON_NUMERICS | WordDelimiterFilter.STEM_ENGLISH_POSSESSIVE, null); - stream = new LowerCaseFilter(version, stream); + stream = new LowerCaseFilter(stream); stream = new StopFilter(version, stream, StopAnalyzer.ENGLISH_STOP_WORDS_SET); return new TokenStreamComponents(source, stream); diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzer.java index 7b40e08ed..b5b8928d1 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzer.java @@ -62,7 +62,7 @@ public class SearchFieldAnalyzer extends Analyzer { */ @Override protected TokenStreamComponents createComponents(String fieldName, Reader reader) { - final Tokenizer source = new AlphaNumericTokenizer(version, reader); + final Tokenizer source = new AlphaNumericTokenizer(reader); TokenStream stream = source; @@ -74,7 +74,7 @@ public class SearchFieldAnalyzer extends Analyzer { | WordDelimiterFilter.SPLIT_ON_NUMERICS | WordDelimiterFilter.STEM_ENGLISH_POSSESSIVE, null); - stream = new LowerCaseFilter(version, stream); + stream = new LowerCaseFilter(stream); stream = new UrlTokenizingFilter(stream); concatenatingFilter = new TokenPairConcatenatingFilter(stream); stream = concatenatingFilter; diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/SearchVersionAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/SearchVersionAnalyzer.java index 995a6d751..7802aeed6 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/SearchVersionAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/SearchVersionAnalyzer.java @@ -40,18 +40,11 @@ public class SearchVersionAnalyzer extends Analyzer { // look at this article to implement // http://www.codewrecks.com/blog/index.php/2012/08/25/index-your-blog-using-tags-and-lucene-net/ - /** - * The Lucene Version used. - */ - private final Version version; - /** * Creates a new SearchVersionAnalyzer. * - * @param version the Lucene version */ - public SearchVersionAnalyzer(Version version) { - this.version = version; + public SearchVersionAnalyzer() { } /** @@ -63,9 +56,9 @@ public class SearchVersionAnalyzer extends Analyzer { */ @Override protected TokenStreamComponents createComponents(String fieldName, Reader reader) { - final Tokenizer source = new WhitespaceTokenizer(version, reader); + final Tokenizer source = new WhitespaceTokenizer(reader); TokenStream stream = source; - stream = new LowerCaseFilter(version, stream); + stream = new LowerCaseFilter(stream); stream = new VersionTokenizingFilter(stream); return new TokenStreamComponents(source, stream); } diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/VersionAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/VersionAnalyzer.java index b5510f480..b66fb7bc5 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/VersionAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/VersionAnalyzer.java @@ -23,7 +23,6 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.WhitespaceTokenizer; -import org.apache.lucene.util.Version; /** * VersionAnalyzer is a Lucene Analyzer used to analyze version information. @@ -40,19 +39,11 @@ public class VersionAnalyzer extends Analyzer { // look at this article to implement // http://www.codewrecks.com/blog/index.php/2012/08/25/index-your-blog-using-tags-and-lucene-net/ - /** - * The Lucene Version used. - */ - private final Version version; - /** * Creates a new VersionAnalyzer. * - * @param version the Lucene version */ - public VersionAnalyzer(Version version) { - this.version = version; - } + public VersionAnalyzer() {} /** * Creates the TokenStreamComponents @@ -63,9 +54,9 @@ public class VersionAnalyzer extends Analyzer { */ @Override protected TokenStreamComponents createComponents(String fieldName, Reader reader) { - final Tokenizer source = new WhitespaceTokenizer(version, reader); + final Tokenizer source = new WhitespaceTokenizer(reader); TokenStream stream = source; - stream = new LowerCaseFilter(version, stream); + stream = new LowerCaseFilter(stream); return new TokenStreamComponents(source, stream); } } diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/FieldAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/FieldAnalyzerTest.java index 6fae2382f..def2af8b6 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/FieldAnalyzerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/FieldAnalyzerTest.java @@ -89,7 +89,7 @@ public class FieldAnalyzerTest { map.put(field1, searchAnalyzerProduct); map.put(field2, searchAnalyzerVendor); PerFieldAnalyzerWrapper wrapper = new PerFieldAnalyzerWrapper(new StandardAnalyzer(LuceneUtils.CURRENT_VERSION), map); - QueryParser parser = new QueryParser(LuceneUtils.CURRENT_VERSION, field1, wrapper); + QueryParser parser = new QueryParser(field1, wrapper); Query q = parser.parse(querystr); //System.out.println(q.toString()); diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilterTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilterTest.java index c2ac23d79..90c43829b 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilterTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilterTest.java @@ -61,7 +61,7 @@ public class TokenPairConcatenatingFilterTest extends BaseTokenStreamTestCase { * test some examples */ public void testExamples() throws IOException { - Tokenizer wsTokenizer = new WhitespaceTokenizer(LuceneUtils.CURRENT_VERSION, new StringReader("one two three")); + Tokenizer wsTokenizer = new WhitespaceTokenizer(new StringReader("one two three")); TokenStream filter = new TokenPairConcatenatingFilter(wsTokenizer); assertTokenStreamContents(filter, new String[]{"one", "onetwo", "two", "twothree", "three"}); @@ -75,7 +75,7 @@ public class TokenPairConcatenatingFilterTest extends BaseTokenStreamTestCase { @Test public void testClear() throws IOException { - TokenStream ts = new WhitespaceTokenizer(LuceneUtils.CURRENT_VERSION, new StringReader("one two three")); + TokenStream ts = new WhitespaceTokenizer(new StringReader("one two three")); TokenPairConcatenatingFilter filter = new TokenPairConcatenatingFilter(ts); assertTokenStreamContents(filter, new String[]{"one", "onetwo", "two", "twothree", "three"});