Skip to content

provide missing configuration in DatabaseClientFactory.Bean #1020

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
merged 4 commits into from
Oct 22, 2018
Merged

provide missing configuration in DatabaseClientFactory.Bean #1020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2e9006
Issue 1018.
anu3990 Oct 17, 2018
44383e4
provide missing configuration in DatabaseClientFactory.Bean #1020 -
anu3990 Oct 19, 2018
12a681f
unit test for SecurityContext in DatabaseClientFactory.Bean.
anu3990 Oct 22, 2018
0ea2563
Added clientFactoryBean.setSecurityContext(clientFactoryContext) call in
anu3990 Oct 22, 2018
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
7 changes: 3 additions & 4 deletions marklogic-client-api/src/main/java/com/marklogic/client/DatabaseClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1229,6 +1229,7 @@ static public class Bean implements Serializable {
public Bean() {
super();
}


/**
* Returns the host for clients created with a
Expand Down Expand Up @@ -1442,7 +1443,6 @@ public void setConnectionType(DatabaseClient.ConnectionType connectionType) {
this.connectionType = connectionType;
}


/**
* Returns the registry for associating
* IO representation classes with handle factories.
Expand Down Expand Up @@ -1475,10 +1475,9 @@ public void registerDefaultHandles() {
* The client accesses the database by means of a REST server.
* @return a new client for making database requests
*/
public DatabaseClient newClient() {
public DatabaseClient newClient() {
DatabaseClientImpl client = (DatabaseClientImpl) DatabaseClientFactory.newClient(
host, port, database,
makeSecurityContext(user, password, authentication, context, verifier),
host, port, database, (securityContext!=null? securityContext:makeSecurityContext(user, password, authentication, context, verifier)),
connectionType);
client.setHandleRegistry(getHandleRegistry().copy());
return client;
Expand Down
12 changes: 11 additions & 1 deletion marklogic-client-api/src/test/java/com/marklogic/client/test/HandleAsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ public void testBuiltinReadWrite()

@Test
public void testSearch() throws JAXBException {
DatabaseClientFactory.Bean clientFactoryBean = makeClientFactory();
DatabaseClientFactory.Bean clientFactoryBean = makeClientBeanFactory();

clientFactoryBean.getHandleRegistry().register(
JAXBHandle.newFactory(Product.class)
Expand Down Expand Up @@ -389,6 +389,16 @@ private DatabaseClientFactory.Bean makeClientFactory() {
clientFactoryBean.setAuthentication(Authentication.DIGEST);
return clientFactoryBean;
}

private DatabaseClientFactory.Bean makeClientBeanFactory() {
DatabaseClientFactory.Bean clientFactoryBean = new DatabaseClientFactory.Bean();
DatabaseClientFactory.DigestAuthContext clientFactoryContext = new DatabaseClientFactory.DigestAuthContext(Common.USER, Common.PASS);
clientFactoryBean.setHost(Common.HOST);
clientFactoryBean.setPort(Common.PORT);
clientFactoryBean.setSecurityContext(clientFactoryContext);
return clientFactoryBean;
}


static public class BufferHandle
extends BaseHandle<String, String>
Expand Down