Merge pull request #5816 from line-o/fix/LuceneFieldConfig

[fix] AbstractFieldConfig recognizes expressions again

Author: dizzzz

extensions/indexes/lucene/src/main/java/org/exist/indexing/lucene/AbstractFieldConfig.java

@@ -47,7 +47,7 @@
 
 /**
  * Abstract configuration corresponding to either a field or facet element nested inside
- * a index definition 'text' element. Adds the possibility to create index content based
+ * an index definition 'text' element. Adds the possibility to create index content based
  * on an arbitrary XQuery expression.
  *
  * @author Wolfgang Meier
@@ -58,50 +58,52 @@ public abstract class AbstractFieldConfig {
 
     protected static final Logger LOG = LogManager.getLogger(AbstractFieldConfig.class);
 
-    protected Optional<String> expression = Optional.empty();
+    protected final Optional<String> expression;
     protected boolean isValid = true;
     private CompiledXQuery compiled = null;
 
-    public AbstractFieldConfig(LuceneConfig config, Element configElement, Map<String, String> namespaces) {
+    public AbstractFieldConfig(final LuceneConfig config, final Element configElement, final Map<String, String> namespaces) {
         final String xpath = configElement.getAttribute(XPATH_ATTR);
         if (xpath.isEmpty()) {
-
-            final StringBuilder sb = new StringBuilder();
-            namespaces.forEach((prefix, uri) -> {
-                if (!"xml".equals(prefix)) {
-                    sb.append("declare namespace ").append(prefix);
-                    sb.append("=\"").append(uri).append("\";\n");
-                }
-            });
-            config.getImports().ifPresent(moduleImports -> moduleImports.forEach((moduleImport -> {
-                sb.append("import module namespace ");
-                sb.append(moduleImport.prefix);
-                sb.append("=\"");
-                sb.append(moduleImport.uri);
-                sb.append("\" at \"");
-                sb.append(resolveURI(configElement.getBaseURI(), moduleImport.at));
-                sb.append("\";\n");
-            })));
-            sb.append(xpath);
-
-            this.expression = Optional.of(sb.toString());
+            expression = Optional.empty();
+            return;
         }
+
+        final StringBuilder sb = new StringBuilder();
+        namespaces.forEach((prefix, uri) -> {
+            if (!"xml".equals(prefix)) {
+                sb.append("declare namespace ").append(prefix);
+                sb.append("=\"").append(uri).append("\";\n");
+            }
+        });
+        config.getImports().ifPresent(moduleImports -> moduleImports.forEach((moduleImport -> {
+            sb.append("import module namespace ");
+            sb.append(moduleImport.prefix);
+            sb.append("=\"");
+            sb.append(moduleImport.uri);
+            sb.append("\" at \"");
+            sb.append(resolveURI(configElement.getBaseURI(), moduleImport.at));
+            sb.append("\";\n");
+        })));
+        sb.append(xpath);
+
+        expression = Optional.of(sb.toString());
     }
 
     @Nullable
     public Analyzer getAnalyzer() {
         return null;
     }
 
-    protected abstract void processResult(Sequence result, Document luceneDoc) throws XPathException;
+    protected abstract void processResult(final Sequence result, final Document luceneDoc) throws XPathException;
 
     protected abstract void processText(CharSequence text, Document luceneDoc);
 
     protected abstract void build(DBBroker broker, DocumentImpl document, NodeId nodeId, Document luceneDoc, CharSequence text);
 
     protected void doBuild(DBBroker broker, DocumentImpl document, NodeId nodeId, Document luceneDoc, CharSequence text)
             throws PermissionDeniedException, XPathException {
-        if (!expression.isPresent()) {
+        if (expression.isEmpty()) {
             processText(text, luceneDoc);
             return;
         }
@@ -129,13 +131,13 @@ protected void doBuild(DBBroker broker, DocumentImpl document, NodeId nodeId, Do
         }
     }
 
-    private void compile(DBBroker broker) {
+    private void compile(final DBBroker broker) {
         if (compiled == null && isValid) {
             expression.ifPresent((code) -> compiled = compile(broker, code));
         }
     }
 
-    protected CompiledXQuery compile(DBBroker broker, String code) {
+    protected CompiledXQuery compile(final DBBroker broker, final String code) {
         final XQuery xquery = broker.getBrokerPool().getXQueryService();
         final XQueryContext context = new XQueryContext(broker.getBrokerPool());
         try {
@@ -147,7 +149,7 @@ protected CompiledXQuery compile(DBBroker broker, String code) {
         }
     }
 
-    private String resolveURI(String baseURI, String location) {
+    private String resolveURI(final String baseURI, final String location) {
         try {
             final URI uri = new URI(location);
             if (!uri.isAbsolute() && baseURI != null && baseURI.startsWith(CollectionConfigurationManager.CONFIG_COLLECTION)) {