Skip to content

Commit 991b8c9

Browse files
Ajit GeorgeAjit George
Ajit George
authored and
Ajit George
committed
Merge branch 'release-3.0.3' into 3.0-master
2 parents f76692e + bb2a50e commit 991b8c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+2097
-798
lines changed

‎.classpath

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" output="target/classes" path="src/main/java">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
10+
<attributes>
11+
<attribute name="optional" value="true"/>
12+
<attribute name="maven.pomderived" value="true"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
16+
<attributes>
17+
<attribute name="maven.pomderived" value="true"/>
18+
</attributes>
19+
</classpathentry>
20+
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
21+
<attributes>
22+
<attribute name="maven.pomderived" value="true"/>
23+
</attributes>
24+
</classpathentry>
25+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
26+
<attributes>
27+
<attribute name="maven.pomderived" value="true"/>
28+
</attributes>
29+
</classpathentry>
30+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
31+
<attributes>
32+
<attribute name="maven.pomderived" value="true"/>
33+
</attributes>
34+
</classpathentry>
35+
<classpathentry kind="output" path="target/classes"/>
36+
</classpath>

‎.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
target/
2-
.classpath
3-
.project
42
.gradle
5-
.settings/
63
*.class
74
test-complete/build/
85

‎.project

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>java-client-api-develop</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
21+
<nature>org.eclipse.jdt.core.javanature</nature>
22+
</natures>
23+
</projectDescription>

‎.settings/org.eclipse.core.resources.prefs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
eclipse.preferences.version=1
2+
encoding//src/main/java=UTF-8
3+
encoding//src/main/resources=UTF-8
4+
encoding//src/test/java=UTF-8
5+
encoding//src/test/resources=UTF-8
6+
encoding/<project>=UTF-8

‎.settings/org.eclipse.jdt.core.prefs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
3+
org.eclipse.jdt.core.compiler.compliance=1.6
4+
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
5+
org.eclipse.jdt.core.compiler.source=1.6

‎.settings/org.eclipse.m2e.core.prefs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.marklogic</groupId>
55
<artifactId>java-client-api</artifactId>
66
<packaging>jar</packaging>
7-
<version>3.0.2</version>
7+
<version>3.0.3</version>
88
<name>MarkLogic Java Client API</name>
99
<description>The official MarkLogic Java client API.</description>
1010
<url>https://github.com/marklogic/java-client-api</url>

‎src/main/java/com/marklogic/client/Transaction.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@ public interface Transaction {
3131
*/
3232
public String getTransactionId();
3333

34+
/**
35+
* Returns the host identifier for the transaction that binds this
36+
* transaction with the host e-node for the transaction. Ordinarily, you
37+
* will not need to do anything with the host id. Instead, you pass the
38+
* Transaction object to methods.
39+
* @return the host identifier
40+
*/
41+
public String getHostId();
42+
3443
/**
3544
* Reads the status for the transaction including whether the transaction
3645
* has timed out.

‎src/main/java/com/marklogic/client/document/DocumentManager.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -852,6 +852,25 @@ public void delete(String docId)
852852
*/
853853
public void delete(String docId, Transaction transaction)
854854
throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
855+
/**
856+
* Deletes the documents' metadata and content
857+
*
858+
* To call delete(), an application must authenticate as rest-writer or rest-admin.
859+
*
860+
* @param uris the identifiers for the documents to delete
861+
*/
862+
public void delete(String... uris)
863+
throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
864+
/**
865+
* Deletes the documents' metadata and content from an open database transaction
866+
*
867+
* To call delete(), an application must authenticate as rest-writer or rest-admin.
868+
*
869+
* @param transaction an open transaction
870+
* @param uris the identifiers for the documents to delete
871+
*/
872+
public void delete(Transaction transaction, String... uris)
873+
throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
855874
/**
856875
* Deletes the document metadata and content from the database
857876
*

‎src/main/java/com/marklogic/client/impl/DatabaseClientImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,17 @@ public void setHandleRegistry(HandleFactoryRegistry handleRegistry) {
6161

6262
@Override
6363
public Transaction openTransaction() throws ForbiddenUserException, FailedRequestException {
64-
return new TransactionImpl(services, services.openTransaction(null, TransactionImpl.DEFAULT_TIMELIMIT));
64+
return services.openTransaction(null, TransactionImpl.DEFAULT_TIMELIMIT);
6565
}
6666

6767
@Override
6868
public Transaction openTransaction(String name) throws ForbiddenUserException, FailedRequestException {
69-
return new TransactionImpl(services, services.openTransaction(name, TransactionImpl.DEFAULT_TIMELIMIT));
69+
return services.openTransaction(name, TransactionImpl.DEFAULT_TIMELIMIT);
7070
}
7171

7272
@Override
7373
public Transaction openTransaction(String name, int timeLimit) throws ForbiddenUserException, FailedRequestException{
74-
return new TransactionImpl(services, services.openTransaction(name, timeLimit));
74+
return services.openTransaction(name, timeLimit);
7575
}
7676

7777
@Override

0 commit comments

Comments
 (0)