From c1fda2066da6f072b645e40ff06a21b81d056696 Mon Sep 17 00:00:00 2001
From: Tobrun
Date: Wed, 24 Jan 2018 13:52:31 +0100
Subject: [android] - add SafeVarargs to Expression methods
---
.../mapboxsdk/style/expressions/Expression.java | 24 +++++++++++++++++++---
1 file changed, 21 insertions(+), 3 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 4d09fcaac6..a96b17b8ac 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
@@ -68,6 +68,7 @@ public class Expression {
* @param operator the expression operator
* @param arguments expressions input
*/
+ @SafeVarargs
public Expression(@NonNull String operator, @Nullable Expression... arguments) {
this.operator = operator;
this.arguments = arguments;
@@ -157,7 +158,7 @@ public class Expression {
* Is used for first parameter of {@link #interpolate(Expression, Expression, Stop...)}.
*
*/
- private static class Interpolator {
+ public static class Interpolator {
}
/**
@@ -587,6 +588,7 @@ public class Expression {
* @param input expression input
* @return expression
*/
+ @SafeVarargs
public static Expression all(@NonNull Expression... input) {
return new Expression<>("all", input);
}
@@ -602,6 +604,7 @@ public class Expression {
* @param input expression input
* @return expression
*/
+ @SafeVarargs
public static Expression any(@NonNull Expression... input) {
return new Expression<>("any", input);
}
@@ -632,6 +635,7 @@ public class Expression {
* @param input expression input
* @return expression
*/
+ @SafeVarargs
public static Expression switchCase(@NonNull @Size(min = 1) Expression... input) {
return new Expression("case", input);
}
@@ -782,7 +786,7 @@ public class Expression {
* @param object an expression object
* @return expression
*/
- public static Expression get(@NonNull Expression key, @NonNull Expression