diff --git a/examples/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkLoadFromJdbcRaw.java b/examples/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkLoadFromJdbcRaw.java index 2a8805d5c..96cee7fc2 100644 --- a/examples/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkLoadFromJdbcRaw.java +++ b/examples/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkLoadFromJdbcRaw.java @@ -193,7 +193,7 @@ public void load() throws IOException, SQLException { public void transform() throws IOException, SQLException { // search for all records in the /employees/ directory - StructuredQueryDefinition query = new StructuredQueryBuilder().directory(1, "/employees/"); + StructuredQueryDefinition query = new StructuredQueryBuilder().directory(false, "/employees/"); // the QueryBatcher efficiently paginates through matching batches from all // appropriate nodes in the cluster then applies the transform on each batch diff --git a/examples/src/main/java/com/marklogic/client/example/cookbook/datamovement/ExtractRowsViaTemplate.java b/examples/src/main/java/com/marklogic/client/example/cookbook/datamovement/ExtractRowsViaTemplate.java index 79811de27..dd3f48e0c 100644 --- a/examples/src/main/java/com/marklogic/client/example/cookbook/datamovement/ExtractRowsViaTemplate.java +++ b/examples/src/main/java/com/marklogic/client/example/cookbook/datamovement/ExtractRowsViaTemplate.java @@ -63,7 +63,7 @@ public static void main(String[] args) throws ParseException, IOException { public void run() throws ParseException, IOException { setup(); - StructuredQueryDefinition query = new StructuredQueryBuilder().directory(1, "/employees/"); + StructuredQueryDefinition query = new StructuredQueryBuilder().directory(false, "/employees/"); QueryBatcher qb = moveMgr.newQueryBatcher(query) .onUrisReady( // This object will be closed by the QueryBatcher when stopJob is diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/query/StructuredQueryBuilder.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/StructuredQueryBuilder.java index c42400752..731c5a182 100644 --- a/marklogic-client-api/src/main/java/com/marklogic/client/query/StructuredQueryBuilder.java +++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/StructuredQueryBuilder.java @@ -469,7 +469,11 @@ public StructuredQueryDefinition directory(boolean isInfinite, String... uris) { * A value of 1 means to exclude subdirectories. * @param uris the identifiers for the criteria directories * @return the StructuredQueryDefinition for the directory query + * @deprecated since 4.6.1; a directory query in MarkLogic does not support custom depths; it is either limited + * to the given directory or it is "infinite". For that reason, prefer the {@code directory} method that accepts a + * boolean indicating whether the directory query is infinite. */ + @Deprecated public StructuredQueryDefinition directory(int depth, String... uris) { return new DirectoryQuery(depth, uris); } diff --git a/marklogic-client-api/src/test/java/com/marklogic/client/test/BulkReadWriteTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/BulkReadWriteTest.java index 11f42f53b..b5da2fade 100644 --- a/marklogic-client-api/src/test/java/com/marklogic/client/test/BulkReadWriteTest.java +++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/BulkReadWriteTest.java @@ -197,7 +197,7 @@ public void testC_BulkSearch() { SearchHandle searchHandle = new SearchHandle(); int pageLength = 100; docMgr.setPageLength(pageLength); - DocumentPage page = docMgr.search(new StructuredQueryBuilder().directory(1, DIRECTORY), 1, searchHandle); + DocumentPage page = docMgr.search(new StructuredQueryBuilder().directory(false, DIRECTORY), 1, searchHandle); try { for ( DocumentRecord record : page ) { validateRecord(record); diff --git a/marklogic-client-api/src/test/java/com/marklogic/client/test/MarkLogicCloudAuthenticationDebugger.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/MarkLogicCloudAuthenticationDebugger.java index 93f13d9bb..91229fbef 100644 --- a/marklogic-client-api/src/test/java/com/marklogic/client/test/MarkLogicCloudAuthenticationDebugger.java +++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/MarkLogicCloudAuthenticationDebugger.java @@ -49,7 +49,7 @@ public static void main(String[] args) throws Exception { } System.out.println(client.newQueryManager().search( - client.newQueryManager().newStructuredQueryBuilder().directory(0, "/") + client.newQueryManager().newStructuredQueryBuilder().directory(true, "/") , new JacksonHandle()).get().toPrettyString()); System.out.println("Successfully finished cloud-based authentication test"); diff --git a/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/QueryBatcherFailureTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/QueryBatcherFailureTest.java index 3b8670c49..d8fd419c6 100644 --- a/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/QueryBatcherFailureTest.java +++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/QueryBatcherFailureTest.java @@ -40,7 +40,7 @@ public void invalidQuery() { FailedRequestException ex = assertThrows(FailedRequestException.class, () -> client.newDataMovementManager().newQueryBatcher( - client.newQueryManager().newStructuredQueryBuilder().directory(0, "/invalid/path") + client.newQueryManager().newStructuredQueryBuilder().directory(false, "/invalid/path") ).onQueryFailure(failure -> failureMessages.add(failure.getMessage())) );