Merge branch 'master' of github.com:thingsboard/thingsboard

@@ -24,6 +24,8 @@ import java.io.Serializable;
 @Data
 public class ClaimData implements Serializable {
 
+    private static final long serialVersionUID = -3922621193389915930L;
+
     private final String secretKey;
     private final long expirationTime;
 

@@ -39,6 +39,8 @@ import static org.thingsboard.server.common.data.SearchTextBasedWithAdditionalIn
 @Slf4j
 public class TenantProfile extends SearchTextBased<TenantProfileId> implements HasName {
 
+    private static final long serialVersionUID = 3021989561267192281L;
+
     @NoXss
     @ApiModelProperty(position = 3, value = "Name of the tenant profile", example = "High Priority Tenants")
     private String name;

@@ -24,6 +24,8 @@ import java.util.Optional;
  */
 public class BaseAttributeKvEntry implements AttributeKvEntry {
 
+    private static final long serialVersionUID = -6460767583563159407L;
+
     private final long lastUpdateTs;
     private final KvEntry kv;
 

@@ -25,6 +25,8 @@ import java.io.Serializable;
 @Data
 public class SecuritySettings implements Serializable {
 
+    private static final long serialVersionUID = -1307613974597312465L;
+
     @ApiModelProperty(position = 1, value = "The user password policy object." )
     private UserPasswordPolicy passwordPolicy;
     @ApiModelProperty(position = 2, value = "Maximum number of failed login attempts allowed before user account is locked." )

@@ -45,24 +45,42 @@ public class GeoUtil {
     }
 
     public static synchronized boolean contains(String polygon, Coordinates coordinates) {
-        ShapeFactory.PolygonBuilder polygonBuilder = jtsCtx.getShapeFactory().polygon();
         JsonArray polygonArray = new JsonParser().parse(polygon).getAsJsonArray();
-        boolean first = true;
+
+        JsonArray arrayWithCoords = polygonArray;
+        JsonArray innerArray = polygonArray.get(0).getAsJsonArray();
+        if (!containsPrimitives(innerArray)) {
+            arrayWithCoords = innerArray;
+        }
+
+        Shape shape = buildPolygonFromJsonCoords(arrayWithCoords);
+        Point point = jtsCtx.getShapeFactory().pointXY(coordinates.getLongitude(), coordinates.getLatitude());
+        return shape.relate(point).equals(SpatialRelation.CONTAINS);
+    }
+
+    private static Shape buildPolygonFromJsonCoords(JsonArray coordinates) {
+        ShapeFactory.PolygonBuilder polygonBuilder = jtsCtx.getShapeFactory().polygon();
+        boolean isFirst = true;
         double firstLat = 0.0;
         double firstLng = 0.0;
-        for (JsonElement jsonElement : polygonArray) {
-            double lat = jsonElement.getAsJsonArray().get(0).getAsDouble();
-            double lng = jsonElement.getAsJsonArray().get(1).getAsDouble();
-            if (first) {
+        for (JsonElement element : coordinates) {
+            double lat = element.getAsJsonArray().get(0).getAsDouble();
+            double lng = element.getAsJsonArray().get(1).getAsDouble();
+            if (isFirst) {
                 firstLat = lat;
                 firstLng = lng;
-                first = false;
+                isFirst = false;
             }
-            polygonBuilder.pointXY(jtsCtx.getShapeFactory().normX(lng), jtsCtx.getShapeFactory().normY(lat));
+            polygonBuilder.pointXY(jtsCtx.getShapeFactory().normX(lng), jtsCtx.getShapeFactory().normX(lat));
         }
-        polygonBuilder.pointXY(jtsCtx.getShapeFactory().normX(firstLng), jtsCtx.getShapeFactory().normY(firstLat));
-        Shape shape = polygonBuilder.buildOrRect();
-        Point point = jtsCtx.getShapeFactory().pointXY(coordinates.getLongitude(), coordinates.getLatitude());
-        return shape.relate(point).equals(SpatialRelation.CONTAINS);
+        polygonBuilder.pointXY(jtsCtx.getShapeFactory().normX(firstLng), jtsCtx.getShapeFactory().normX(firstLat));
+        return polygonBuilder.buildOrRect();
+    }
+
+    private static boolean containsPrimitives(JsonArray array) {
+        for (JsonElement element : array) {
+            return element.isJsonPrimitive();
+        }
+        return false;
     }
 }