github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-24 10:01:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

added the AbstractTokenizingFilter

Browse Source 
Former-commit-id: 043e4f9940c341dc05529c08d154f523735756d3
This commit is contained in:
Jeremy Long
2013-06-23 22:30:47 -04:00
parent c23febbcf0
commit d27a6235f0
1 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/org/owasp/dependencycheck/data/lucene/VersionTokenizingFilter.java
View File

@@ -20,7 +20,6 @@ package org.owasp.dependencycheck.data.lucene;
import java.io.IOException; import java.io.IOException;
import java.util.LinkedList; import java.util.LinkedList;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
@@ -32,16 +31,7 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
* *
* @author Jeremy Long (jeremy.long@owasp.org) * @author Jeremy Long (jeremy.long@owasp.org)
*/ */
public final class VersionTokenizingFilter extends TokenFilter { public final class VersionTokenizingFilter extends AbstractTokenizingFilter {
/**
* The char term attribute.
*/
private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
/**
* A collection of tokens to add to the stream.
*/
private final LinkedList<String> tokens;
/** /**
* Constructs a new VersionTokenizingFilter. * Constructs a new VersionTokenizingFilter.
@@ -50,7 +40,6 @@ public final class VersionTokenizingFilter extends TokenFilter {
*/ */
public VersionTokenizingFilter(TokenStream stream) { public VersionTokenizingFilter(TokenStream stream) {
super(stream); super(stream);
tokens = new LinkedList<String>();
} }
/** /**
@@ -63,6 +52,8 @@ public final class VersionTokenizingFilter extends TokenFilter {
*/ */
@Override @Override
public boolean incrementToken() throws IOException { public boolean incrementToken() throws IOException {
final LinkedList<String> tokens = getTokens();
final CharTermAttribute termAtt = getTermAtt();
if (tokens.size() == 0 && input.incrementToken()) { if (tokens.size() == 0 && input.incrementToken()) {
final String version = new String(termAtt.buffer(), 0, termAtt.length()); final String version = new String(termAtt.buffer(), 0, termAtt.length());
final String[] toAnalyze = version.split("[_-]"); final String[] toAnalyze = version.split("[_-]");
@@ -75,21 +66,6 @@ public final class VersionTokenizingFilter extends TokenFilter {
return addTerm(); return addTerm();
} }
/**
* Adds a term, if one exists, from the tokens collection.
*
* @return whether or not a new term was added
*/
private boolean addTerm() {
final boolean termAdded = tokens.size() > 0;
if (termAdded) {
final String version = tokens.pop();
clearAttributes();
termAtt.append(version);
}
return termAdded;
}
/** /**
* <p>Analyzes the version and adds several copies of the version as * <p>Analyzes the version and adds several copies of the version as
* different tokens. For example, the version 1.2.7 would create the tokens * different tokens. For example, the version 1.2.7 would create the tokens
@@ -104,6 +80,7 @@ public final class VersionTokenizingFilter extends TokenFilter {
private void analyzeVersion(String version) { private void analyzeVersion(String version) {
//todo should we also be splitting on dash or underscore? we would need //todo should we also be splitting on dash or underscore? we would need
// to incorporate the dash or underscore back in... // to incorporate the dash or underscore back in...
final LinkedList<String> tokens = getTokens();
final String[] versionParts = version.split("\\."); final String[] versionParts = version.split("\\.");
String dottedVersion = null; String dottedVersion = null;
for (String current : versionParts) { for (String current : versionParts) {