Skip to content

DEVEXP-650 Fixing search that includes metadata values #1622

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

Merged
rjrudin merged 1 commit into from
Nov 30, 2023
+25 −5
Merged

DEVEXP-650 Fixing search that includes metadata values #1622

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
2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/impl/OkHttpServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1627,7 +1627,7 @@ private void addCategoryParams(Set<Metadata> categories, RequestParameters param
}
}
private void addCategoryParam(RequestParameters params, Metadata category) {
addCategoryParam(params, category.name().toLowerCase());
addCategoryParam(params, category.toString().toLowerCase());
}
private void addCategoryParam(RequestParameters params, String category) {
params.add("category", category);
Expand Down
28 changes: 24 additions & 4 deletions marklogic-client-api/src/test/java/com/marklogic/client/test/StringSearchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
import com.marklogic.client.ResourceNotFoundException;
import com.marklogic.client.ResourceNotResendableException;
import com.marklogic.client.admin.QueryOptionsManager;
import com.marklogic.client.document.DocumentManager;
import com.marklogic.client.document.DocumentPage;
import com.marklogic.client.document.DocumentRecord;
import com.marklogic.client.document.XMLDocumentManager;
import com.marklogic.client.io.DocumentMetadataHandle;
import com.marklogic.client.io.Format;
import com.marklogic.client.io.SearchHandle;
Expand All @@ -32,17 +36,15 @@
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;

import javax.xml.parsers.ParserConfigurationException;
import java.io.ByteArrayOutputStream;
import java.io.IOException;

import static org.junit.jupiter.api.Assertions.*;

public class StringSearchTest {
@SuppressWarnings("unused")
private static final Logger logger = (Logger) LoggerFactory.getLogger(StringSearchTest.class);
private static final Logger logger = LoggerFactory.getLogger(StringSearchTest.class);

@BeforeAll
public static void beforeClass() {
Expand All @@ -54,9 +56,27 @@ public static void beforeClass() {
public static void afterClass() {
}

@Test
void returnDocumentsWithMetadataValues() {
XMLDocumentManager mgr = Common.client.newXMLDocumentManager();
mgr.write("/metadata/test.xml",
new DocumentMetadataHandle().withMetadataValue("hello", "world"),
new StringHandle("<test>metadataabc</test>"));

mgr.setMetadataCategories(DocumentManager.Metadata.METADATAVALUES);

DocumentPage page = mgr.search(Common.client.newQueryManager().newStructuredQueryBuilder().term("metadataabc"), 1);
assertTrue(page.hasNext());

DocumentRecord record = page.next();
assertEquals("/metadata/test.xml", record.getUri());
DocumentMetadataHandle.DocumentMetadataValues values = record.getMetadata(new DocumentMetadataHandle()).getMetadataValues();
assertEquals("world", values.get("hello"));
}

@Test
public void testStringSearch()
throws IOException, ParserConfigurationException, SAXException, FailedRequestException, ForbiddenUserException,
throws FailedRequestException, ForbiddenUserException,
ResourceNotFoundException, ResourceNotResendableException
{
String optionsName = writeOptions();
Expand Down