Skip to content

Commit 3cb4b53

Browse files
committed
fix #761 - don't send 'database' param for requests to /v1/config/* endpoints
(cherry picked from commit d0df35d)
1 parent 4cc3fc8 commit 3cb4b53

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

src/main/java/com/marklogic/client/impl/OkHttpServices.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3982,23 +3982,13 @@ private Request.Builder setupRequest(String path, RequestParameters params) {
39823982
}
39833983
}
39843984
}
3985-
if ( database != null ) {
3985+
if ( database != null && ! path.startsWith("config/") ) {
39863986
uri.addQueryParameter("database", database);
39873987
}
39883988
Request.Builder request = new Request.Builder()
39893989
.url(uri.build());
39903990
return request;
39913991
}
3992-
/*
3993-
private Request.Builder sendRequestBuilder(String path,
3994-
RequestParameters params) {
3995-
if ( params == null ) params = new RequestParameters();
3996-
if ( database != null ) {
3997-
addEncodedParam(params, "database", database);
3998-
}
3999-
return getConnection().path(path).queryParams(params);
4000-
}
4001-
*/
40023992

40033993
private Request.Builder setupRequest(Request.Builder requestBldr,
40043994
Object inputMimetype, Object outputMimetype) {

src/main/java/com/marklogic/client/impl/ResourceExtensionsImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public <T extends StructureReadHandle> T listServices(T listHandle, boolean refr
9292
Format listFormat = listBase.getFormat();
9393
if (!(Format.JSON == listFormat || Format.XML == listFormat))
9494
throw new IllegalArgumentException(
95-
"list handle for unsupported format: "+listFormat.getClass().getName());
95+
"list handle for unsupported format: "+listFormat);
9696

9797
RequestParameters extraParams = null;
9898
if (!refresh) {

src/test/java/com/marklogic/client/test/ResourceServicesTest.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
import org.junit.Test;
2828
import org.w3c.dom.Document;
2929

30+
import com.marklogic.client.DatabaseClient;
31+
import com.marklogic.client.DatabaseClientFactory;
32+
import com.marklogic.client.DatabaseClientFactory.Authentication;
3033
import com.marklogic.client.io.Format;
3134
import com.marklogic.client.util.RequestParameters;
3235
import com.marklogic.client.admin.ResourceExtensionsManager;
@@ -165,6 +168,19 @@ public void test_172() {
165168
Common.connectAdmin();
166169
}
167170

171+
@Test
172+
/** Avoid regression on https://github.com/marklogic/java-client-api/issues/761 */
173+
public void test_issue_761() {
174+
DatabaseClient client = DatabaseClientFactory.newClient(Common.HOST, Common.PORT, "Documents",
175+
Common.USERNAME, Common.PASSWORD, Authentication.DIGEST);
176+
try {
177+
client.newServerConfigManager().newResourceExtensionsManager()
178+
.listServices(new DOMHandle());
179+
} finally {
180+
client.release();
181+
}
182+
}
183+
168184
static class SimpleResourceManager extends ResourceManager {
169185
public SimpleResourceManager() {
170186
super();

0 commit comments

Comments
 (0)