Skip to content

Commit 2c18ef5

Browse files
authored
Merge pull request #59 from marklogic-community/feature/package-fix
Fixing package in RecordContent
2 parents bdea613 + eed3ffb commit 2c18ef5

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

src/main/java/com/marklogic/client/ext/document/DocumentWriteOperationBuilder.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
package com.marklogic.client.ext.document;
22

3-
import java.io.IOException;
4-
53
import com.marklogic.client.document.DocumentWriteOperation;
6-
import com.marklogic.client.id.strategy.IdStrategy;
74
import com.marklogic.client.ext.util.DefaultDocumentPermissionsParser;
85
import com.marklogic.client.impl.DocumentWriteOperationImpl;
96
import com.marklogic.client.io.DocumentMetadataHandle;
107
import com.marklogic.client.io.marker.AbstractWriteHandle;
11-
import com.marklogic.client.document.RecordContent;
128

139
public class DocumentWriteOperationBuilder {
1410

@@ -18,7 +14,7 @@ public class DocumentWriteOperationBuilder {
1814
private String collections;
1915
private String permissions;
2016

21-
public DocumentWriteOperation build(RecordContent record) throws IOException {
17+
public DocumentWriteOperation build(RecordContent record) {
2218

2319
AbstractWriteHandle content = record.getContent();
2420
DocumentMetadataHandle metadata = record.getAdditionalMetadata();

src/main/java/com/marklogic/client/ext/document/RecordContent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.marklogic.client.document;
1+
package com.marklogic.client.ext.document;
22

33
import com.marklogic.client.io.marker.AbstractWriteHandle;
44
import com.marklogic.client.io.DocumentMetadataHandle;

src/main/java/com/marklogic/kafka/connect/sink/DefaultSinkRecordConverter.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.marklogic.kafka.connect.sink;
22

3-
import java.io.IOException;
43
import java.nio.charset.StandardCharsets;
54
import java.util.Collections;
65
import java.util.Map;
@@ -15,7 +14,7 @@
1514
import com.marklogic.client.id.strategy.IdStrategyFactory;
1615
import com.marklogic.client.id.strategy.IdStrategy;
1716
import com.marklogic.client.ext.document.DocumentWriteOperationBuilder;
18-
import com.marklogic.client.document.RecordContent;
17+
import com.marklogic.client.ext.document.RecordContent;
1918
import com.marklogic.client.io.BytesHandle;
2019
import com.marklogic.client.io.DocumentMetadataHandle;
2120
import com.marklogic.client.io.Format;
@@ -37,7 +36,7 @@ public class DefaultSinkRecordConverter implements SinkRecordConverter {
3736
private Format format;
3837
private String mimeType;
3938
private Boolean addTopicToCollections = false;
40-
private IdStrategy idStrategy = null;
39+
private IdStrategy idStrategy;
4140

4241
public DefaultSinkRecordConverter(Map<String, Object> parsedConfig) {
4342

@@ -50,8 +49,7 @@ public DefaultSinkRecordConverter(Map<String, Object> parsedConfig) {
5049
.withCollections((String) parsedConfig.get(MarkLogicSinkConfig.DOCUMENT_COLLECTIONS))
5150
.withPermissions((String) parsedConfig.get(MarkLogicSinkConfig.DOCUMENT_PERMISSIONS))
5251
.withUriPrefix((String) parsedConfig.get(MarkLogicSinkConfig.DOCUMENT_URI_PREFIX))
53-
.withUriSuffix((String) parsedConfig.get(MarkLogicSinkConfig.DOCUMENT_URI_SUFFIX))
54-
;
52+
.withUriSuffix((String) parsedConfig.get(MarkLogicSinkConfig.DOCUMENT_URI_SUFFIX));
5553

5654
String val = (String) parsedConfig.get(MarkLogicSinkConfig.DOCUMENT_FORMAT);
5755
if (val != null && val.trim().length() > 0) {
@@ -61,12 +59,12 @@ public DefaultSinkRecordConverter(Map<String, Object> parsedConfig) {
6159
if (val != null && val.trim().length() > 0) {
6260
mimeType = val;
6361
}
64-
//Get the correct ID or URI generation strategy based on the configuration
62+
6563
idStrategy = IdStrategyFactory.getIdStrategy(parsedConfig);
6664
}
6765

6866
@Override
69-
public DocumentWriteOperation convert(SinkRecord sinkRecord) throws IOException{
67+
public DocumentWriteOperation convert(SinkRecord sinkRecord) {
7068
RecordContent recordContent = new RecordContent();
7169
AbstractWriteHandle content = toContent(sinkRecord);
7270
recordContent.setContent(content);

0 commit comments

Comments
 (0)