Skip to content

Replaced NotNull with NonNull annotation in TurfConversion class #1092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
langsmith merged 1 commit into from
Dec 17, 2019
Merged

Replaced NotNull with NonNull annotation in TurfConversion class #1092

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions services-turf/src/main/java/com/mapbox/turf/TurfConversion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import com.mapbox.geojson.Point;
import com.mapbox.geojson.Polygon;
import com.mapbox.turf.TurfConstants.TurfUnitCriteria;
import com.sun.istack.internal.NotNull;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down Expand Up @@ -218,7 +217,7 @@ public static FeatureCollection explode(@NonNull Feature feature) {
* @return a {@link Feature} object that contains {@link LineString} or {@link MultiLineString}
* @since 4.9.0
*/
public static Feature polygonToLine(@NotNull Feature feature) {
public static Feature polygonToLine(@NonNull Feature feature) {
return polygonToLine(feature, null);
}

Expand All @@ -231,7 +230,7 @@ public static Feature polygonToLine(@NotNull Feature feature) {
* @return a {@link Feature} object that contains {@link LineString} or {@link MultiLineString}
* @since 4.9.0
*/
public static Feature polygonToLine(@NotNull Feature feature, @Nullable JsonObject properties) {
public static Feature polygonToLine(@NonNull Feature feature, @Nullable JsonObject properties) {
Geometry geometry = feature.geometry();
if (geometry instanceof Polygon) {
return polygonToLine((Polygon) geometry,properties != null ? properties :
Expand All @@ -248,7 +247,7 @@ public static Feature polygonToLine(@NotNull Feature feature, @Nullable JsonObje
* @return a {@link Feature} object that contains {@link LineString} or {@link MultiLineString}
* @since 4.9.0
*/
public static Feature polygonToLine(@NotNull Polygon polygon) {
public static Feature polygonToLine(@NonNull Polygon polygon) {
return polygonToLine(polygon, null);
}

Expand All @@ -262,7 +261,7 @@ public static Feature polygonToLine(@NotNull Polygon polygon) {
* list of {@link Feature} of {@link LineString} or {@link MultiLineString}
* @since 4.9.0
*/
public static FeatureCollection polygonToLine(@NotNull MultiPolygon multiPolygon) {
public static FeatureCollection polygonToLine(@NonNull MultiPolygon multiPolygon) {
return polygonToLine(multiPolygon, null);
}

Expand All @@ -275,7 +274,7 @@ public static FeatureCollection polygonToLine(@NotNull MultiPolygon multiPolygon
* @return a {@link Feature} object that contains {@link LineString} or {@link MultiLineString}
* @since 4.9.0
*/
public static Feature polygonToLine(@NotNull Polygon polygon, @Nullable JsonObject properties) {
public static Feature polygonToLine(@NonNull Polygon polygon, @Nullable JsonObject properties) {
return coordsToLine(polygon.coordinates(), properties);
}

Expand All @@ -290,7 +289,7 @@ public static Feature polygonToLine(@NotNull Polygon polygon, @Nullable JsonObje
* list of {@link Feature} of {@link LineString} or {@link MultiLineString}
* @since 4.9.0
*/
public static FeatureCollection polygonToLine(@NotNull MultiPolygon multiPolygon,
public static FeatureCollection polygonToLine(@NonNull MultiPolygon multiPolygon,
@Nullable JsonObject properties) {
List<List<List<Point>>> coordinates = multiPolygon.coordinates();
List<Feature> finalFeatureList = new ArrayList<>();
Expand All @@ -310,7 +309,7 @@ public static FeatureCollection polygonToLine(@NotNull MultiPolygon multiPolygon
* of {@link LineString} or {@link MultiLineString}
* @since 4.9.0
*/
public static FeatureCollection multiPolygonToLine(@NotNull Feature feature) {
public static FeatureCollection multiPolygonToLine(@NonNull Feature feature) {
return multiPolygonToLine(feature, null);
}

Expand All @@ -326,7 +325,7 @@ public static FeatureCollection multiPolygonToLine(@NotNull Feature feature) {
* list of {@link Feature} of {@link LineString} or {@link MultiLineString}
* @since 4.9.0
*/
public static FeatureCollection multiPolygonToLine(@NotNull Feature feature,
public static FeatureCollection multiPolygonToLine(@NonNull Feature feature,
@Nullable JsonObject properties) {
Geometry geometry = feature.geometry();
if (geometry instanceof MultiPolygon) {
Expand All @@ -337,7 +336,7 @@ public static FeatureCollection multiPolygonToLine(@NotNull Feature feature,
}

@Nullable
private static Feature coordsToLine(@NotNull List<List<Point>> coordinates,
private static Feature coordsToLine(@NonNull List<List<Point>> coordinates,
@Nullable JsonObject properties) {
if (coordinates.size() > 1) {
return Feature.fromGeometry(MultiLineString.fromLngLats(coordinates), properties);
Expand Down