diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style')
27 files changed, 99 insertions, 561 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java index c71dc3ce82..bdeeeb0926 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java @@ -90,9 +90,7 @@ import java.util.Map; */ public class Expression { - @Nullable private final String operator; - @Nullable private final Expression[] arguments; /** @@ -437,7 +435,7 @@ public class Expression { * @return expression * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-==">Style specification</a> */ - public static Expression eq(@NonNull Expression compareOne, boolean compareTwo) { + public static Expression eq(Expression compareOne, boolean compareTwo) { return eq(compareOne, literal(compareTwo)); } @@ -2236,7 +2234,7 @@ public class Expression { * @return expression * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-ln">Style specification</a> */ - public static Expression ln(@NonNull Number number) { + public static Expression ln(Number number) { return ln(literal(number)); } @@ -2688,7 +2686,7 @@ public class Expression { * @return expression * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-round">Style specification</a> */ - public static Expression round(@NonNull Number number) { + public static Expression round(Number number) { return round(literal(number)); } @@ -2732,7 +2730,7 @@ public class Expression { * @return expression * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-abs">Style specification</a> */ - public static Expression abs(@NonNull Number number) { + public static Expression abs(Number number) { return abs(literal(number)); } @@ -2776,7 +2774,7 @@ public class Expression { * @return expression * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-abs">Style specification</a> */ - public static Expression ceil(@NonNull Number number) { + public static Expression ceil(Number number) { return ceil(literal(number)); } @@ -2820,7 +2818,7 @@ public class Expression { * @return expression * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-abs">Style specification</a> */ - public static Expression floor(@NonNull Number number) { + public static Expression floor(Number number) { return floor(literal(number)); } @@ -2906,7 +2904,7 @@ public class Expression { * @return expression * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-is-supported-script">Style specification</a> */ - public static Expression isSupportedScript(@NonNull String string) { + public static Expression isSupportedScript(String string) { return new Expression("is-supported-script", literal(string)); } @@ -3497,7 +3495,7 @@ public class Expression { * @return expression * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-step">Style specification</a> */ - public static Expression step(@NonNull Expression input, @NonNull Expression defaultOutput, @NonNull Expression... stops) { + public static Expression step(@NonNull Expression input, @NonNull Expression defaultOutput, Expression... stops) { return new Expression("step", join(new Expression[] {input, defaultOutput}, stops)); } @@ -3724,7 +3722,7 @@ public class Expression { * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-interpolate">Style specification</a> */ public static Expression interpolate(@NonNull Interpolator interpolation, - @NonNull Expression number, @NonNull Expression... stops) { + @NonNull Expression number, Expression... stops) { return new Expression("interpolate", join(new Expression[] {interpolation, number}, stops)); } @@ -3931,7 +3929,6 @@ public class Expression { * @param right the right part of an expression * @return the joined expression */ - @NonNull private static Expression[] join(Expression[] left, Expression[] right) { Expression[] output = new Expression[left.length + right.length]; System.arraycopy(left, 0, output, 0, left.length); @@ -4024,7 +4021,7 @@ public class Expression { * @return true if equal, false if not */ @Override - public boolean equals(@Nullable Object o) { + public boolean equals(Object o) { super.equals(o); if (this == o) { return true; @@ -4124,7 +4121,7 @@ public class Expression { * @return true if equal, false if not */ @Override - public boolean equals(@Nullable Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -4152,7 +4149,6 @@ public class Expression { return result; } - @NonNull private static String unwrapStringLiteral(String value) { if (value.length() > 1 && value.charAt(0) == '\"' && value.charAt(value.length() - 1) == '\"') { @@ -4205,7 +4201,6 @@ public class Expression { * @param stops the stops to convert * @return the converted stops as an expression array */ - @NonNull static Expression[] toExpressionArray(Stop... stops) { Expression[] expressions = new Expression[stops.length * 2]; Stop stop; @@ -4337,7 +4332,6 @@ public class Expression { * * @return the string representation of the expression array */ - @NonNull @Override public String toString() { StringBuilder builder = new StringBuilder("[\"literal\"], ["); @@ -4369,7 +4363,6 @@ public class Expression { this.map = map; } - @NonNull @Override public Object toValue() { Map<String, Object> unwrappedMap = new HashMap<>(); @@ -4385,7 +4378,6 @@ public class Expression { return unwrappedMap; } - @NonNull @Override public String toString() { StringBuilder builder = new StringBuilder(); @@ -4405,7 +4397,7 @@ public class Expression { } @Override - public boolean equals(@Nullable Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -4440,7 +4432,6 @@ public class Expression { * @param object the object to convert to an object array * @return the converted object array */ - @NonNull static Object[] toObjectArray(Object object) { // object is a primitive array int len = java.lang.reflect.Array.getLength(object); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java index a89f012fe6..dd20a4b957 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java @@ -51,7 +51,6 @@ public class BackgroundLayer extends Layer { * @param properties the var-args properties * @return This */ - @NonNull public BackgroundLayer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -64,7 +63,6 @@ public class BackgroundLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getBackgroundColor() { checkThread(); @@ -93,7 +91,6 @@ public class BackgroundLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getBackgroundColorTransition() { checkThread(); return nativeGetBackgroundColorTransition(); @@ -104,7 +101,7 @@ public class BackgroundLayer extends Layer { * * @param options transition options for String */ - public void setBackgroundColorTransition(@NonNull TransitionOptions options) { + public void setBackgroundColorTransition(TransitionOptions options) { checkThread(); nativeSetBackgroundColorTransition(options.getDuration(), options.getDelay()); } @@ -114,7 +111,6 @@ public class BackgroundLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getBackgroundPattern() { checkThread(); @@ -126,7 +122,6 @@ public class BackgroundLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getBackgroundPatternTransition() { checkThread(); return nativeGetBackgroundPatternTransition(); @@ -137,7 +132,7 @@ public class BackgroundLayer extends Layer { * * @param options transition options for String */ - public void setBackgroundPatternTransition(@NonNull TransitionOptions options) { + public void setBackgroundPatternTransition(TransitionOptions options) { checkThread(); nativeSetBackgroundPatternTransition(options.getDuration(), options.getDelay()); } @@ -147,7 +142,6 @@ public class BackgroundLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getBackgroundOpacity() { checkThread(); @@ -159,7 +153,6 @@ public class BackgroundLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getBackgroundOpacityTransition() { checkThread(); return nativeGetBackgroundOpacityTransition(); @@ -170,38 +163,32 @@ public class BackgroundLayer extends Layer { * * @param options transition options for Float */ - public void setBackgroundOpacityTransition(@NonNull TransitionOptions options) { + public void setBackgroundOpacityTransition(TransitionOptions options) { checkThread(); nativeSetBackgroundOpacityTransition(options.getDuration(), options.getDelay()); } - @NonNull @Keep private native Object nativeGetBackgroundColor(); - @NonNull @Keep private native TransitionOptions nativeGetBackgroundColorTransition(); @Keep private native void nativeSetBackgroundColorTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetBackgroundPattern(); - @NonNull @Keep private native TransitionOptions nativeGetBackgroundPatternTransition(); @Keep private native void nativeSetBackgroundPatternTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetBackgroundOpacity(); - @NonNull @Keep private native TransitionOptions nativeGetBackgroundOpacityTransition(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java index 76f7b2f9fa..4718adc5c1 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java @@ -62,7 +62,6 @@ public class CircleLayer extends Layer { * @param sourceLayer the source layer to set * @return This */ - @NonNull public CircleLayer withSourceLayer(String sourceLayer) { setSourceLayer(sourceLayer); return this; @@ -73,7 +72,6 @@ public class CircleLayer extends Layer { * * @return id of the source */ - @NonNull public String getSourceId() { checkThread(); return nativeGetSourceId(); @@ -84,7 +82,6 @@ public class CircleLayer extends Layer { * * @return sourceLayer the source layer to get */ - @NonNull public String getSourceLayer() { checkThread(); return nativeGetSourceLayer(); @@ -95,7 +92,7 @@ public class CircleLayer extends Layer { * * @param filter the expression filter to set */ - public void setFilter(@NonNull Expression filter) { + public void setFilter(Expression filter) { checkThread(); nativeSetFilter(filter.toArray()); } @@ -106,8 +103,7 @@ public class CircleLayer extends Layer { * @param filter the expression filter to set * @return This */ - @NonNull - public CircleLayer withFilter(@NonNull Expression filter) { + public CircleLayer withFilter(Expression filter) { setFilter(filter); return this; } @@ -134,7 +130,6 @@ public class CircleLayer extends Layer { * @param properties the var-args properties * @return This */ - @NonNull public CircleLayer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -147,7 +142,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getCircleRadius() { checkThread(); @@ -159,7 +153,6 @@ public class CircleLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getCircleRadiusTransition() { checkThread(); return nativeGetCircleRadiusTransition(); @@ -170,7 +163,7 @@ public class CircleLayer extends Layer { * * @param options transition options for Float */ - public void setCircleRadiusTransition(@NonNull TransitionOptions options) { + public void setCircleRadiusTransition(TransitionOptions options) { checkThread(); nativeSetCircleRadiusTransition(options.getDuration(), options.getDelay()); } @@ -180,7 +173,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getCircleColor() { checkThread(); @@ -209,7 +201,6 @@ public class CircleLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getCircleColorTransition() { checkThread(); return nativeGetCircleColorTransition(); @@ -220,7 +211,7 @@ public class CircleLayer extends Layer { * * @param options transition options for String */ - public void setCircleColorTransition(@NonNull TransitionOptions options) { + public void setCircleColorTransition(TransitionOptions options) { checkThread(); nativeSetCircleColorTransition(options.getDuration(), options.getDelay()); } @@ -230,7 +221,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getCircleBlur() { checkThread(); @@ -242,7 +232,6 @@ public class CircleLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getCircleBlurTransition() { checkThread(); return nativeGetCircleBlurTransition(); @@ -253,7 +242,7 @@ public class CircleLayer extends Layer { * * @param options transition options for Float */ - public void setCircleBlurTransition(@NonNull TransitionOptions options) { + public void setCircleBlurTransition(TransitionOptions options) { checkThread(); nativeSetCircleBlurTransition(options.getDuration(), options.getDelay()); } @@ -263,7 +252,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getCircleOpacity() { checkThread(); @@ -275,7 +263,6 @@ public class CircleLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getCircleOpacityTransition() { checkThread(); return nativeGetCircleOpacityTransition(); @@ -286,7 +273,7 @@ public class CircleLayer extends Layer { * * @param options transition options for Float */ - public void setCircleOpacityTransition(@NonNull TransitionOptions options) { + public void setCircleOpacityTransition(TransitionOptions options) { checkThread(); nativeSetCircleOpacityTransition(options.getDuration(), options.getDelay()); } @@ -296,7 +283,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around Float[] */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getCircleTranslate() { checkThread(); @@ -308,7 +294,6 @@ public class CircleLayer extends Layer { * * @return transition options for Float[] */ - @NonNull public TransitionOptions getCircleTranslateTransition() { checkThread(); return nativeGetCircleTranslateTransition(); @@ -319,7 +304,7 @@ public class CircleLayer extends Layer { * * @param options transition options for Float[] */ - public void setCircleTranslateTransition(@NonNull TransitionOptions options) { + public void setCircleTranslateTransition(TransitionOptions options) { checkThread(); nativeSetCircleTranslateTransition(options.getDuration(), options.getDelay()); } @@ -329,7 +314,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getCircleTranslateAnchor() { checkThread(); @@ -341,7 +325,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getCirclePitchScale() { checkThread(); @@ -353,7 +336,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getCirclePitchAlignment() { checkThread(); @@ -365,7 +347,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getCircleStrokeWidth() { checkThread(); @@ -377,7 +358,6 @@ public class CircleLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getCircleStrokeWidthTransition() { checkThread(); return nativeGetCircleStrokeWidthTransition(); @@ -388,7 +368,7 @@ public class CircleLayer extends Layer { * * @param options transition options for Float */ - public void setCircleStrokeWidthTransition(@NonNull TransitionOptions options) { + public void setCircleStrokeWidthTransition(TransitionOptions options) { checkThread(); nativeSetCircleStrokeWidthTransition(options.getDuration(), options.getDelay()); } @@ -398,7 +378,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getCircleStrokeColor() { checkThread(); @@ -427,7 +406,6 @@ public class CircleLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getCircleStrokeColorTransition() { checkThread(); return nativeGetCircleStrokeColorTransition(); @@ -438,7 +416,7 @@ public class CircleLayer extends Layer { * * @param options transition options for String */ - public void setCircleStrokeColorTransition(@NonNull TransitionOptions options) { + public void setCircleStrokeColorTransition(TransitionOptions options) { checkThread(); nativeSetCircleStrokeColorTransition(options.getDuration(), options.getDelay()); } @@ -448,7 +426,6 @@ public class CircleLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getCircleStrokeOpacity() { checkThread(); @@ -460,7 +437,6 @@ public class CircleLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getCircleStrokeOpacityTransition() { checkThread(); return nativeGetCircleStrokeOpacityTransition(); @@ -471,105 +447,86 @@ public class CircleLayer extends Layer { * * @param options transition options for Float */ - public void setCircleStrokeOpacityTransition(@NonNull TransitionOptions options) { + public void setCircleStrokeOpacityTransition(TransitionOptions options) { checkThread(); nativeSetCircleStrokeOpacityTransition(options.getDuration(), options.getDelay()); } - @NonNull @Keep private native Object nativeGetCircleRadius(); - @NonNull @Keep private native TransitionOptions nativeGetCircleRadiusTransition(); @Keep private native void nativeSetCircleRadiusTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetCircleColor(); - @NonNull @Keep private native TransitionOptions nativeGetCircleColorTransition(); @Keep private native void nativeSetCircleColorTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetCircleBlur(); - @NonNull @Keep private native TransitionOptions nativeGetCircleBlurTransition(); @Keep private native void nativeSetCircleBlurTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetCircleOpacity(); - @NonNull @Keep private native TransitionOptions nativeGetCircleOpacityTransition(); @Keep private native void nativeSetCircleOpacityTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetCircleTranslate(); - @NonNull @Keep private native TransitionOptions nativeGetCircleTranslateTransition(); @Keep private native void nativeSetCircleTranslateTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetCircleTranslateAnchor(); - @NonNull @Keep private native Object nativeGetCirclePitchScale(); - @NonNull @Keep private native Object nativeGetCirclePitchAlignment(); - @NonNull @Keep private native Object nativeGetCircleStrokeWidth(); - @NonNull @Keep private native TransitionOptions nativeGetCircleStrokeWidthTransition(); @Keep private native void nativeSetCircleStrokeWidthTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetCircleStrokeColor(); - @NonNull @Keep private native TransitionOptions nativeGetCircleStrokeColorTransition(); @Keep private native void nativeSetCircleStrokeColorTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetCircleStrokeOpacity(); - @NonNull @Keep private native TransitionOptions nativeGetCircleStrokeOpacityTransition(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java index 864d1d5a20..339b25b3f7 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java @@ -62,7 +62,6 @@ public class FillExtrusionLayer extends Layer { * @param sourceLayer the source layer to set * @return This */ - @NonNull public FillExtrusionLayer withSourceLayer(String sourceLayer) { setSourceLayer(sourceLayer); return this; @@ -73,7 +72,6 @@ public class FillExtrusionLayer extends Layer { * * @return id of the source */ - @NonNull public String getSourceId() { checkThread(); return nativeGetSourceId(); @@ -84,7 +82,6 @@ public class FillExtrusionLayer extends Layer { * * @return sourceLayer the source layer to get */ - @NonNull public String getSourceLayer() { checkThread(); return nativeGetSourceLayer(); @@ -95,7 +92,7 @@ public class FillExtrusionLayer extends Layer { * * @param filter the expression filter to set */ - public void setFilter(@NonNull Expression filter) { + public void setFilter(Expression filter) { checkThread(); nativeSetFilter(filter.toArray()); } @@ -106,8 +103,7 @@ public class FillExtrusionLayer extends Layer { * @param filter the expression filter to set * @return This */ - @NonNull - public FillExtrusionLayer withFilter(@NonNull Expression filter) { + public FillExtrusionLayer withFilter(Expression filter) { setFilter(filter); return this; } @@ -134,7 +130,6 @@ public class FillExtrusionLayer extends Layer { * @param properties the var-args properties * @return This */ - @NonNull public FillExtrusionLayer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -147,7 +142,6 @@ public class FillExtrusionLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getFillExtrusionOpacity() { checkThread(); @@ -159,7 +153,6 @@ public class FillExtrusionLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getFillExtrusionOpacityTransition() { checkThread(); return nativeGetFillExtrusionOpacityTransition(); @@ -170,7 +163,7 @@ public class FillExtrusionLayer extends Layer { * * @param options transition options for Float */ - public void setFillExtrusionOpacityTransition(@NonNull TransitionOptions options) { + public void setFillExtrusionOpacityTransition(TransitionOptions options) { checkThread(); nativeSetFillExtrusionOpacityTransition(options.getDuration(), options.getDelay()); } @@ -180,7 +173,6 @@ public class FillExtrusionLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getFillExtrusionColor() { checkThread(); @@ -209,7 +201,6 @@ public class FillExtrusionLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getFillExtrusionColorTransition() { checkThread(); return nativeGetFillExtrusionColorTransition(); @@ -220,7 +211,7 @@ public class FillExtrusionLayer extends Layer { * * @param options transition options for String */ - public void setFillExtrusionColorTransition(@NonNull TransitionOptions options) { + public void setFillExtrusionColorTransition(TransitionOptions options) { checkThread(); nativeSetFillExtrusionColorTransition(options.getDuration(), options.getDelay()); } @@ -230,7 +221,6 @@ public class FillExtrusionLayer extends Layer { * * @return property wrapper value around Float[] */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getFillExtrusionTranslate() { checkThread(); @@ -242,7 +232,6 @@ public class FillExtrusionLayer extends Layer { * * @return transition options for Float[] */ - @NonNull public TransitionOptions getFillExtrusionTranslateTransition() { checkThread(); return nativeGetFillExtrusionTranslateTransition(); @@ -253,7 +242,7 @@ public class FillExtrusionLayer extends Layer { * * @param options transition options for Float[] */ - public void setFillExtrusionTranslateTransition(@NonNull TransitionOptions options) { + public void setFillExtrusionTranslateTransition(TransitionOptions options) { checkThread(); nativeSetFillExtrusionTranslateTransition(options.getDuration(), options.getDelay()); } @@ -263,7 +252,6 @@ public class FillExtrusionLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getFillExtrusionTranslateAnchor() { checkThread(); @@ -275,7 +263,6 @@ public class FillExtrusionLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getFillExtrusionPattern() { checkThread(); @@ -287,7 +274,6 @@ public class FillExtrusionLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getFillExtrusionPatternTransition() { checkThread(); return nativeGetFillExtrusionPatternTransition(); @@ -298,7 +284,7 @@ public class FillExtrusionLayer extends Layer { * * @param options transition options for String */ - public void setFillExtrusionPatternTransition(@NonNull TransitionOptions options) { + public void setFillExtrusionPatternTransition(TransitionOptions options) { checkThread(); nativeSetFillExtrusionPatternTransition(options.getDuration(), options.getDelay()); } @@ -308,7 +294,6 @@ public class FillExtrusionLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getFillExtrusionHeight() { checkThread(); @@ -320,7 +305,6 @@ public class FillExtrusionLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getFillExtrusionHeightTransition() { checkThread(); return nativeGetFillExtrusionHeightTransition(); @@ -331,7 +315,7 @@ public class FillExtrusionLayer extends Layer { * * @param options transition options for Float */ - public void setFillExtrusionHeightTransition(@NonNull TransitionOptions options) { + public void setFillExtrusionHeightTransition(TransitionOptions options) { checkThread(); nativeSetFillExtrusionHeightTransition(options.getDuration(), options.getDelay()); } @@ -341,7 +325,6 @@ public class FillExtrusionLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getFillExtrusionBase() { checkThread(); @@ -353,7 +336,6 @@ public class FillExtrusionLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getFillExtrusionBaseTransition() { checkThread(); return nativeGetFillExtrusionBaseTransition(); @@ -364,75 +346,62 @@ public class FillExtrusionLayer extends Layer { * * @param options transition options for Float */ - public void setFillExtrusionBaseTransition(@NonNull TransitionOptions options) { + public void setFillExtrusionBaseTransition(TransitionOptions options) { checkThread(); nativeSetFillExtrusionBaseTransition(options.getDuration(), options.getDelay()); } - @NonNull @Keep private native Object nativeGetFillExtrusionOpacity(); - @NonNull @Keep private native TransitionOptions nativeGetFillExtrusionOpacityTransition(); @Keep private native void nativeSetFillExtrusionOpacityTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetFillExtrusionColor(); - @NonNull @Keep private native TransitionOptions nativeGetFillExtrusionColorTransition(); @Keep private native void nativeSetFillExtrusionColorTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetFillExtrusionTranslate(); - @NonNull @Keep private native TransitionOptions nativeGetFillExtrusionTranslateTransition(); @Keep private native void nativeSetFillExtrusionTranslateTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetFillExtrusionTranslateAnchor(); - @NonNull @Keep private native Object nativeGetFillExtrusionPattern(); - @NonNull @Keep private native TransitionOptions nativeGetFillExtrusionPatternTransition(); @Keep private native void nativeSetFillExtrusionPatternTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetFillExtrusionHeight(); - @NonNull @Keep private native TransitionOptions nativeGetFillExtrusionHeightTransition(); @Keep private native void nativeSetFillExtrusionHeightTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetFillExtrusionBase(); - @NonNull @Keep private native TransitionOptions nativeGetFillExtrusionBaseTransition(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java index 14c80c044c..295ffd3963 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java @@ -62,7 +62,6 @@ public class FillLayer extends Layer { * @param sourceLayer the source layer to set * @return This */ - @NonNull public FillLayer withSourceLayer(String sourceLayer) { setSourceLayer(sourceLayer); return this; @@ -73,7 +72,6 @@ public class FillLayer extends Layer { * * @return id of the source */ - @NonNull public String getSourceId() { checkThread(); return nativeGetSourceId(); @@ -84,7 +82,6 @@ public class FillLayer extends Layer { * * @return sourceLayer the source layer to get */ - @NonNull public String getSourceLayer() { checkThread(); return nativeGetSourceLayer(); @@ -95,7 +92,7 @@ public class FillLayer extends Layer { * * @param filter the expression filter to set */ - public void setFilter(@NonNull Expression filter) { + public void setFilter(Expression filter) { checkThread(); nativeSetFilter(filter.toArray()); } @@ -106,8 +103,7 @@ public class FillLayer extends Layer { * @param filter the expression filter to set * @return This */ - @NonNull - public FillLayer withFilter(@NonNull Expression filter) { + public FillLayer withFilter(Expression filter) { setFilter(filter); return this; } @@ -134,7 +130,6 @@ public class FillLayer extends Layer { * @param properties the var-args properties * @return This */ - @NonNull public FillLayer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -147,7 +142,6 @@ public class FillLayer extends Layer { * * @return property wrapper value around Boolean */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Boolean> getFillAntialias() { checkThread(); @@ -159,7 +153,6 @@ public class FillLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getFillOpacity() { checkThread(); @@ -171,7 +164,6 @@ public class FillLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getFillOpacityTransition() { checkThread(); return nativeGetFillOpacityTransition(); @@ -182,7 +174,7 @@ public class FillLayer extends Layer { * * @param options transition options for Float */ - public void setFillOpacityTransition(@NonNull TransitionOptions options) { + public void setFillOpacityTransition(TransitionOptions options) { checkThread(); nativeSetFillOpacityTransition(options.getDuration(), options.getDelay()); } @@ -192,7 +184,6 @@ public class FillLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getFillColor() { checkThread(); @@ -221,7 +212,6 @@ public class FillLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getFillColorTransition() { checkThread(); return nativeGetFillColorTransition(); @@ -232,7 +222,7 @@ public class FillLayer extends Layer { * * @param options transition options for String */ - public void setFillColorTransition(@NonNull TransitionOptions options) { + public void setFillColorTransition(TransitionOptions options) { checkThread(); nativeSetFillColorTransition(options.getDuration(), options.getDelay()); } @@ -242,7 +232,6 @@ public class FillLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getFillOutlineColor() { checkThread(); @@ -271,7 +260,6 @@ public class FillLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getFillOutlineColorTransition() { checkThread(); return nativeGetFillOutlineColorTransition(); @@ -282,7 +270,7 @@ public class FillLayer extends Layer { * * @param options transition options for String */ - public void setFillOutlineColorTransition(@NonNull TransitionOptions options) { + public void setFillOutlineColorTransition(TransitionOptions options) { checkThread(); nativeSetFillOutlineColorTransition(options.getDuration(), options.getDelay()); } @@ -292,7 +280,6 @@ public class FillLayer extends Layer { * * @return property wrapper value around Float[] */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getFillTranslate() { checkThread(); @@ -304,7 +291,6 @@ public class FillLayer extends Layer { * * @return transition options for Float[] */ - @NonNull public TransitionOptions getFillTranslateTransition() { checkThread(); return nativeGetFillTranslateTransition(); @@ -315,7 +301,7 @@ public class FillLayer extends Layer { * * @param options transition options for Float[] */ - public void setFillTranslateTransition(@NonNull TransitionOptions options) { + public void setFillTranslateTransition(TransitionOptions options) { checkThread(); nativeSetFillTranslateTransition(options.getDuration(), options.getDelay()); } @@ -325,7 +311,6 @@ public class FillLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getFillTranslateAnchor() { checkThread(); @@ -337,7 +322,6 @@ public class FillLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getFillPattern() { checkThread(); @@ -349,7 +333,6 @@ public class FillLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getFillPatternTransition() { checkThread(); return nativeGetFillPatternTransition(); @@ -360,68 +343,56 @@ public class FillLayer extends Layer { * * @param options transition options for String */ - public void setFillPatternTransition(@NonNull TransitionOptions options) { + public void setFillPatternTransition(TransitionOptions options) { checkThread(); nativeSetFillPatternTransition(options.getDuration(), options.getDelay()); } - @NonNull @Keep private native Object nativeGetFillAntialias(); - @NonNull @Keep private native Object nativeGetFillOpacity(); - @NonNull @Keep private native TransitionOptions nativeGetFillOpacityTransition(); @Keep private native void nativeSetFillOpacityTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetFillColor(); - @NonNull @Keep private native TransitionOptions nativeGetFillColorTransition(); @Keep private native void nativeSetFillColorTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetFillOutlineColor(); - @NonNull @Keep private native TransitionOptions nativeGetFillOutlineColorTransition(); @Keep private native void nativeSetFillOutlineColorTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetFillTranslate(); - @NonNull @Keep private native TransitionOptions nativeGetFillTranslateTransition(); @Keep private native void nativeSetFillTranslateTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetFillTranslateAnchor(); - @NonNull @Keep private native Object nativeGetFillPattern(); - @NonNull @Keep private native TransitionOptions nativeGetFillPatternTransition(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java index 730471190c..796f6a28bb 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java @@ -62,7 +62,6 @@ public class HeatmapLayer extends Layer { * @param sourceLayer the source layer to set * @return This */ - @NonNull public HeatmapLayer withSourceLayer(String sourceLayer) { setSourceLayer(sourceLayer); return this; @@ -73,7 +72,6 @@ public class HeatmapLayer extends Layer { * * @return id of the source */ - @NonNull public String getSourceId() { checkThread(); return nativeGetSourceId(); @@ -84,7 +82,6 @@ public class HeatmapLayer extends Layer { * * @return sourceLayer the source layer to get */ - @NonNull public String getSourceLayer() { checkThread(); return nativeGetSourceLayer(); @@ -95,7 +92,7 @@ public class HeatmapLayer extends Layer { * * @param filter the expression filter to set */ - public void setFilter(@NonNull Expression filter) { + public void setFilter(Expression filter) { checkThread(); nativeSetFilter(filter.toArray()); } @@ -106,8 +103,7 @@ public class HeatmapLayer extends Layer { * @param filter the expression filter to set * @return This */ - @NonNull - public HeatmapLayer withFilter(@NonNull Expression filter) { + public HeatmapLayer withFilter(Expression filter) { setFilter(filter); return this; } @@ -134,7 +130,6 @@ public class HeatmapLayer extends Layer { * @param properties the var-args properties * @return This */ - @NonNull public HeatmapLayer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -147,7 +142,6 @@ public class HeatmapLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getHeatmapRadius() { checkThread(); @@ -159,7 +153,6 @@ public class HeatmapLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getHeatmapRadiusTransition() { checkThread(); return nativeGetHeatmapRadiusTransition(); @@ -170,7 +163,7 @@ public class HeatmapLayer extends Layer { * * @param options transition options for Float */ - public void setHeatmapRadiusTransition(@NonNull TransitionOptions options) { + public void setHeatmapRadiusTransition(TransitionOptions options) { checkThread(); nativeSetHeatmapRadiusTransition(options.getDuration(), options.getDelay()); } @@ -180,7 +173,6 @@ public class HeatmapLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getHeatmapWeight() { checkThread(); @@ -192,7 +184,6 @@ public class HeatmapLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getHeatmapIntensity() { checkThread(); @@ -204,7 +195,6 @@ public class HeatmapLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getHeatmapIntensityTransition() { checkThread(); return nativeGetHeatmapIntensityTransition(); @@ -215,7 +205,7 @@ public class HeatmapLayer extends Layer { * * @param options transition options for Float */ - public void setHeatmapIntensityTransition(@NonNull TransitionOptions options) { + public void setHeatmapIntensityTransition(TransitionOptions options) { checkThread(); nativeSetHeatmapIntensityTransition(options.getDuration(), options.getDelay()); } @@ -225,7 +215,6 @@ public class HeatmapLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getHeatmapColor() { checkThread(); @@ -254,7 +243,6 @@ public class HeatmapLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getHeatmapOpacity() { checkThread(); @@ -266,7 +254,6 @@ public class HeatmapLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getHeatmapOpacityTransition() { checkThread(); return nativeGetHeatmapOpacityTransition(); @@ -277,46 +264,38 @@ public class HeatmapLayer extends Layer { * * @param options transition options for Float */ - public void setHeatmapOpacityTransition(@NonNull TransitionOptions options) { + public void setHeatmapOpacityTransition(TransitionOptions options) { checkThread(); nativeSetHeatmapOpacityTransition(options.getDuration(), options.getDelay()); } - @NonNull @Keep private native Object nativeGetHeatmapRadius(); - @NonNull @Keep private native TransitionOptions nativeGetHeatmapRadiusTransition(); @Keep private native void nativeSetHeatmapRadiusTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetHeatmapWeight(); - @NonNull @Keep private native Object nativeGetHeatmapIntensity(); - @NonNull @Keep private native TransitionOptions nativeGetHeatmapIntensityTransition(); @Keep private native void nativeSetHeatmapIntensityTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetHeatmapColor(); - @NonNull @Keep private native Object nativeGetHeatmapOpacity(); - @NonNull @Keep private native TransitionOptions nativeGetHeatmapOpacityTransition(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java index 22df96f2c6..d548d2c9f6 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java @@ -62,7 +62,6 @@ public class HillshadeLayer extends Layer { * @param sourceLayer the source layer to set * @return This */ - @NonNull public HillshadeLayer withSourceLayer(String sourceLayer) { setSourceLayer(sourceLayer); return this; @@ -73,7 +72,6 @@ public class HillshadeLayer extends Layer { * * @return id of the source */ - @NonNull public String getSourceId() { checkThread(); return nativeGetSourceId(); @@ -85,7 +83,6 @@ public class HillshadeLayer extends Layer { * @param properties the var-args properties * @return This */ - @NonNull public HillshadeLayer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -98,7 +95,6 @@ public class HillshadeLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getHillshadeIlluminationDirection() { checkThread(); @@ -110,7 +106,6 @@ public class HillshadeLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getHillshadeIlluminationAnchor() { checkThread(); @@ -122,7 +117,6 @@ public class HillshadeLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getHillshadeExaggeration() { checkThread(); @@ -134,7 +128,6 @@ public class HillshadeLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getHillshadeExaggerationTransition() { checkThread(); return nativeGetHillshadeExaggerationTransition(); @@ -145,7 +138,7 @@ public class HillshadeLayer extends Layer { * * @param options transition options for Float */ - public void setHillshadeExaggerationTransition(@NonNull TransitionOptions options) { + public void setHillshadeExaggerationTransition(TransitionOptions options) { checkThread(); nativeSetHillshadeExaggerationTransition(options.getDuration(), options.getDelay()); } @@ -155,7 +148,6 @@ public class HillshadeLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getHillshadeShadowColor() { checkThread(); @@ -184,7 +176,6 @@ public class HillshadeLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getHillshadeShadowColorTransition() { checkThread(); return nativeGetHillshadeShadowColorTransition(); @@ -195,7 +186,7 @@ public class HillshadeLayer extends Layer { * * @param options transition options for String */ - public void setHillshadeShadowColorTransition(@NonNull TransitionOptions options) { + public void setHillshadeShadowColorTransition(TransitionOptions options) { checkThread(); nativeSetHillshadeShadowColorTransition(options.getDuration(), options.getDelay()); } @@ -205,7 +196,6 @@ public class HillshadeLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getHillshadeHighlightColor() { checkThread(); @@ -234,7 +224,6 @@ public class HillshadeLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getHillshadeHighlightColorTransition() { checkThread(); return nativeGetHillshadeHighlightColorTransition(); @@ -245,7 +234,7 @@ public class HillshadeLayer extends Layer { * * @param options transition options for String */ - public void setHillshadeHighlightColorTransition(@NonNull TransitionOptions options) { + public void setHillshadeHighlightColorTransition(TransitionOptions options) { checkThread(); nativeSetHillshadeHighlightColorTransition(options.getDuration(), options.getDelay()); } @@ -255,7 +244,6 @@ public class HillshadeLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getHillshadeAccentColor() { checkThread(); @@ -284,7 +272,6 @@ public class HillshadeLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getHillshadeAccentColorTransition() { checkThread(); return nativeGetHillshadeAccentColorTransition(); @@ -295,57 +282,47 @@ public class HillshadeLayer extends Layer { * * @param options transition options for String */ - public void setHillshadeAccentColorTransition(@NonNull TransitionOptions options) { + public void setHillshadeAccentColorTransition(TransitionOptions options) { checkThread(); nativeSetHillshadeAccentColorTransition(options.getDuration(), options.getDelay()); } - @NonNull @Keep private native Object nativeGetHillshadeIlluminationDirection(); - @NonNull @Keep private native Object nativeGetHillshadeIlluminationAnchor(); - @NonNull @Keep private native Object nativeGetHillshadeExaggeration(); - @NonNull @Keep private native TransitionOptions nativeGetHillshadeExaggerationTransition(); @Keep private native void nativeSetHillshadeExaggerationTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetHillshadeShadowColor(); - @NonNull @Keep private native TransitionOptions nativeGetHillshadeShadowColorTransition(); @Keep private native void nativeSetHillshadeShadowColorTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetHillshadeHighlightColor(); - @NonNull @Keep private native TransitionOptions nativeGetHillshadeHighlightColorTransition(); @Keep private native void nativeSetHillshadeHighlightColorTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetHillshadeAccentColor(); - @NonNull @Keep private native TransitionOptions nativeGetHillshadeAccentColorTransition(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java index ea89330c95..b17c4a661a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java @@ -3,7 +3,6 @@ package com.mapbox.mapboxsdk.style.layers; import android.support.annotation.Keep; import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import com.google.gson.JsonElement; import com.mapbox.mapboxsdk.style.expressions.Expression; import com.mapbox.mapboxsdk.utils.ThreadUtils; @@ -51,13 +50,11 @@ public abstract class Layer { } } - @NonNull public String getId() { checkThread(); return nativeGetId(); } - @NonNull public PropertyValue<String> getVisibility() { checkThread(); return new PaintPropertyValue<>("visibility", (String) nativeGetVisibility()); @@ -87,11 +84,9 @@ public abstract class Layer { @Keep protected native void finalize() throws Throwable; - @NonNull @Keep protected native String nativeGetId(); - @NonNull @Keep protected native Object nativeGetVisibility(); @@ -104,18 +99,15 @@ public abstract class Layer { @Keep protected native void nativeSetFilter(Object[] filter); - @NonNull @Keep protected native JsonElement nativeGetFilter(); @Keep protected native void nativeSetSourceLayer(String sourceLayer); - @NonNull @Keep protected native String nativeGetSourceLayer(); - @NonNull @Keep protected native String nativeGetSourceId(); @@ -135,8 +127,7 @@ public abstract class Layer { return nativePtr; } - @Nullable - private Object convertValue(@Nullable Object value) { + private Object convertValue(Object value) { if (value != null && value instanceof Expression) { return ((Expression) value).toArray(); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java index 662d7c7ea7..f6022f836a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java @@ -62,7 +62,6 @@ public class LineLayer extends Layer { * @param sourceLayer the source layer to set * @return This */ - @NonNull public LineLayer withSourceLayer(String sourceLayer) { setSourceLayer(sourceLayer); return this; @@ -73,7 +72,6 @@ public class LineLayer extends Layer { * * @return id of the source */ - @NonNull public String getSourceId() { checkThread(); return nativeGetSourceId(); @@ -84,7 +82,6 @@ public class LineLayer extends Layer { * * @return sourceLayer the source layer to get */ - @NonNull public String getSourceLayer() { checkThread(); return nativeGetSourceLayer(); @@ -95,7 +92,7 @@ public class LineLayer extends Layer { * * @param filter the expression filter to set */ - public void setFilter(@NonNull Expression filter) { + public void setFilter(Expression filter) { checkThread(); nativeSetFilter(filter.toArray()); } @@ -106,8 +103,7 @@ public class LineLayer extends Layer { * @param filter the expression filter to set * @return This */ - @NonNull - public LineLayer withFilter(@NonNull Expression filter) { + public LineLayer withFilter(Expression filter) { setFilter(filter); return this; } @@ -134,7 +130,6 @@ public class LineLayer extends Layer { * @param properties the var-args properties * @return This */ - @NonNull public LineLayer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -147,7 +142,6 @@ public class LineLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getLineCap() { checkThread(); @@ -159,7 +153,6 @@ public class LineLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getLineJoin() { checkThread(); @@ -171,7 +164,6 @@ public class LineLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getLineMiterLimit() { checkThread(); @@ -183,7 +175,6 @@ public class LineLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getLineRoundLimit() { checkThread(); @@ -195,7 +186,6 @@ public class LineLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getLineOpacity() { checkThread(); @@ -207,7 +197,6 @@ public class LineLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getLineOpacityTransition() { checkThread(); return nativeGetLineOpacityTransition(); @@ -218,7 +207,7 @@ public class LineLayer extends Layer { * * @param options transition options for Float */ - public void setLineOpacityTransition(@NonNull TransitionOptions options) { + public void setLineOpacityTransition(TransitionOptions options) { checkThread(); nativeSetLineOpacityTransition(options.getDuration(), options.getDelay()); } @@ -228,7 +217,6 @@ public class LineLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getLineColor() { checkThread(); @@ -257,7 +245,6 @@ public class LineLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getLineColorTransition() { checkThread(); return nativeGetLineColorTransition(); @@ -268,7 +255,7 @@ public class LineLayer extends Layer { * * @param options transition options for String */ - public void setLineColorTransition(@NonNull TransitionOptions options) { + public void setLineColorTransition(TransitionOptions options) { checkThread(); nativeSetLineColorTransition(options.getDuration(), options.getDelay()); } @@ -278,7 +265,6 @@ public class LineLayer extends Layer { * * @return property wrapper value around Float[] */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getLineTranslate() { checkThread(); @@ -290,7 +276,6 @@ public class LineLayer extends Layer { * * @return transition options for Float[] */ - @NonNull public TransitionOptions getLineTranslateTransition() { checkThread(); return nativeGetLineTranslateTransition(); @@ -301,7 +286,7 @@ public class LineLayer extends Layer { * * @param options transition options for Float[] */ - public void setLineTranslateTransition(@NonNull TransitionOptions options) { + public void setLineTranslateTransition(TransitionOptions options) { checkThread(); nativeSetLineTranslateTransition(options.getDuration(), options.getDelay()); } @@ -311,7 +296,6 @@ public class LineLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getLineTranslateAnchor() { checkThread(); @@ -323,7 +307,6 @@ public class LineLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getLineWidth() { checkThread(); @@ -335,7 +318,6 @@ public class LineLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getLineWidthTransition() { checkThread(); return nativeGetLineWidthTransition(); @@ -346,7 +328,7 @@ public class LineLayer extends Layer { * * @param options transition options for Float */ - public void setLineWidthTransition(@NonNull TransitionOptions options) { + public void setLineWidthTransition(TransitionOptions options) { checkThread(); nativeSetLineWidthTransition(options.getDuration(), options.getDelay()); } @@ -356,7 +338,6 @@ public class LineLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getLineGapWidth() { checkThread(); @@ -368,7 +349,6 @@ public class LineLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getLineGapWidthTransition() { checkThread(); return nativeGetLineGapWidthTransition(); @@ -379,7 +359,7 @@ public class LineLayer extends Layer { * * @param options transition options for Float */ - public void setLineGapWidthTransition(@NonNull TransitionOptions options) { + public void setLineGapWidthTransition(TransitionOptions options) { checkThread(); nativeSetLineGapWidthTransition(options.getDuration(), options.getDelay()); } @@ -389,7 +369,6 @@ public class LineLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getLineOffset() { checkThread(); @@ -401,7 +380,6 @@ public class LineLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getLineOffsetTransition() { checkThread(); return nativeGetLineOffsetTransition(); @@ -412,7 +390,7 @@ public class LineLayer extends Layer { * * @param options transition options for Float */ - public void setLineOffsetTransition(@NonNull TransitionOptions options) { + public void setLineOffsetTransition(TransitionOptions options) { checkThread(); nativeSetLineOffsetTransition(options.getDuration(), options.getDelay()); } @@ -422,7 +400,6 @@ public class LineLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getLineBlur() { checkThread(); @@ -434,7 +411,6 @@ public class LineLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getLineBlurTransition() { checkThread(); return nativeGetLineBlurTransition(); @@ -445,7 +421,7 @@ public class LineLayer extends Layer { * * @param options transition options for Float */ - public void setLineBlurTransition(@NonNull TransitionOptions options) { + public void setLineBlurTransition(TransitionOptions options) { checkThread(); nativeSetLineBlurTransition(options.getDuration(), options.getDelay()); } @@ -455,7 +431,6 @@ public class LineLayer extends Layer { * * @return property wrapper value around Float[] */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getLineDasharray() { checkThread(); @@ -467,7 +442,6 @@ public class LineLayer extends Layer { * * @return transition options for Float[] */ - @NonNull public TransitionOptions getLineDasharrayTransition() { checkThread(); return nativeGetLineDasharrayTransition(); @@ -478,7 +452,7 @@ public class LineLayer extends Layer { * * @param options transition options for Float[] */ - public void setLineDasharrayTransition(@NonNull TransitionOptions options) { + public void setLineDasharrayTransition(TransitionOptions options) { checkThread(); nativeSetLineDasharrayTransition(options.getDuration(), options.getDelay()); } @@ -488,7 +462,6 @@ public class LineLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getLinePattern() { checkThread(); @@ -500,7 +473,6 @@ public class LineLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getLinePatternTransition() { checkThread(); return nativeGetLinePatternTransition(); @@ -511,7 +483,7 @@ public class LineLayer extends Layer { * * @param options transition options for String */ - public void setLinePatternTransition(@NonNull TransitionOptions options) { + public void setLinePatternTransition(TransitionOptions options) { checkThread(); nativeSetLinePatternTransition(options.getDuration(), options.getDelay()); } @@ -521,7 +493,6 @@ public class LineLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getLineGradient() { checkThread(); @@ -545,126 +516,102 @@ public class LineLayer extends Layer { } } - @NonNull @Keep private native Object nativeGetLineCap(); - @NonNull @Keep private native Object nativeGetLineJoin(); - @NonNull @Keep private native Object nativeGetLineMiterLimit(); - @NonNull @Keep private native Object nativeGetLineRoundLimit(); - @NonNull @Keep private native Object nativeGetLineOpacity(); - @NonNull @Keep private native TransitionOptions nativeGetLineOpacityTransition(); @Keep private native void nativeSetLineOpacityTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetLineColor(); - @NonNull @Keep private native TransitionOptions nativeGetLineColorTransition(); @Keep private native void nativeSetLineColorTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetLineTranslate(); - @NonNull @Keep private native TransitionOptions nativeGetLineTranslateTransition(); @Keep private native void nativeSetLineTranslateTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetLineTranslateAnchor(); - @NonNull @Keep private native Object nativeGetLineWidth(); - @NonNull @Keep private native TransitionOptions nativeGetLineWidthTransition(); @Keep private native void nativeSetLineWidthTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetLineGapWidth(); - @NonNull @Keep private native TransitionOptions nativeGetLineGapWidthTransition(); @Keep private native void nativeSetLineGapWidthTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetLineOffset(); - @NonNull @Keep private native TransitionOptions nativeGetLineOffsetTransition(); @Keep private native void nativeSetLineOffsetTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetLineBlur(); - @NonNull @Keep private native TransitionOptions nativeGetLineBlurTransition(); @Keep private native void nativeSetLineBlurTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetLineDasharray(); - @NonNull @Keep private native TransitionOptions nativeGetLineDasharrayTransition(); @Keep private native void nativeSetLineDasharrayTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetLinePattern(); - @NonNull @Keep private native TransitionOptions nativeGetLinePatternTransition(); @Keep private native void nativeSetLinePatternTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetLineGradient(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java index e21833ed7d..848165f00f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java @@ -17,7 +17,6 @@ public class PropertyValue<T> { private static final String TAG = "Mbgl-PropertyValue"; - @NonNull public final String name; public final T value; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java index f2c5b03a27..792ea1193c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java @@ -62,7 +62,6 @@ public class RasterLayer extends Layer { * @param sourceLayer the source layer to set * @return This */ - @NonNull public RasterLayer withSourceLayer(String sourceLayer) { setSourceLayer(sourceLayer); return this; @@ -73,7 +72,6 @@ public class RasterLayer extends Layer { * * @return id of the source */ - @NonNull public String getSourceId() { checkThread(); return nativeGetSourceId(); @@ -85,7 +83,6 @@ public class RasterLayer extends Layer { * @param properties the var-args properties * @return This */ - @NonNull public RasterLayer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -98,7 +95,6 @@ public class RasterLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getRasterOpacity() { checkThread(); @@ -110,7 +106,6 @@ public class RasterLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getRasterOpacityTransition() { checkThread(); return nativeGetRasterOpacityTransition(); @@ -121,7 +116,7 @@ public class RasterLayer extends Layer { * * @param options transition options for Float */ - public void setRasterOpacityTransition(@NonNull TransitionOptions options) { + public void setRasterOpacityTransition(TransitionOptions options) { checkThread(); nativeSetRasterOpacityTransition(options.getDuration(), options.getDelay()); } @@ -131,7 +126,6 @@ public class RasterLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getRasterHueRotate() { checkThread(); @@ -143,7 +137,6 @@ public class RasterLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getRasterHueRotateTransition() { checkThread(); return nativeGetRasterHueRotateTransition(); @@ -154,7 +147,7 @@ public class RasterLayer extends Layer { * * @param options transition options for Float */ - public void setRasterHueRotateTransition(@NonNull TransitionOptions options) { + public void setRasterHueRotateTransition(TransitionOptions options) { checkThread(); nativeSetRasterHueRotateTransition(options.getDuration(), options.getDelay()); } @@ -164,7 +157,6 @@ public class RasterLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getRasterBrightnessMin() { checkThread(); @@ -176,7 +168,6 @@ public class RasterLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getRasterBrightnessMinTransition() { checkThread(); return nativeGetRasterBrightnessMinTransition(); @@ -187,7 +178,7 @@ public class RasterLayer extends Layer { * * @param options transition options for Float */ - public void setRasterBrightnessMinTransition(@NonNull TransitionOptions options) { + public void setRasterBrightnessMinTransition(TransitionOptions options) { checkThread(); nativeSetRasterBrightnessMinTransition(options.getDuration(), options.getDelay()); } @@ -197,7 +188,6 @@ public class RasterLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getRasterBrightnessMax() { checkThread(); @@ -209,7 +199,6 @@ public class RasterLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getRasterBrightnessMaxTransition() { checkThread(); return nativeGetRasterBrightnessMaxTransition(); @@ -220,7 +209,7 @@ public class RasterLayer extends Layer { * * @param options transition options for Float */ - public void setRasterBrightnessMaxTransition(@NonNull TransitionOptions options) { + public void setRasterBrightnessMaxTransition(TransitionOptions options) { checkThread(); nativeSetRasterBrightnessMaxTransition(options.getDuration(), options.getDelay()); } @@ -230,7 +219,6 @@ public class RasterLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getRasterSaturation() { checkThread(); @@ -242,7 +230,6 @@ public class RasterLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getRasterSaturationTransition() { checkThread(); return nativeGetRasterSaturationTransition(); @@ -253,7 +240,7 @@ public class RasterLayer extends Layer { * * @param options transition options for Float */ - public void setRasterSaturationTransition(@NonNull TransitionOptions options) { + public void setRasterSaturationTransition(TransitionOptions options) { checkThread(); nativeSetRasterSaturationTransition(options.getDuration(), options.getDelay()); } @@ -263,7 +250,6 @@ public class RasterLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getRasterContrast() { checkThread(); @@ -275,7 +261,6 @@ public class RasterLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getRasterContrastTransition() { checkThread(); return nativeGetRasterContrastTransition(); @@ -286,7 +271,7 @@ public class RasterLayer extends Layer { * * @param options transition options for Float */ - public void setRasterContrastTransition(@NonNull TransitionOptions options) { + public void setRasterContrastTransition(TransitionOptions options) { checkThread(); nativeSetRasterContrastTransition(options.getDuration(), options.getDelay()); } @@ -296,7 +281,6 @@ public class RasterLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getRasterResampling() { checkThread(); @@ -308,84 +292,69 @@ public class RasterLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getRasterFadeDuration() { checkThread(); return (PropertyValue<Float>) new PropertyValue("raster-fade-duration", nativeGetRasterFadeDuration()); } - @NonNull @Keep private native Object nativeGetRasterOpacity(); - @NonNull @Keep private native TransitionOptions nativeGetRasterOpacityTransition(); @Keep private native void nativeSetRasterOpacityTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetRasterHueRotate(); - @NonNull @Keep private native TransitionOptions nativeGetRasterHueRotateTransition(); @Keep private native void nativeSetRasterHueRotateTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetRasterBrightnessMin(); - @NonNull @Keep private native TransitionOptions nativeGetRasterBrightnessMinTransition(); @Keep private native void nativeSetRasterBrightnessMinTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetRasterBrightnessMax(); - @NonNull @Keep private native TransitionOptions nativeGetRasterBrightnessMaxTransition(); @Keep private native void nativeSetRasterBrightnessMaxTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetRasterSaturation(); - @NonNull @Keep private native TransitionOptions nativeGetRasterSaturationTransition(); @Keep private native void nativeSetRasterSaturationTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetRasterContrast(); - @NonNull @Keep private native TransitionOptions nativeGetRasterContrastTransition(); @Keep private native void nativeSetRasterContrastTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetRasterResampling(); - @NonNull @Keep private native Object nativeGetRasterFadeDuration(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java index ba5bff178c..1d45f34bd3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java @@ -62,7 +62,6 @@ public class SymbolLayer extends Layer { * @param sourceLayer the source layer to set * @return This */ - @NonNull public SymbolLayer withSourceLayer(String sourceLayer) { setSourceLayer(sourceLayer); return this; @@ -73,7 +72,6 @@ public class SymbolLayer extends Layer { * * @return id of the source */ - @NonNull public String getSourceId() { checkThread(); return nativeGetSourceId(); @@ -84,7 +82,6 @@ public class SymbolLayer extends Layer { * * @return sourceLayer the source layer to get */ - @NonNull public String getSourceLayer() { checkThread(); return nativeGetSourceLayer(); @@ -95,7 +92,7 @@ public class SymbolLayer extends Layer { * * @param filter the expression filter to set */ - public void setFilter(@NonNull Expression filter) { + public void setFilter(Expression filter) { checkThread(); nativeSetFilter(filter.toArray()); } @@ -106,8 +103,7 @@ public class SymbolLayer extends Layer { * @param filter the expression filter to set * @return This */ - @NonNull - public SymbolLayer withFilter(@NonNull Expression filter) { + public SymbolLayer withFilter(Expression filter) { setFilter(filter); return this; } @@ -134,7 +130,6 @@ public class SymbolLayer extends Layer { * @param properties the var-args properties * @return This */ - @NonNull public SymbolLayer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -147,7 +142,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getSymbolPlacement() { checkThread(); @@ -159,7 +153,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getSymbolSpacing() { checkThread(); @@ -171,7 +164,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Boolean */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Boolean> getSymbolAvoidEdges() { checkThread(); @@ -183,7 +175,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getSymbolZOrder() { checkThread(); @@ -195,7 +186,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Boolean */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Boolean> getIconAllowOverlap() { checkThread(); @@ -207,7 +197,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Boolean */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Boolean> getIconIgnorePlacement() { checkThread(); @@ -219,7 +208,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Boolean */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Boolean> getIconOptional() { checkThread(); @@ -231,7 +219,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getIconRotationAlignment() { checkThread(); @@ -243,7 +230,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getIconSize() { checkThread(); @@ -255,7 +241,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getIconTextFit() { checkThread(); @@ -267,7 +252,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float[] */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getIconTextFitPadding() { checkThread(); @@ -279,7 +263,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getIconImage() { checkThread(); @@ -291,7 +274,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getIconRotate() { checkThread(); @@ -303,7 +285,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getIconPadding() { checkThread(); @@ -315,7 +296,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Boolean */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Boolean> getIconKeepUpright() { checkThread(); @@ -327,7 +307,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float[] */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getIconOffset() { checkThread(); @@ -339,7 +318,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getIconAnchor() { checkThread(); @@ -351,7 +329,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getIconPitchAlignment() { checkThread(); @@ -363,7 +340,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getTextPitchAlignment() { checkThread(); @@ -375,7 +351,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getTextRotationAlignment() { checkThread(); @@ -387,7 +362,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getTextField() { checkThread(); @@ -399,7 +373,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String[] */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String[]> getTextFont() { checkThread(); @@ -411,7 +384,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getTextSize() { checkThread(); @@ -423,7 +395,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getTextMaxWidth() { checkThread(); @@ -435,7 +406,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getTextLineHeight() { checkThread(); @@ -447,7 +417,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getTextLetterSpacing() { checkThread(); @@ -459,7 +428,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getTextJustify() { checkThread(); @@ -471,7 +439,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getTextAnchor() { checkThread(); @@ -483,7 +450,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getTextMaxAngle() { checkThread(); @@ -495,7 +461,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getTextRotate() { checkThread(); @@ -507,7 +472,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getTextPadding() { checkThread(); @@ -519,7 +483,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Boolean */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Boolean> getTextKeepUpright() { checkThread(); @@ -531,7 +494,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getTextTransform() { checkThread(); @@ -543,7 +505,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float[] */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getTextOffset() { checkThread(); @@ -555,7 +516,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Boolean */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Boolean> getTextAllowOverlap() { checkThread(); @@ -567,7 +527,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Boolean */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Boolean> getTextIgnorePlacement() { checkThread(); @@ -579,7 +538,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Boolean */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Boolean> getTextOptional() { checkThread(); @@ -591,7 +549,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getIconOpacity() { checkThread(); @@ -603,7 +560,6 @@ public class SymbolLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getIconOpacityTransition() { checkThread(); return nativeGetIconOpacityTransition(); @@ -614,7 +570,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for Float */ - public void setIconOpacityTransition(@NonNull TransitionOptions options) { + public void setIconOpacityTransition(TransitionOptions options) { checkThread(); nativeSetIconOpacityTransition(options.getDuration(), options.getDelay()); } @@ -624,7 +580,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getIconColor() { checkThread(); @@ -653,7 +608,6 @@ public class SymbolLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getIconColorTransition() { checkThread(); return nativeGetIconColorTransition(); @@ -664,7 +618,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for String */ - public void setIconColorTransition(@NonNull TransitionOptions options) { + public void setIconColorTransition(TransitionOptions options) { checkThread(); nativeSetIconColorTransition(options.getDuration(), options.getDelay()); } @@ -674,7 +628,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getIconHaloColor() { checkThread(); @@ -703,7 +656,6 @@ public class SymbolLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getIconHaloColorTransition() { checkThread(); return nativeGetIconHaloColorTransition(); @@ -714,7 +666,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for String */ - public void setIconHaloColorTransition(@NonNull TransitionOptions options) { + public void setIconHaloColorTransition(TransitionOptions options) { checkThread(); nativeSetIconHaloColorTransition(options.getDuration(), options.getDelay()); } @@ -724,7 +676,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getIconHaloWidth() { checkThread(); @@ -736,7 +687,6 @@ public class SymbolLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getIconHaloWidthTransition() { checkThread(); return nativeGetIconHaloWidthTransition(); @@ -747,7 +697,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for Float */ - public void setIconHaloWidthTransition(@NonNull TransitionOptions options) { + public void setIconHaloWidthTransition(TransitionOptions options) { checkThread(); nativeSetIconHaloWidthTransition(options.getDuration(), options.getDelay()); } @@ -757,7 +707,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getIconHaloBlur() { checkThread(); @@ -769,7 +718,6 @@ public class SymbolLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getIconHaloBlurTransition() { checkThread(); return nativeGetIconHaloBlurTransition(); @@ -780,7 +728,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for Float */ - public void setIconHaloBlurTransition(@NonNull TransitionOptions options) { + public void setIconHaloBlurTransition(TransitionOptions options) { checkThread(); nativeSetIconHaloBlurTransition(options.getDuration(), options.getDelay()); } @@ -790,7 +738,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float[] */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getIconTranslate() { checkThread(); @@ -802,7 +749,6 @@ public class SymbolLayer extends Layer { * * @return transition options for Float[] */ - @NonNull public TransitionOptions getIconTranslateTransition() { checkThread(); return nativeGetIconTranslateTransition(); @@ -813,7 +759,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for Float[] */ - public void setIconTranslateTransition(@NonNull TransitionOptions options) { + public void setIconTranslateTransition(TransitionOptions options) { checkThread(); nativeSetIconTranslateTransition(options.getDuration(), options.getDelay()); } @@ -823,7 +769,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getIconTranslateAnchor() { checkThread(); @@ -835,7 +780,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getTextOpacity() { checkThread(); @@ -847,7 +791,6 @@ public class SymbolLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getTextOpacityTransition() { checkThread(); return nativeGetTextOpacityTransition(); @@ -858,7 +801,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for Float */ - public void setTextOpacityTransition(@NonNull TransitionOptions options) { + public void setTextOpacityTransition(TransitionOptions options) { checkThread(); nativeSetTextOpacityTransition(options.getDuration(), options.getDelay()); } @@ -868,7 +811,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getTextColor() { checkThread(); @@ -897,7 +839,6 @@ public class SymbolLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getTextColorTransition() { checkThread(); return nativeGetTextColorTransition(); @@ -908,7 +849,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for String */ - public void setTextColorTransition(@NonNull TransitionOptions options) { + public void setTextColorTransition(TransitionOptions options) { checkThread(); nativeSetTextColorTransition(options.getDuration(), options.getDelay()); } @@ -918,7 +859,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getTextHaloColor() { checkThread(); @@ -947,7 +887,6 @@ public class SymbolLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getTextHaloColorTransition() { checkThread(); return nativeGetTextHaloColorTransition(); @@ -958,7 +897,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for String */ - public void setTextHaloColorTransition(@NonNull TransitionOptions options) { + public void setTextHaloColorTransition(TransitionOptions options) { checkThread(); nativeSetTextHaloColorTransition(options.getDuration(), options.getDelay()); } @@ -968,7 +907,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getTextHaloWidth() { checkThread(); @@ -980,7 +918,6 @@ public class SymbolLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getTextHaloWidthTransition() { checkThread(); return nativeGetTextHaloWidthTransition(); @@ -991,7 +928,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for Float */ - public void setTextHaloWidthTransition(@NonNull TransitionOptions options) { + public void setTextHaloWidthTransition(TransitionOptions options) { checkThread(); nativeSetTextHaloWidthTransition(options.getDuration(), options.getDelay()); } @@ -1001,7 +938,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getTextHaloBlur() { checkThread(); @@ -1013,7 +949,6 @@ public class SymbolLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getTextHaloBlurTransition() { checkThread(); return nativeGetTextHaloBlurTransition(); @@ -1024,7 +959,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for Float */ - public void setTextHaloBlurTransition(@NonNull TransitionOptions options) { + public void setTextHaloBlurTransition(TransitionOptions options) { checkThread(); nativeSetTextHaloBlurTransition(options.getDuration(), options.getDelay()); } @@ -1034,7 +969,6 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around Float[] */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float[]> getTextTranslate() { checkThread(); @@ -1046,7 +980,6 @@ public class SymbolLayer extends Layer { * * @return transition options for Float[] */ - @NonNull public TransitionOptions getTextTranslateTransition() { checkThread(); return nativeGetTextTranslateTransition(); @@ -1057,7 +990,7 @@ public class SymbolLayer extends Layer { * * @param options transition options for Float[] */ - public void setTextTranslateTransition(@NonNull TransitionOptions options) { + public void setTextTranslateTransition(TransitionOptions options) { checkThread(); nativeSetTextTranslateTransition(options.getDuration(), options.getDelay()); } @@ -1067,298 +1000,234 @@ public class SymbolLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getTextTranslateAnchor() { checkThread(); return (PropertyValue<String>) new PropertyValue("text-translate-anchor", nativeGetTextTranslateAnchor()); } - @NonNull @Keep private native Object nativeGetSymbolPlacement(); - @NonNull @Keep private native Object nativeGetSymbolSpacing(); - @NonNull @Keep private native Object nativeGetSymbolAvoidEdges(); - @NonNull @Keep private native Object nativeGetSymbolZOrder(); - @NonNull @Keep private native Object nativeGetIconAllowOverlap(); - @NonNull @Keep private native Object nativeGetIconIgnorePlacement(); - @NonNull @Keep private native Object nativeGetIconOptional(); - @NonNull @Keep private native Object nativeGetIconRotationAlignment(); - @NonNull @Keep private native Object nativeGetIconSize(); - @NonNull @Keep private native Object nativeGetIconTextFit(); - @NonNull @Keep private native Object nativeGetIconTextFitPadding(); - @NonNull @Keep private native Object nativeGetIconImage(); - @NonNull @Keep private native Object nativeGetIconRotate(); - @NonNull @Keep private native Object nativeGetIconPadding(); - @NonNull @Keep private native Object nativeGetIconKeepUpright(); - @NonNull @Keep private native Object nativeGetIconOffset(); - @NonNull @Keep private native Object nativeGetIconAnchor(); - @NonNull @Keep private native Object nativeGetIconPitchAlignment(); - @NonNull @Keep private native Object nativeGetTextPitchAlignment(); - @NonNull @Keep private native Object nativeGetTextRotationAlignment(); - @NonNull @Keep private native Object nativeGetTextField(); - @NonNull @Keep private native Object nativeGetTextFont(); - @NonNull @Keep private native Object nativeGetTextSize(); - @NonNull @Keep private native Object nativeGetTextMaxWidth(); - @NonNull @Keep private native Object nativeGetTextLineHeight(); - @NonNull @Keep private native Object nativeGetTextLetterSpacing(); - @NonNull @Keep private native Object nativeGetTextJustify(); - @NonNull @Keep private native Object nativeGetTextAnchor(); - @NonNull @Keep private native Object nativeGetTextMaxAngle(); - @NonNull @Keep private native Object nativeGetTextRotate(); - @NonNull @Keep private native Object nativeGetTextPadding(); - @NonNull @Keep private native Object nativeGetTextKeepUpright(); - @NonNull @Keep private native Object nativeGetTextTransform(); - @NonNull @Keep private native Object nativeGetTextOffset(); - @NonNull @Keep private native Object nativeGetTextAllowOverlap(); - @NonNull @Keep private native Object nativeGetTextIgnorePlacement(); - @NonNull @Keep private native Object nativeGetTextOptional(); - @NonNull @Keep private native Object nativeGetIconOpacity(); - @NonNull @Keep private native TransitionOptions nativeGetIconOpacityTransition(); @Keep private native void nativeSetIconOpacityTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetIconColor(); - @NonNull @Keep private native TransitionOptions nativeGetIconColorTransition(); @Keep private native void nativeSetIconColorTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetIconHaloColor(); - @NonNull @Keep private native TransitionOptions nativeGetIconHaloColorTransition(); @Keep private native void nativeSetIconHaloColorTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetIconHaloWidth(); - @NonNull @Keep private native TransitionOptions nativeGetIconHaloWidthTransition(); @Keep private native void nativeSetIconHaloWidthTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetIconHaloBlur(); - @NonNull @Keep private native TransitionOptions nativeGetIconHaloBlurTransition(); @Keep private native void nativeSetIconHaloBlurTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetIconTranslate(); - @NonNull @Keep private native TransitionOptions nativeGetIconTranslateTransition(); @Keep private native void nativeSetIconTranslateTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetIconTranslateAnchor(); - @NonNull @Keep private native Object nativeGetTextOpacity(); - @NonNull @Keep private native TransitionOptions nativeGetTextOpacityTransition(); @Keep private native void nativeSetTextOpacityTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetTextColor(); - @NonNull @Keep private native TransitionOptions nativeGetTextColorTransition(); @Keep private native void nativeSetTextColorTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetTextHaloColor(); - @NonNull @Keep private native TransitionOptions nativeGetTextHaloColorTransition(); @Keep private native void nativeSetTextHaloColorTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetTextHaloWidth(); - @NonNull @Keep private native TransitionOptions nativeGetTextHaloWidthTransition(); @Keep private native void nativeSetTextHaloWidthTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetTextHaloBlur(); - @NonNull @Keep private native TransitionOptions nativeGetTextHaloBlurTransition(); @Keep private native void nativeSetTextHaloBlurTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetTextTranslate(); - @NonNull @Keep private native TransitionOptions nativeGetTextTranslateTransition(); @Keep private native void nativeSetTextTranslateTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetTextTranslateAnchor(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java index dbd6d77761..2a25302aed 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java @@ -1,8 +1,6 @@ package com.mapbox.mapboxsdk.style.layers; import android.support.annotation.Keep; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; /** * Resembles transition property from the style specification. @@ -56,7 +54,7 @@ public class TransitionOptions { } @Override - public boolean equals(@Nullable Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -79,7 +77,6 @@ public class TransitionOptions { return result; } - @NonNull @Override public String toString() { return "TransitionOptions{" diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs index 022858c29d..958cb7383d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs @@ -82,7 +82,6 @@ public class <%- camelize(type) %>Layer extends Layer { * @param sourceLayer the source layer to set * @return This */ - @NonNull public <%- camelize(type) %>Layer withSourceLayer(String sourceLayer) { setSourceLayer(sourceLayer); return this; @@ -95,7 +94,6 @@ public class <%- camelize(type) %>Layer extends Layer { * * @return id of the source */ - @NonNull public String getSourceId() { checkThread(); return nativeGetSourceId(); @@ -108,7 +106,6 @@ public class <%- camelize(type) %>Layer extends Layer { * * @return sourceLayer the source layer to get */ - @NonNull public String getSourceLayer() { checkThread(); return nativeGetSourceLayer(); @@ -119,7 +116,7 @@ public class <%- camelize(type) %>Layer extends Layer { * * @param filter the expression filter to set */ - public void setFilter(@NonNull Expression filter) { + public void setFilter(Expression filter) { checkThread(); nativeSetFilter(filter.toArray()); } @@ -130,8 +127,7 @@ public class <%- camelize(type) %>Layer extends Layer { * @param filter the expression filter to set * @return This */ - @NonNull - public <%- camelize(type) %>Layer withFilter(@NonNull Expression filter) { + public <%- camelize(type) %>Layer withFilter(Expression filter) { setFilter(filter); return this; } @@ -159,7 +155,6 @@ public class <%- camelize(type) %>Layer extends Layer { * @param properties the var-args properties * @return This */ - @NonNull public <%- camelize(type) %>Layer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -173,7 +168,6 @@ public class <%- camelize(type) %>Layer extends Layer { * * @return property wrapper value around <%- propertyType(property) %> */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<<%- propertyType(property) %>> get<%- camelize(property.name) %>() { checkThread(); @@ -205,7 +199,6 @@ public class <%- camelize(type) %>Layer extends Layer { * * @return transition options for <%- propertyType(property) %> */ - @NonNull public TransitionOptions get<%- camelize(property.name) %>Transition() { checkThread(); return nativeGet<%- camelize(property.name) %>Transition(); @@ -216,7 +209,7 @@ public class <%- camelize(type) %>Layer extends Layer { * * @param options transition options for <%- propertyType(property) %> */ - public void set<%- camelize(property.name) %>Transition(@NonNull TransitionOptions options) { + public void set<%- camelize(property.name) %>Transition(TransitionOptions options) { checkThread(); nativeSet<%- camelize(property.name) %>Transition(options.getDuration(), options.getDelay()); } @@ -224,12 +217,10 @@ public class <%- camelize(type) %>Layer extends Layer { <% } -%> <% for (const property of properties) { -%> - @NonNull @Keep private native Object nativeGet<%- camelize(property.name) %>(); <% if (property.transition) { -%> - @NonNull @Keep private native TransitionOptions nativeGet<%- camelize(property.name) %>Transition(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java index 0c8ce01a49..f3886d6cce 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java @@ -49,7 +49,6 @@ public class Light { * * @return anchor as String */ - @NonNull @Property.ANCHOR public String getAnchor() { checkThread(); return nativeGetAnchor(); @@ -70,7 +69,6 @@ public class Light { * * @return position as Position */ - @NonNull public Position getPosition() { checkThread(); return nativeGetPosition(); @@ -81,7 +79,6 @@ public class Light { * * @return transition options for position */ - @NonNull public TransitionOptions getPositionTransition() { checkThread(); return nativeGetPositionTransition(); @@ -92,7 +89,7 @@ public class Light { * * @param options transition options for position */ - public void setPositionTransition(@NonNull TransitionOptions options) { + public void setPositionTransition(TransitionOptions options) { checkThread(); nativeSetPositionTransition(options.getDuration(), options.getDelay()); } @@ -122,7 +119,6 @@ public class Light { * * @return color as String */ - @NonNull public String getColor() { checkThread(); return nativeGetColor(); @@ -133,7 +129,6 @@ public class Light { * * @return transition options for color */ - @NonNull public TransitionOptions getColorTransition() { checkThread(); return nativeGetColorTransition(); @@ -144,7 +139,7 @@ public class Light { * * @param options transition options for color */ - public void setColorTransition(@NonNull TransitionOptions options) { + public void setColorTransition(TransitionOptions options) { checkThread(); nativeSetColorTransition(options.getDuration(), options.getDelay()); } @@ -164,7 +159,6 @@ public class Light { * * @return intensity as Float */ - @NonNull public float getIntensity() { checkThread(); return nativeGetIntensity(); @@ -175,7 +169,6 @@ public class Light { * * @return transition options for intensity */ - @NonNull public TransitionOptions getIntensityTransition() { checkThread(); return nativeGetIntensityTransition(); @@ -186,7 +179,7 @@ public class Light { * * @param options transition options for intensity */ - public void setIntensityTransition(@NonNull TransitionOptions options) { + public void setIntensityTransition(TransitionOptions options) { checkThread(); nativeSetIntensityTransition(options.getDuration(), options.getDelay()); } @@ -198,16 +191,13 @@ public class Light { @Keep private native void nativeSetAnchor(String anchor); - @NonNull @Keep private native String nativeGetAnchor(); @Keep private native void nativeSetPosition(Position position); - @NonNull @Keep private native Position nativeGetPosition(); - @NonNull @Keep private native TransitionOptions nativeGetPositionTransition(); @@ -216,10 +206,8 @@ public class Light { @Keep private native void nativeSetColor(String color); - @NonNull @Keep private native String nativeGetColor(); - @NonNull @Keep private native TransitionOptions nativeGetColorTransition(); @@ -228,10 +216,8 @@ public class Light { @Keep private native void nativeSetIntensity(float intensity); - @NonNull @Keep private native float nativeGetIntensity(); - @NonNull @Keep private native TransitionOptions nativeGetIntensityTransition(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java index 5678b64470..efd92f65a4 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java @@ -1,8 +1,6 @@ package com.mapbox.mapboxsdk.style.light; import android.support.annotation.Keep; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; /** * Position of the light source relative to lit (extruded) geometries. @@ -51,7 +49,7 @@ public class Position { } @Override - public boolean equals(@Nullable Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -78,7 +76,6 @@ public class Position { return result; } - @NonNull @Override public String toString() { return "Position{" diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs index 2a2734f7e1..7c9893a3a4 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs @@ -55,7 +55,6 @@ public class Light { * * @return <%- property.name %> as Position */ - @NonNull public Position get<%- camelize(property.name) %>() { checkThread(); return nativeGet<%- camelize(property.name) %>(); @@ -89,7 +88,6 @@ public class Light { * * @return <%- property.name %> as <%- propertyType(property) %> */ - @NonNull <%- propertyTypeAnnotation(property) %> public <%- propertyJavaType(property) %> get<%- camelize(property.name) %>() { checkThread(); return nativeGet<%- camelize(property.name) %>(); @@ -102,7 +100,6 @@ public class Light { * * @return transition options for <%- property.name %> */ - @NonNull public TransitionOptions get<%- camelize(property.name) %>Transition() { checkThread(); return nativeGet<%- camelize(property.name) %>Transition(); @@ -113,7 +110,7 @@ public class Light { * * @param options transition options for <%- property.name %> */ - public void set<%- camelize(property.name) %>Transition(@NonNull TransitionOptions options) { + public void set<%- camelize(property.name) %>Transition(TransitionOptions options) { checkThread(); nativeSet<%- camelize(property.name) %>Transition(options.getDuration(), options.getDelay()); } @@ -129,19 +126,16 @@ public class Light { @Keep private native void nativeSet<%- camelize(property.name) %>(Position position); - @NonNull @Keep private native Position nativeGet<%- camelize(property.name) %>(); <% } else { -%> @Keep private native void nativeSet<%- camelize(property.name) %>(<%- propertyJavaType(property) -%> <%- property.name %>); - @NonNull @Keep private native <%- propertyJavaType(property) -%> nativeGet<%- camelize(property.name) %>(); <% } -%> <% if (property.transition) { -%> - @NonNull @Keep private native TransitionOptions nativeGet<%- camelize(property.name) %>Transition(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java index cfb46b0cec..a44d7cab1a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java @@ -129,7 +129,6 @@ public class CustomGeometrySource extends Source { @Keep protected native void initialize(String sourceId, Object options); - @NonNull @Keep private native Feature[] querySourceFeatures(Object[] filter); @@ -180,7 +179,7 @@ public class CustomGeometrySource extends Source { } } - private void executeRequest(@NonNull GeometryTileRequest request) { + private void executeRequest(GeometryTileRequest request) { executorLock.lock(); try { if (executor != null && !executor.isShutdown()) { @@ -236,7 +235,6 @@ public class CustomGeometrySource extends Source { final AtomicInteger threadCount = new AtomicInteger(); final int poolId = poolCount.getAndIncrement(); - @NonNull @Override public Thread newThread(@NonNull Runnable runnable) { return new Thread( @@ -279,7 +277,7 @@ public class CustomGeometrySource extends Source { return Arrays.hashCode(new int[] {z, x, y}); } - public boolean equals(@Nullable Object object) { + public boolean equals(Object object) { if (object == this) { return true; } @@ -301,7 +299,6 @@ public class CustomGeometrySource extends Source { private final GeometryTileProvider provider; private final Map<TileID, GeometryTileRequest> awaiting; private final Map<TileID, AtomicBoolean> inProgress; - @NonNull private final WeakReference<CustomGeometrySource> sourceRef; private final AtomicBoolean cancelled; @@ -365,7 +362,7 @@ public class CustomGeometrySource extends Source { } @Override - public boolean equals(@Nullable Object o) { + public boolean equals(Object o) { if (this == o) { return true; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySourceOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySourceOptions.java index 92c0881c74..4ada38c238 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySourceOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySourceOptions.java @@ -1,7 +1,5 @@ package com.mapbox.mapboxsdk.style.sources; -import android.support.annotation.NonNull; - /** * Builder class for composing CustomGeometrySource objects. */ @@ -13,7 +11,6 @@ public class CustomGeometrySourceOptions extends GeoJsonOptions { * @param wrap defaults to false * @return the current instance for chaining */ - @NonNull public CustomGeometrySourceOptions withWrap(boolean wrap) { this.put("wrap", wrap); return this; @@ -26,7 +23,6 @@ public class CustomGeometrySourceOptions extends GeoJsonOptions { * @param clip defaults to false * @return the current instance for chaining */ - @NonNull public CustomGeometrySourceOptions withClip(boolean clip) { this.put("clip", clip); return this; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonOptions.java index 1e1b9bafa6..00715bc213 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonOptions.java @@ -1,7 +1,5 @@ package com.mapbox.mapboxsdk.style.sources; -import android.support.annotation.NonNull; - import java.util.HashMap; /** @@ -18,7 +16,6 @@ public class GeoJsonOptions extends HashMap<String, Object> { * @param minZoom the minimum zoom - Defaults to 0. * @return the current instance for chaining */ - @NonNull public GeoJsonOptions withMinZoom(int minZoom) { this.put("minzoom", minZoom); return this; @@ -30,7 +27,6 @@ public class GeoJsonOptions extends HashMap<String, Object> { * @param maxZoom the maximum zoom - Defaults to 25.5 * @return the current instance for chaining */ - @NonNull public GeoJsonOptions withMaxZoom(int maxZoom) { this.put("maxzoom", maxZoom); return this; @@ -43,7 +39,6 @@ public class GeoJsonOptions extends HashMap<String, Object> { * @param buffer the buffer size - Defaults to 128. * @return the current instance for chaining */ - @NonNull public GeoJsonOptions withBuffer(int buffer) { this.put("buffer", buffer); return this; @@ -55,7 +50,6 @@ public class GeoJsonOptions extends HashMap<String, Object> { * @param lineMetrics true to calculate line distance metrics. * @return the current instance for chaining */ - @NonNull public GeoJsonOptions withLineMetrics(boolean lineMetrics) { this.put("lineMetrics", lineMetrics); return this; @@ -67,7 +61,6 @@ public class GeoJsonOptions extends HashMap<String, Object> { * @param tolerance the tolerance - Defaults to 0.375 * @return the current instance for chaining */ - @NonNull public GeoJsonOptions withTolerance(float tolerance) { this.put("tolerance", tolerance); return this; @@ -79,7 +72,6 @@ public class GeoJsonOptions extends HashMap<String, Object> { * @param cluster cluster? - Defaults to false * @return the current instance for chaining */ - @NonNull public GeoJsonOptions withCluster(boolean cluster) { this.put("cluster", cluster); return this; @@ -92,7 +84,6 @@ public class GeoJsonOptions extends HashMap<String, Object> { * zoom features are not clustered) * @return the current instance for chaining */ - @NonNull public GeoJsonOptions withClusterMaxZoom(int clusterMaxZoom) { this.put("clusterMaxZoom", clusterMaxZoom); return this; @@ -104,7 +95,6 @@ public class GeoJsonOptions extends HashMap<String, Object> { * @param clusterRadius cluster radius - Defaults to 50 * @return the current instance for chaining */ - @NonNull public GeoJsonOptions withClusterRadius(int clusterRadius) { this.put("clusterRadius", clusterRadius); return this; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java index a9eb43f968..2d9b1c985a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java @@ -62,7 +62,7 @@ public class GeoJsonSource extends Source { * @param id the source id * @param geoJson raw Json FeatureCollection */ - public GeoJsonSource(String id, @Nullable String geoJson) { + public GeoJsonSource(String id, String geoJson) { super(); if (geoJson == null || geoJson.startsWith("http")) { throw new IllegalArgumentException("Expected a raw json body"); @@ -78,7 +78,7 @@ public class GeoJsonSource extends Source { * @param geoJson raw Json body * @param options options */ - public GeoJsonSource(String id, @Nullable String geoJson, GeoJsonOptions options) { + public GeoJsonSource(String id, String geoJson, GeoJsonOptions options) { super(); if (geoJson == null || geoJson.startsWith("http")) { throw new IllegalArgumentException("Expected a raw json body"); @@ -236,7 +236,7 @@ public class GeoJsonSource extends Source { * * @param url the GeoJSON FeatureCollection url */ - public void setUrl(@NonNull URL url) { + public void setUrl(URL url) { checkThread(); setUrl(url.toExternalForm()); } @@ -279,7 +279,6 @@ public class GeoJsonSource extends Source { @Keep protected native void nativeSetUrl(String url); - @NonNull @Keep protected native String nativeGetUrl(); @@ -295,7 +294,6 @@ public class GeoJsonSource extends Source { @Keep private native void nativeSetGeometry(Geometry geometry); - @NonNull @Keep private native Feature[] querySourceFeatures(Object[] filter); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java index 2579c95870..d0ca5e050b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java @@ -46,7 +46,7 @@ public class ImageSource extends Source { * @param coordinates The Latitude and Longitude of the four corners of the image * @param url remote json file */ - public ImageSource(String id, LatLngQuad coordinates, @NonNull URL url) { + public ImageSource(String id, LatLngQuad coordinates, URL url) { super(); initialize(id, coordinates); setUrl(url); @@ -83,7 +83,7 @@ public class ImageSource extends Source { * * @param url An Image url */ - public void setUrl(@NonNull URL url) { + public void setUrl(URL url) { setUrl(url.toExternalForm()); } @@ -149,7 +149,6 @@ public class ImageSource extends Source { @Keep protected native void nativeSetUrl(String url); - @NonNull @Keep protected native String nativeGetUrl(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java index 6bc6d40287..4c2b39375a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterDemSource.java @@ -1,7 +1,6 @@ package com.mapbox.mapboxsdk.style.sources; import android.support.annotation.Keep; -import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.UiThread; @@ -98,7 +97,6 @@ public class RasterDemSource extends Source { @Keep protected native void finalize() throws Throwable; - @NonNull @Keep protected native String nativeGetUrl(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java index 1390a1c055..dac9b02166 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/RasterSource.java @@ -1,7 +1,6 @@ package com.mapbox.mapboxsdk.style.sources; import android.support.annotation.Keep; -import android.support.annotation.NonNull; import android.support.annotation.Nullable; import java.net.URL; @@ -97,7 +96,6 @@ public class RasterSource extends Source { @Keep protected native void finalize() throws Throwable; - @NonNull @Keep protected native String nativeGetUrl(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java index 44f4a6c344..14d9ef1cc5 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java @@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.style.sources; import android.support.annotation.Keep; -import android.support.annotation.NonNull; import com.mapbox.mapboxsdk.utils.ThreadUtils; /** @@ -40,7 +39,6 @@ public abstract class Source { * * @return the source id */ - @NonNull public String getId() { checkThread(); return nativeGetId(); @@ -54,7 +52,6 @@ public abstract class Source { * * @return the string representation of the attribution in html format */ - @NonNull public String getAttribution() { checkThread(); return nativeGetAttribution(); @@ -69,11 +66,9 @@ public abstract class Source { return nativePtr; } - @NonNull @Keep protected native String nativeGetId(); - @NonNull @Keep protected native String nativeGetAttribution(); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/TileSet.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/TileSet.java index 1e4be24189..25df2d91e7 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/TileSet.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/TileSet.java @@ -1,6 +1,5 @@ package com.mapbox.mapboxsdk.style.sources; -import android.support.annotation.NonNull; import android.support.annotation.Size; import com.mapbox.mapboxsdk.geometry.LatLng; @@ -282,11 +281,10 @@ public class TileSet { this.center = center; } - public void setCenter(@NonNull LatLng center) { + public void setCenter(LatLng center) { this.center = new Float[] {(float) center.getLongitude(), (float) center.getLatitude()}; } - @NonNull Map<String, Object> toValueObject() { Map<String, Object> result = new HashMap<>(); result.put("tilejson", tilejson); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java index 7028530f1f..5888eaa7e1 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java @@ -97,11 +97,9 @@ public class VectorSource extends Source { @Keep protected native void finalize() throws Throwable; - @NonNull @Keep protected native String nativeGetUrl(); - @NonNull @Keep private native Feature[] querySourceFeatures(String[] sourceLayerId, Object[] filter); |