From c29e2a2564cb5231a0368586a59991ebf756c14b Mon Sep 17 00:00:00 2001 From: Falguni Vadodaria Date: Tue, 13 Oct 2020 11:52:23 -0700 Subject: [PATCH] Solving test failure --- .../java/com/twilio/type/RecordingRule.java | 19 ++---- .../com/twilio/type/RecordingRulesUpdate.java | 15 ++--- src/main/java/com/twilio/type/Rule.java | 6 +- .../java/com/twilio/type/SubscribeRule.java | 64 ++++++++----------- .../com/twilio/type/RecordingRuleTest.java | 4 +- 5 files changed, 43 insertions(+), 65 deletions(-) diff --git a/src/main/java/com/twilio/type/RecordingRule.java b/src/main/java/com/twilio/type/RecordingRule.java index 8d00150c3f..986398da08 100644 --- a/src/main/java/com/twilio/type/RecordingRule.java +++ b/src/main/java/com/twilio/type/RecordingRule.java @@ -2,18 +2,20 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.base.MoreObjects; +import lombok.ToString; import java.util.Objects; /** * Recording Rule + * *

- * For more information see: - * Specifying Recording Rules + * For more information see: + * Specifying Recording Rules *

*/ @JsonIgnoreProperties(ignoreUnknown = true) +@ToString public class RecordingRule implements Rule { private static final RecordingRule recordAll = builder().withType(Type.INCLUDE).withAll().build(); @@ -190,15 +192,4 @@ public boolean equals(Object o) { public int hashCode() { return Objects.hash(getType(), getAll(), getPublisher(), getTrack(), getKind()); } - - @Override - public String toString() { - return MoreObjects.toStringHelper(this) - .add("type", this.type) - .add("all", this.all) - .add("publisher", this.publisher) - .add("track", this.track) - .add("kind", this.kind) - .toString(); - } } diff --git a/src/main/java/com/twilio/type/RecordingRulesUpdate.java b/src/main/java/com/twilio/type/RecordingRulesUpdate.java index a1cf7d22b6..11c0da14d4 100644 --- a/src/main/java/com/twilio/type/RecordingRulesUpdate.java +++ b/src/main/java/com/twilio/type/RecordingRulesUpdate.java @@ -2,19 +2,21 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.base.MoreObjects; +import lombok.ToString; import java.util.List; import java.util.Objects; /** * Recording Rule Update - Used to update the list of Recording Rules + * *

- * For more information see: - * Specifying Recording Rules + * For more information see: + * Specifying Recording Rules *

*/ @JsonIgnoreProperties(ignoreUnknown = true) +@ToString public class RecordingRulesUpdate { @JsonProperty("rules") @@ -40,11 +42,4 @@ public boolean equals(final Object o) { public int hashCode() { return Objects.hash(getRules()); } - - @Override - public String toString() { - return MoreObjects.toStringHelper(this) - .add("rules", this.rules) - .toString(); - } } diff --git a/src/main/java/com/twilio/type/Rule.java b/src/main/java/com/twilio/type/Rule.java index 567917d131..ea37f70786 100644 --- a/src/main/java/com/twilio/type/Rule.java +++ b/src/main/java/com/twilio/type/Rule.java @@ -7,9 +7,13 @@ public interface Rule { Type getType(); + Boolean getAll(); + String getPublisher(); + String getTrack(); + Kind getKind(); enum Type { @@ -67,7 +71,7 @@ public String toString() { enum Priority { LOW("low"), - MEDIUM("medium"), + STANDARD("standard"), HIGH("high"); private final String value; diff --git a/src/main/java/com/twilio/type/SubscribeRule.java b/src/main/java/com/twilio/type/SubscribeRule.java index 83164e1625..ee2b505596 100644 --- a/src/main/java/com/twilio/type/SubscribeRule.java +++ b/src/main/java/com/twilio/type/SubscribeRule.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.base.MoreObjects; +import lombok.ToString; import java.util.Objects; @@ -10,11 +10,12 @@ * Subscribe Rule * *

- * For more information see: - * Specifying Subscribe Rules + * For more information see: + * Specifying Subscribe Rules *

*/ @JsonIgnoreProperties(ignoreUnknown = true) +@ToString public class SubscribeRule implements Rule { private static final SubscribeRule subscribeAll = builder().withType(Type.INCLUDE).withAll().build(); @@ -39,11 +40,11 @@ public class SubscribeRule implements Rule { private final Priority priority; public SubscribeRule(@JsonProperty("type") final Type type, - @JsonProperty("all") final Boolean all, - @JsonProperty("publisher") final String publisher, - @JsonProperty("track") final String track, - @JsonProperty("kind") final Kind kind, - @JsonProperty("priority") final Priority priority) { + @JsonProperty("all") final Boolean all, + @JsonProperty("publisher") final String publisher, + @JsonProperty("track") final String track, + @JsonProperty("kind") final Kind kind, + @JsonProperty("priority") final Priority priority) { this.type = type; this.all = all; this.publisher = publisher; @@ -102,44 +103,35 @@ public static SubscribeRule none() { return subscribeNone; } - interface BuilderStart { + public interface BuilderStart { BuilderMiddle withType(final Type type); } - interface BuilderMiddle { + public interface BuilderMiddle { BuilderMiddleBuild withPublisher(final String publisher); - BuilderMiddleBuild withKind(final Kind kind); - BuilderMiddleBuild withTrack(final String track); - BuilderMiddleBuild withPriority(final Priority priority); - BuilderBuild withAll(); } - interface BuilderMiddleBuild { + public interface BuilderMiddleBuild { BuilderMiddleBuild withPublisher(final String publisher); - BuilderMiddleBuild withKind(final Kind kind); - BuilderMiddleBuild withTrack(final String track); - BuilderMiddleBuild withPriority(final Priority priority); - SubscribeRule build(); } - interface BuilderBuild { + public interface BuilderBuild { SubscribeRule build(); } - public static class Builder implements - BuilderStart, - BuilderMiddle, - BuilderMiddleBuild, - BuilderBuild { + BuilderStart, + BuilderMiddle, + BuilderMiddleBuild, + BuilderBuild { private Type type; private Boolean all; private String publisher; @@ -159,22 +151,18 @@ public BuilderBuild withAll() { this.all = true; return this; } - public BuilderMiddleBuild withPublisher(final String publisher) { this.publisher = publisher; return this; } - public BuilderMiddleBuild withKind(final Kind kind) { this.kind = kind; return this; } - public BuilderMiddleBuild withTrack(final String track) { this.track = track; return this; } - public BuilderMiddleBuild withPriority(final Priority priority) { this.priority = priority; return this; @@ -183,10 +171,10 @@ public BuilderMiddleBuild withPriority(final Priority priority) { private boolean hasOneFilter() { // at least one filter must be set return this.kind != null - || this.all != null - || this.track != null - || this.publisher != null - || this.priority != null; + || this.all != null + || this.track != null + || this.publisher != null + || this.priority != null; } private boolean hasType() { @@ -212,11 +200,11 @@ public boolean equals(Object o) { if (!(o instanceof SubscribeRule)) return false; SubscribeRule that = (SubscribeRule) o; return getType() == that.getType() && - Objects.equals(getAll(), that.getAll()) && - Objects.equals(getPublisher(), that.getPublisher()) && - Objects.equals(getTrack(), that.getTrack()) && - getKind() == that.getKind() && - getPriority() == that.getPriority(); + Objects.equals(getAll(), that.getAll()) && + Objects.equals(getPublisher(), that.getPublisher()) && + Objects.equals(getTrack(), that.getTrack()) && + getKind() == that.getKind() && + getPriority() == that.getPriority(); } @Override diff --git a/src/test/java/com/twilio/type/RecordingRuleTest.java b/src/test/java/com/twilio/type/RecordingRuleTest.java index 231793cfff..51865aa6ef 100644 --- a/src/test/java/com/twilio/type/RecordingRuleTest.java +++ b/src/test/java/com/twilio/type/RecordingRuleTest.java @@ -1,10 +1,10 @@ package com.twilio.type; -import com.google.common.collect.Lists; import org.junit.Assert; import org.junit.Test; import java.io.IOException; +import java.util.Arrays; import static org.junit.Assert.fail; @@ -73,7 +73,7 @@ public void testUpdate() throws IOException { .withPublisher("presenter") .build(); - final RecordingRulesUpdate update = new RecordingRulesUpdate(Lists.newArrayList( + final RecordingRulesUpdate update = new RecordingRulesUpdate(Arrays.asList( allAudio, presenterVideo ));