Skip to content

Commit 481243c

Browse files
committed
Revert "fix #270 - expose bitemporal system time"
This reverts commit 0c88311.
1 parent 7f3b862 commit 481243c

File tree

7 files changed

+72
-221
lines changed

7 files changed

+72
-221
lines changed

src/main/java/com/marklogic/client/bitemporal/TemporalDescriptor.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/main/java/com/marklogic/client/bitemporal/TemporalDocumentManager.java

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.marklogic.client.ForbiddenUserException;
2020
import com.marklogic.client.ResourceNotFoundException;
2121
import com.marklogic.client.Transaction;
22-
import com.marklogic.client.bitemporal.TemporalDescriptor;
2322
import com.marklogic.client.document.DocumentDescriptor;
2423
import com.marklogic.client.document.DocumentManager;
2524
import com.marklogic.client.document.DocumentUriTemplate;
@@ -43,10 +42,9 @@ public interface TemporalDocumentManager<R extends AbstractReadHandle, W extends
4342
* @param transaction an open transaction under which the document may have been created or deleted
4443
* @param temporalCollection the name of the temporal collection existing in the database into
4544
* which this document should be written
46-
* @return the TemporalDescriptor including the database uri that identifies the created document,
47-
* as well as the temporal system time when the document was created
45+
* @return the database uri that identifies the created document
4846
*/
49-
public TemporalDescriptor create(DocumentUriTemplate template,
47+
public DocumentDescriptor create(DocumentUriTemplate template,
5048
DocumentMetadataWriteHandle metadataHandle,
5149
W contentHandle,
5250
ServerTransform transform,
@@ -67,9 +65,8 @@ public TemporalDescriptor create(DocumentUriTemplate template,
6765
* @param transaction an open transaction under which the document may have been created or deleted
6866
* @param temporalCollection the name of the temporal collection existing in the database into
6967
* which this document should be written
70-
* @return the TemporalDescriptor with the temporal system time when the document was written
7168
*/
72-
public TemporalDescriptor write(DocumentDescriptor desc,
69+
public void write(DocumentDescriptor desc,
7370
DocumentMetadataWriteHandle metadataHandle,
7471
W contentHandle,
7572
ServerTransform transform,
@@ -90,9 +87,8 @@ public TemporalDescriptor write(DocumentDescriptor desc,
9087
* @param transaction an open transaction under which the document may have been created or deleted
9188
* @param temporalCollection the name of the temporal collection existing in the database into
9289
* which this document should be written
93-
* @return the TemporalDescriptor with the temporal system time when the document was written
9490
*/
95-
public TemporalDescriptor write(String docId,
91+
public void write(String docId,
9692
DocumentMetadataWriteHandle metadataHandle,
9793
W contentHandle,
9894
ServerTransform transform,
@@ -109,9 +105,8 @@ public TemporalDescriptor write(String docId,
109105
* @param transaction an open transaction under which the document may have been created or deleted
110106
* @param temporalCollection the name of the temporal collection existing in the database in
111107
* which this document should be marked as deleted
112-
* @return the TemporalDescriptor with the temporal system time when the document was deleted
113108
*/
114-
public TemporalDescriptor delete(DocumentDescriptor desc,
109+
public void delete(DocumentDescriptor desc,
115110
Transaction transaction,
116111
String temporalCollection)
117112
throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
@@ -125,9 +120,8 @@ public TemporalDescriptor delete(DocumentDescriptor desc,
125120
* @param transaction an open transaction under which the document may have been created or deleted
126121
* @param temporalCollection the name of the temporal collection existing in the database in
127122
* which this document should be marked as deleted
128-
* @return the TemporalDescriptor with the temporal system time when the document was deleted
129123
*/
130-
public TemporalDescriptor delete(String docId,
124+
public void delete(String docId,
131125
Transaction transaction,
132126
String temporalCollection)
133127
throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
@@ -145,10 +139,9 @@ public TemporalDescriptor delete(String docId,
145139
* @param temporalCollection the name of the temporal collection existing in the database into
146140
* which this document should be written
147141
* @param systemTime the application-specified system time with which this document will be marked
148-
* @return the database uri that identifies the created document,
149-
* as well as the temporal system time when the document was created
142+
* @return the database uri that identifies the created document
150143
*/
151-
public TemporalDescriptor create(DocumentUriTemplate template,
144+
public DocumentDescriptor create(DocumentUriTemplate template,
152145
DocumentMetadataWriteHandle metadataHandle,
153146
W contentHandle,
154147
ServerTransform transform,
@@ -169,9 +162,8 @@ public TemporalDescriptor create(DocumentUriTemplate template,
169162
* @param temporalCollection the name of the temporal collection existing in the database into
170163
* which this document should be written
171164
* @param systemTime the application-specified system time with which this document will be marked
172-
* @return the TemporalDescriptor with the temporal system time when the document was written
173165
*/
174-
public TemporalDescriptor write(DocumentDescriptor desc,
166+
public void write(DocumentDescriptor desc,
175167
DocumentMetadataWriteHandle metadataHandle,
176168
W contentHandle,
177169
ServerTransform transform,
@@ -192,9 +184,8 @@ public TemporalDescriptor write(DocumentDescriptor desc,
192184
* @param temporalCollection the name of the temporal collection existing in the database into
193185
* which this document should be written
194186
* @param systemTime the application-specified system time with which this document will be marked
195-
* @return the TemporalDescriptor with the temporal system time when the document was written
196187
*/
197-
public TemporalDescriptor write(String docId,
188+
public void write(String docId,
198189
DocumentMetadataWriteHandle metadataHandle,
199190
W contentHandle,
200191
ServerTransform transform,
@@ -211,9 +202,8 @@ public TemporalDescriptor write(String docId,
211202
* @param temporalCollection the name of the temporal collection existing in the database in
212203
* which this document should be marked as deleted
213204
* @param systemTime the application-specified system time with which this document will be marked
214-
* @return the TemporalDescriptor with the temporal system time when the document was deleted
215205
*/
216-
public TemporalDescriptor delete(DocumentDescriptor desc,
206+
public void delete(DocumentDescriptor desc,
217207
Transaction transaction,
218208
String temporalCollection,
219209
java.util.Calendar systemTime)
@@ -227,9 +217,8 @@ public TemporalDescriptor delete(DocumentDescriptor desc,
227217
* @param temporalCollection the name of the temporal collection existing in the database in
228218
* which this document should be marked as deleted
229219
* @param systemTime the application-specified system time with which this document will be marked
230-
* @return the TemporalDescriptor with the temporal system time when the document was deleted
231220
*/
232-
public TemporalDescriptor delete(String docId,
221+
public void delete(String docId,
233222
Transaction transaction,
234223
String temporalCollection,
235224
java.util.Calendar systemTime)

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,16 @@
1515
*/
1616
package com.marklogic.client.impl;
1717

18-
import java.util.Calendar;
19-
20-
import com.marklogic.client.bitemporal.TemporalDescriptor;
2118
import com.marklogic.client.document.DocumentDescriptor;
2219
import com.marklogic.client.io.Format;
2320

24-
public class DocumentDescriptorImpl implements DocumentDescriptor, TemporalDescriptor {
21+
public class DocumentDescriptorImpl implements DocumentDescriptor {
2522
private String uri;
2623
private Format format;
2724
private String mimetype;
2825
private long byteLength = UNKNOWN_LENGTH;
2926
private long version = UNKNOWN_VERSION;
3027
private boolean isInternal = false;
31-
private Calendar temporalSystemTime;
3228

3329
public DocumentDescriptorImpl(boolean isInternal) {
3430
super();
@@ -97,13 +93,4 @@ protected void setInternal(boolean isInternal) {
9793
protected boolean isInternal() {
9894
return isInternal;
9995
}
100-
101-
@Override
102-
public Calendar getTemporalSystemTime() {
103-
return temporalSystemTime;
104-
}
105-
106-
protected void setTemporalSystemTime(Calendar dateTime) {
107-
this.temporalSystemTime = dateTime;
108-
}
10996
}

0 commit comments

Comments
 (0)