Merge pull request #57 from evolvedbinary/6.x.x/hotfix/lucene-field-string-type

[6.x.x] Allow Strings that contain entities to be correctly stored in Lucene fields

Author: adamretter

exist-core/src/main/java/org/exist/xquery/value/StringValue.java

@@ -890,7 +890,20 @@ public void serialize(final ByteBuffer buf) throws IOException {
      * @return the StringValue.
      */
     public static StringValue deserialize(@Nullable final Expression expression, final ByteBuffer buf) throws IOException, XPathException {
-        return deserialize(expression, buf, null);
+        return deserialize(expression, buf, false);
+    }
+
+    /**
+     * Deserializes from a ByteBuffer.
+     *
+     * @param expression the expression that creates the StringValue object.
+     * @param buf the ByteBuffer to deserialize from.
+     * @param expand if entities need to be expanded
+     *
+     * @return the StringValue.
+     */
+    public static StringValue deserialize(@Nullable final Expression expression, final ByteBuffer buf, final boolean expand) throws IOException, XPathException {
+        return deserialize(expression, buf, null, expand);
     }
 
     /**
@@ -903,12 +916,26 @@ public static StringValue deserialize(@Nullable final Expression expression, fin
      * @return the StringValue.
      */
     public static StringValue deserialize(@Nullable Expression expression, final ByteBuffer buf, @Nullable final Integer checkType) throws IOException, XPathException {
+        return deserialize(expression, buf, checkType, false);
+    }
+
+    /**
+     * Deserializes from a ByteBuffer.
+     *
+     * @param expression the expression that creates the StringValue object.
+     * @param buf the ByteBuffer to deserialize from.
+     * @param checkType an XDM type to check that matches against the deserialized StringValue type.
+     * @param expand if entities need to be expanded
+     *
+     * @return the StringValue.
+     */
+    public static StringValue deserialize(@Nullable Expression expression, final ByteBuffer buf, @Nullable final Integer checkType, final boolean expand) throws IOException, XPathException {
         final VariableByteBufferInput vbbi = new VariableByteBufferInput(buf);
         final int type = vbbi.read();
         if (checkType != null && type != checkType.intValue()) {
             throw new XPathException(expression, "Expected deserialized StringValue of type: " + Type.getTypeName(checkType) + ", but found: " + Type.getTypeName(type));
         }
         final String value = vbbi.readUTF();
-        return new StringValue(expression, value, type);
+        return new StringValue(expression, value, type, expand);
     }
 }

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

@@ -352,7 +352,7 @@ protected void processText(final NodeId nodeId, final CharSequence text, final M
                 case Type.ID:
                 case Type.IDREF:
                 case Type.ENTITY:
-                    final StringValue stringValue = new StringValue(content, type);
+                    final StringValue stringValue = new StringValue(content, type, false);
                     return new TextField(fieldName, stringValue.getStringValue(), store);
 
                 case Type.NOTATION:
@@ -499,7 +499,7 @@ protected void processText(final NodeId nodeId, final CharSequence text, final M
                 case Type.ID:
                 case Type.IDREF:
                 case Type.ENTITY:
-                    final StringValue stringValue = new StringValue(content, type);
+                    final StringValue stringValue = new StringValue(content, type, false);
                     bytesRef = new BytesRef(stringValue.toJavaObject(byte[].class));
                     break;
 

extensions/indexes/lucene/src/main/java/org/exist/xquery/modules/lucene/Field.java

@@ -527,7 +527,7 @@ private AtomicValue stringToAtomic(final int type, final String value) throws XP
             case Type.ID:
             case Type.IDREF:
             case Type.ENTITY:
-                return new StringValue(this, value, type);
+                return new StringValue(this, value, type, false);
 
             case Type.NOTATION:
             default: