diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerComponents.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerComponents.java index 5d2298130..ed4de2e2a 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerComponents.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerComponents.java @@ -1,5 +1,6 @@ package com.mapbox.api.directions.v5.models; +import android.support.annotation.NonNull; import android.support.annotation.Nullable; import com.google.auto.value.AutoValue; @@ -41,6 +42,7 @@ public static Builder builder() { * @return a single snippet of the full text instruction * @since 3.0.0 */ + @NonNull public abstract String text(); /** @@ -61,6 +63,7 @@ public static Builder builder() { * @return String type from above list * @since 3.0.0 */ + @NonNull public abstract String type(); /** @@ -205,7 +208,7 @@ public abstract static class Builder { * @return this builder for chaining options together * @since 3.0.0 */ - public abstract Builder text(String text); + public abstract Builder text(@NonNull String text); /** * String giving you more context about the component which may help in visual markup/display @@ -227,7 +230,7 @@ public abstract static class Builder { * @return this builder for chaining options together * @since 3.0.0 */ - public abstract Builder type(String type); + public abstract Builder type(@NonNull String type); /** diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerInstructions.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerInstructions.java index 81c4addd2..07ad50b5d 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerInstructions.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerInstructions.java @@ -1,5 +1,6 @@ package com.mapbox.api.directions.v5.models; +import android.support.annotation.NonNull; import android.support.annotation.Nullable; import com.google.auto.value.AutoValue; import com.google.gson.Gson; @@ -45,7 +46,7 @@ public static Builder builder() { * information to the user * @since 3.0.0 */ - @Nullable + @NonNull public abstract BannerText primary(); /** @@ -132,7 +133,7 @@ public abstract static class Builder { * @return this builder for chaining options together * @since 3.0.0 */ - public abstract Builder primary(@Nullable BannerText primary); + public abstract Builder primary(@NonNull BannerText primary); /** * Ancillary visual information about the {@link LegStep}. diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerText.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerText.java index 47db656a5..44ae0567f 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerText.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/BannerText.java @@ -1,5 +1,6 @@ package com.mapbox.api.directions.v5.models; +import android.support.annotation.NonNull; import android.support.annotation.Nullable; import com.google.auto.value.AutoValue; @@ -39,7 +40,7 @@ public static Builder builder() { * @return plain text with all the {@link BannerComponents} text items combined * @since 3.0.0 */ - @Nullable + @NonNull public abstract String text(); /** @@ -147,7 +148,7 @@ public abstract static class Builder { * @since 3.0.0 */ @Nullable - public abstract Builder text(String text); + public abstract Builder text(@NonNull String text); /** * A part or element of the {@link BannerInstructions}. diff --git a/services-directions/src/test/java/com/mapbox/api/directions/v5/models/BannerInstructionsTest.java b/services-directions/src/test/java/com/mapbox/api/directions/v5/models/BannerInstructionsTest.java index a1e2ac532..f257c1663 100644 --- a/services-directions/src/test/java/com/mapbox/api/directions/v5/models/BannerInstructionsTest.java +++ b/services-directions/src/test/java/com/mapbox/api/directions/v5/models/BannerInstructionsTest.java @@ -29,8 +29,8 @@ public void sanity() throws Exception { public void testSerializable() throws Exception { BannerInstructions bannerInstructions = BannerInstructions.builder() .distanceAlongGeometry(100d) - .primary(BannerText.builder().build()) - .secondary(BannerText.builder().build()) + .primary(BannerText.builder().text("Banner primary sample text").build()) + .secondary(BannerText.builder().text("Banner secondary sample text").build()) .build(); byte[] serialized = TestUtils.serialize(bannerInstructions); assertEquals(bannerInstructions, deserialize(serialized, BannerInstructions.class));