Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 3 additions & 24 deletions src/main/java/com/kintone/client/model/record/CalcFieldValue.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.kintone.client.model.record;

import java.math.BigDecimal;
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.ToString;
Expand All @@ -15,16 +14,8 @@ public class CalcFieldValue implements FieldValue {
/** The value of the Calculated field. */
private final String value;

public CalcFieldValue(String rawValue) {
this.value = rawValue;
}

public CalcFieldValue(BigDecimal value) {
if (value != null) {
this.value = value.toPlainString();
} else {
this.value = null;
}
public CalcFieldValue(String value) {
this.value = value;
}

/** {@inheritDoc} */
Expand All @@ -38,19 +29,7 @@ public FieldType getType() {
*
* @return the value of field.
*/
public BigDecimal getValue() {
if (value == null || value.isEmpty()) {
return null;
}
return new BigDecimal(value);
}

/**
* Returns the raw value of field.
*
* @return the raw value of field.
*/
public String getRawValue() {
public String getValue() {
return value;
}
}
13 changes: 1 addition & 12 deletions src/main/java/com/kintone/client/model/record/Record.java
Original file line number Diff line number Diff line change
Expand Up @@ -343,22 +343,11 @@ public List<String> getCheckBoxFieldValue(String fieldCode) {
* @param fieldCode the field code
* @return the value of the field
*/
public BigDecimal getCalcFieldValue(String fieldCode) {
public String getCalcFieldValue(String fieldCode) {
CalcFieldValue value = (CalcFieldValue) fields.get(fieldCode);
return value == null ? null : value.getValue();
}

/**
* Returns the raw value of a Calculated field.
*
* @param fieldCode the field code
* @return the raw value of the field
*/
public String getCalcFieldRawValue(String fieldCode) {
CalcFieldValue value = (CalcFieldValue) fields.get(fieldCode);
return value == null ? null : value.getRawValue();
}

/**
* Returns the value of a Time field.
*
Expand Down
13 changes: 1 addition & 12 deletions src/main/java/com/kintone/client/model/record/TableRow.java
Original file line number Diff line number Diff line change
Expand Up @@ -231,22 +231,11 @@ public List<String> getCheckBoxFieldValue(String fieldCode) {
* @param fieldCode the field code
* @return the value of the field
*/
public BigDecimal getCalcFieldValue(String fieldCode) {
public String getCalcFieldValue(String fieldCode) {
CalcFieldValue value = (CalcFieldValue) fields.get(fieldCode);
return value == null ? null : value.getValue();
}

/**
* Returns the raw value of a Calculated field.
*
* @param fieldCode the field code
* @return the raw value of the field
*/
public String getCalcFieldRawValue(String fieldCode) {
CalcFieldValue value = (CalcFieldValue) fields.get(fieldCode);
return value == null ? null : value.getRawValue();
}

/**
* Returns the value of a Time field.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public void deserialize_fields() throws IOException {
ZonedDateTime dateTime = ZonedDateTime.of(2020, 1, 2, 3, 4, 0, 0, ZoneOffset.UTC);

assertThat(record.getFieldCodes(true)).hasSize(21);
assertThat(record.getFieldValue("calc")).isEqualTo(new CalcFieldValue(new BigDecimal(100)));
assertThat(record.getFieldValue("calc")).isEqualTo(new CalcFieldValue("100"));
assertThat(record.getFieldValue("calc_date")).isEqualTo(new CalcFieldValue("2022-01-01"));
assertThat(record.getFieldValue("calc_datetime"))
.isEqualTo(new CalcFieldValue("2022-01-01T00:00:00Z"));
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/kintone/client/RecordSerializerTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ public void serialize_emptyRecord() throws IOException {
public void serialize_CALC() throws IOException {
Record record =
new Record()
.putField("calc", new CalcFieldValue(new BigDecimal(100)))
.putField("calc", new CalcFieldValue("100"))
.putField("calc_date", new CalcFieldValue("2022-01-01"))
.putField("calc_null", new CalcFieldValue((BigDecimal) null));
.putField("calc_null", new CalcFieldValue(null));
String json = mapper.writeValueAsString(record);
assertThat(json).isEqualTo("{}");
}
Expand Down