diff --git a/CHANGELOG.md b/CHANGELOG.md index 4251e59..c46b1c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Add exists option to BucketSettings. [PR-42](https://github.com/reductstore/reduct-java/issues/42) - Bucket.writeRecord receives entry name and bucket. [PR-43](https://github.com/reductstore/reduct-java/issues/43) - Add getBucket method to ReductClient. [PR-44](https://github.com/reductstore/reduct-java/issues/44) +- Change field name 'type' to 'contentType' in Record class. [PR-46](https://github.com/reductstore/reduct-java/issues/46) ### Infrastructure: - Added GitHub Actions for CI/CD [PR-35](https://github.com/reductstore/reduct-java/pull/35) diff --git a/src/main/java/store/reduct/model/bucket/Bucket.java b/src/main/java/store/reduct/model/bucket/Bucket.java index c9c9f15..9b75678 100644 --- a/src/main/java/store/reduct/model/bucket/Bucket.java +++ b/src/main/java/store/reduct/model/bucket/Bucket.java @@ -165,7 +165,8 @@ public void writeRecord(String entryName, @NonNull Record record) throws ReductE URI uri = URI.create(reductClient.getServerProperties().url() + String.format(RecordURL.WRITE_ENTRY.getUrl(), name, entryName) + new Queries(TS, timestamp)); - HttpRequest.Builder builder = HttpRequest.newBuilder().uri(uri).header(getContentTypeHeader(), record.getType()) + HttpRequest.Builder builder = HttpRequest.newBuilder().uri(uri) + .header(getContentTypeHeader(), record.getContentType()) .POST(HttpRequest.BodyPublishers.ofByteArray(record.getBody())); reductClient.sendAndGetOnlySuccess(builder, HttpResponse.BodyHandlers.ofString()); @@ -195,7 +196,7 @@ public void writeRecords(String entryName, Iterator records) byte[] byteBodyArray = record.getBody(); body = ArrayUtils.addAll(body, byteBodyArray); builder.header(getXReductTimeWithNumberHeader(record.getTimestamp()), - byteBodyArray.length + "," + record.getType()); + byteBodyArray.length + "," + record.getContentType()); } if (Objects.nonNull(body)) { builder.POST(HttpRequest.BodyPublishers.ofByteArray(body)); @@ -225,7 +226,7 @@ public Record readRecord(String entryName, Long timestamp) throws ReductExceptio return Record.builder().body(httpResponse.body()) .timestamp(httpResponse.headers().firstValue(getXReductTimeHeader()).map(Long::parseLong) .orElseThrow(() -> new ReductException(X_REDUCT_TIME_IS_NOT_SUCH_LONG_FORMAT))) - .type(httpResponse.headers().firstValue(getContentTypeHeader()) + .contentType(httpResponse.headers().firstValue(getContentTypeHeader()) .orElseThrow(() -> new ReductException(CONTENT_TYPE_IS_NOT_SET_IN_THE_RECORD))) .length(httpResponse.headers().firstValue(getContentLengthHeader()).map(Integer::parseInt) .orElseThrow(() -> new ReductException(CONTENT_LENGTH_IS_NOT_SET_IN_THE_RECORD))) @@ -255,7 +256,7 @@ public Record getMetaInfo(String entryName, Long timestamp) throws ReductExcepti return Record.builder() .timestamp(httpResponse.headers().firstValue(getXReductTimeHeader()).map(Long::parseLong) .orElseThrow(() -> new ReductException(X_REDUCT_TIME_IS_NOT_SUCH_LONG_FORMAT))) - .type(httpResponse.headers().firstValue(getContentTypeHeader()) + .contentType(httpResponse.headers().firstValue(getContentTypeHeader()) .orElseThrow(() -> new ReductException(CONTENT_TYPE_IS_NOT_SET_IN_THE_RECORD))) .length(httpResponse.headers().firstValue(getContentLengthHeader()).map(Integer::parseInt) .orElseThrow(() -> new ReductException(CONTENT_LENGTH_IS_NOT_SET_IN_THE_RECORD))) @@ -389,7 +390,7 @@ public Record next() { byteBuffer.position(instance.getOffset()); byteBuffer.get(nextBody, 0, instance.getLength()); - return Record.builder().body(nextBody).timestamp(instance.getTs()).type(instance.getType()) + return Record.builder().body(nextBody).timestamp(instance.getTs()).contentType(instance.getType()) .length(instance.getLength()).build(); } } diff --git a/src/main/java/store/reduct/model/record/Record.java b/src/main/java/store/reduct/model/record/Record.java index f1fd4f7..8196485 100644 --- a/src/main/java/store/reduct/model/record/Record.java +++ b/src/main/java/store/reduct/model/record/Record.java @@ -12,6 +12,6 @@ public class Record { private Long timestamp; private byte[] body; - private String type; + private String contentType; private Integer length; } diff --git a/src/test/java/store/reduct/model/bucket/BucketTest.java b/src/test/java/store/reduct/model/bucket/BucketTest.java index 694b784..f3c2a4a 100644 --- a/src/test/java/store/reduct/model/bucket/BucketTest.java +++ b/src/test/java/store/reduct/model/bucket/BucketTest.java @@ -43,7 +43,7 @@ void test1() { Bucket bucket = new Bucket(expectedBucketName, client); - Record record = Record.builder().body(expectedBody).type(expectedType).timestamp(timestamp).build(); + Record record = Record.builder().body(expectedBody).contentType(expectedType).timestamp(timestamp).build(); Mockito.when(client.getServerProperties()).thenReturn(serverProperties);