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
3 changes: 3 additions & 0 deletions MIGRATION-GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ Use the new versioned API under `numbers().v1()` to get access to [NumbersServic

### [`SMS`](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/package-summary.html)

#### Deprecated fields
- Deprecated `MediaMessageBodyDetails.status` field of type `String` is replaced by `MediaMessageBodyDetails.status` of [StatusEnum](https://www.javadoc.io/doc/com.sinch.sdk/sinch-sdk-java/2.0.0/com/sinch/sdk/domains/sms/models/v1/inbounds/MediaMessageBodyDetails.StatusEnum.html) type

#### Replacement models

##### Batches
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,6 @@ static Builder builder(ListBatchesQueryParameters parameters) {
/** Dedicated Builder */
interface Builder {

/**
* @param from see #setFrom()
* @return Current builder
* @see #setFrom
* @deprecated use {@link #setFrom} instead.
*/
@Deprecated
Builder setFrom(String from);

/**
* see getter
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,6 @@ protected Builder(ListBatchesQueryParameters _parameters) {
this.clientReference = parameters.getClientReference();
}

public Builder setFrom(String from) {
setFrom(java.util.Collections.singletonList(from));
return this;
}

public Builder setPage(Integer page) {
this.page = OptionalValue.of(page);
return this;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,6 @@
@JsonDeserialize(builder = MediaMessageBodyDetailsImpl.Builder.class)
public interface MediaMessageBodyDetails {

/**
* @return Current status
* @see #getStatusEnum()
* @deprecated use {@link #getStatusEnum()} instead.
*/
@Deprecated
String getStatus();

/**
* The result code. Possible values: 0 (success), 1 (content upload error), 2 (cloud bucket
* error), 3 (bucket key error).
Expand Down Expand Up @@ -80,9 +72,9 @@ public static String valueOf(StatusEnum e) {
*
* <p>Field is required
*
* @return StatusEnum
* @return status
*/
StatusEnum getStatusEnum();
StatusEnum getStatus();

/**
* URL to be used to download attachment.
Expand All @@ -103,15 +95,6 @@ static Builder builder() {
/** Dedicated Builder */
interface Builder {

/**
* @param status see {@link #setStatusEnum(StatusEnum)}
* @return Current builder
* @see #setStatusEnum(StatusEnum)
* @deprecated use {@link #setStatusEnum(StatusEnum)} instead.
*/
@Deprecated
Builder setStatus(String status);

/**
* see getter
*
Expand All @@ -133,11 +116,11 @@ interface Builder {
/**
* see getter
*
* @param StatusEnum see getter
* @param status see getter
* @return Current builder
* @see #getStatusEnum
* @see #getStatus
*/
Builder setStatusEnum(StatusEnum StatusEnum);
Builder setStatus(StatusEnum status);

/**
* see getter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
import com.sinch.sdk.core.models.OptionalValue;
import com.sinch.sdk.core.utils.EnumDynamic;
import java.util.Objects;

@JsonPropertyOrder({
Expand All @@ -31,7 +30,7 @@ public class MediaMessageBodyDetailsImpl implements MediaMessageBodyDetails {

public static final String JSON_PROPERTY_STATUS = "status";

private OptionalValue<StatusEnum> StatusEnum;
private OptionalValue<StatusEnum> status;

public static final String JSON_PROPERTY_URL = "url";

Expand All @@ -42,19 +41,14 @@ public MediaMessageBodyDetailsImpl() {}
protected MediaMessageBodyDetailsImpl(
OptionalValue<Integer> code,
OptionalValue<String> contentType,
OptionalValue<StatusEnum> StatusEnum,
OptionalValue<StatusEnum> status,
OptionalValue<String> url) {
this.code = code;
this.contentType = contentType;
this.StatusEnum = StatusEnum;
this.status = status;
this.url = url;
}

@JsonIgnore
public String getStatus() {
return statusEnum().map(EnumDynamic::value).orElse(null);
}

@JsonIgnore
public Integer getCode() {
return code.orElse(null);
Expand All @@ -78,14 +72,14 @@ public OptionalValue<String> contentType() {
}

@JsonIgnore
public StatusEnum getStatusEnum() {
return StatusEnum.orElse(null);
public StatusEnum getStatus() {
return status.orElse(null);
}

@JsonProperty(JSON_PROPERTY_STATUS)
@JsonInclude(value = JsonInclude.Include.ALWAYS)
public OptionalValue<StatusEnum> statusEnum() {
return StatusEnum;
public OptionalValue<StatusEnum> status() {
return status;
}

@JsonIgnore
Expand All @@ -111,13 +105,13 @@ public boolean equals(Object o) {
MediaMessageBodyDetailsImpl mmsMedia = (MediaMessageBodyDetailsImpl) o;
return Objects.equals(this.code, mmsMedia.code)
&& Objects.equals(this.contentType, mmsMedia.contentType)
&& Objects.equals(this.StatusEnum, mmsMedia.StatusEnum)
&& Objects.equals(this.status, mmsMedia.status)
&& Objects.equals(this.url, mmsMedia.url);
}

@Override
public int hashCode() {
return Objects.hash(code, contentType, StatusEnum, url);
return Objects.hash(code, contentType, status, url);
}

@Override
Expand All @@ -126,7 +120,7 @@ public String toString() {
sb.append("class MediaMessageBodyDetailsImpl {\n");
sb.append(" code: ").append(toIndentedString(code)).append("\n");
sb.append(" contentType: ").append(toIndentedString(contentType)).append("\n");
sb.append(" StatusEnum: ").append(toIndentedString(StatusEnum)).append("\n");
sb.append(" status: ").append(toIndentedString(status)).append("\n");
sb.append(" url: ").append(toIndentedString(url)).append("\n");
sb.append("}");
return sb.toString();
Expand All @@ -146,14 +140,9 @@ private String toIndentedString(Object o) {
static class Builder implements MediaMessageBodyDetails.Builder {
OptionalValue<Integer> code = OptionalValue.empty();
OptionalValue<String> contentType = OptionalValue.empty();
OptionalValue<StatusEnum> StatusEnum = OptionalValue.empty();
OptionalValue<StatusEnum> status = OptionalValue.empty();
OptionalValue<String> url = OptionalValue.empty();

public Builder setStatus(String status) {
setStatusEnum(MediaMessageBodyDetails.StatusEnum.from(status));
return this;
}

@JsonProperty(value = JSON_PROPERTY_CODE, required = true)
public Builder setCode(Integer code) {
this.code = OptionalValue.of(code);
Expand All @@ -167,8 +156,8 @@ public Builder setContentType(String contentType) {
}

@JsonProperty(value = JSON_PROPERTY_STATUS, required = true)
public Builder setStatusEnum(StatusEnum StatusEnum) {
this.StatusEnum = OptionalValue.of(StatusEnum);
public Builder setStatus(StatusEnum status) {
this.status = OptionalValue.of(status);
return this;
}

Expand All @@ -179,7 +168,7 @@ public Builder setUrl(String url) {
}

public MediaMessageBodyDetails build() {
return new MediaMessageBodyDetailsImpl(code, contentType, StatusEnum, url);
return new MediaMessageBodyDetailsImpl(code, contentType, status, url);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.adelean.inject.resources.junit.jupiter.TestWithResources;
import com.sinch.sdk.BaseTest;
import com.sinch.sdk.core.TestHelpers;
import com.sinch.sdk.domains.sms.models.v1.inbounds.MediaMessageBodyDetails.StatusEnum;
import java.time.Instant;
import java.util.Arrays;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -63,7 +64,7 @@ public class InboundMessageDtoTest extends BaseTest {
MediaMessageBodyDetails.builder()
.setCode(1234)
.setContentType("content/type")
.setStatus("a status")
.setStatus(StatusEnum.from("a status"))
.setUrl("https://foo.url")
.build()))
.build())
Expand Down
Loading