Skip to content

OAK-12097 loadTokenizer uses default tokenizer when none provided (#2767) #2770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thomasmueller wants to merge 1 commit into
base: trunk
Choose a base branch
from
+19 −4
Open

OAK-12097 loadTokenizer uses default tokenizer when none provided (#2767) #2770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions ...rc/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/NodeStateAnalyzerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import static java.util.Objects.requireNonNull;

/**
* Constructs a Lucene Analyzer from nodes (based on NodeState content).
*
Expand Down Expand Up @@ -141,9 +139,13 @@ private CharFilterFactory[] loadCharFilterFactories(NodeState charFiltersState)
}

private TokenizerFactory loadTokenizer(NodeState state) {
String clazz = requireNonNull(state.getString(FulltextIndexConstants.ANL_NAME));
String name = state.getString(FulltextIndexConstants.ANL_NAME);
if (name == null) {
log.warn("No tokenizer name specified in analyzer configuration. Using default 'standard' tokenizer.");
name = "standard";
}
Map<String, String> args = convertNodeState(state);
TokenizerFactory tf = TokenizerFactory.forName(clazz, args);
TokenizerFactory tf = TokenizerFactory.forName(name, args);
init(tf, state);
return tf;
}
Expand Down
13 changes: 13 additions & 0 deletions ...est/java/org/apache/jackrabbit/oak/plugins/index/lucene/NodeStateAnalyzerFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.apache.lucene.analysis.core.StopFilterFactory;
import org.apache.lucene.analysis.core.WhitespaceTokenizerFactory;
import org.apache.lucene.analysis.path.PathHierarchyTokenizerFactory;
import org.apache.lucene.analysis.standard.StandardTokenizerFactory;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.util.ClasspathResourceLoader;
import org.apache.lucene.analysis.util.StopwordAnalyzerBase;
Expand Down Expand Up @@ -191,6 +192,18 @@ public void nodeStateAsMap() throws Exception{
assertNull(result.get(":hiddenProp"));
}

@Test
public void missingTokenizerName() throws Exception{
NodeBuilder nb = EMPTY_NODE.builder();
nb.child(ANL_TOKENIZER);

TokenizerChain analyzer = (TokenizerChain) factory.createInstance(nb.getNodeState());
assertNotNull(analyzer);
assertNotNull(analyzer.getTokenizer());

assertEquals(StandardTokenizerFactory.class.getName(), analyzer.getTokenizer().getClassArg());
}

private static NodeBuilder createFileNode(NodeBuilder nb, String nodeName, byte[] content){
return nb.child(nodeName).child(JCR_CONTENT).setProperty(JCR_DATA, content);
}
Expand Down
Loading