* Otherwise, recompute and return it.
*/
- public T get(@Nonnull Supplier
* TODO this ugliness can be removed when the bug gets fixed
*/
- @Nonnull
static Collection
* TODO this ugliness can be removed when the bug gets fixed
*/
- @Nonnull
static Collection
+ * See {@link graphql.Directives#OneOfDirective}
+ */
+public class OneOfInputValidator {
+
+ /**
+ * Validate that the {@code parent} {@code map} only has one entry.
+ *
+ * @param map The input to validate.
+ * @param inputTypeName The name of the type annotated with @oneOf. The name is used in
+ * the error message only, in case the validation fails.
+ * @param definedFields The name of the fields the @oneOf directive apply to.
+ *
+ * @return the field with a value set.
+ */
+ public static String validateOneOf(
+ Map
* This parameter is optional. If {@code null} GTFS files are loaded from {@code baseDirectory}.
*/
- @Nonnull
List
* This parameter is optional. If {@code null} Netex files are loaded from {@code baseDirectory}.
*/
- @Nonnull
List
- * The main strategy handling collections in OTP is to avoid nullable collection fields and use empty
- * collections instead. So, before using this method check if the variable/field is indeed `@Nullable`.
+ * The main strategy for handling collections in OTP is to avoid nullable collection fields and
+ * use empty collections instead. So, before using this method check if the variable/field is
+ * indeed `@Nullable`.
*
* If the collection is {@code null} then {@code true} is returned.
*
@@ -50,6 +51,19 @@ public static boolean isEmpty(@Nullable Collection c) {
return c == null || c.isEmpty();
}
+ /**
+ * A null-safe version of isEmpty() for a collection.
+ *
+ * If the collection is {@code null} then {@code true} is returned.
+ *
+ * If the collection is empty then {@code true} is returned.
+ *
+ * Otherwise {@code false} is returned.
+ */
+ public static boolean isEmpty(@Nullable Map m) {
+ return m == null || m.isEmpty();
+ }
+
/**
* Look up the given key in a Map, return null if the key is null.
* This prevents a NullPointerException if the underlying implementation of the map does not
diff --git a/src/main/java/org/opentripplanner/framework/collection/CollectionsView.java b/application/src/main/java/org/opentripplanner/framework/collection/CollectionsView.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/collection/CollectionsView.java
rename to application/src/main/java/org/opentripplanner/framework/collection/CollectionsView.java
diff --git a/src/main/java/org/opentripplanner/framework/collection/CompositeComparator.java b/application/src/main/java/org/opentripplanner/framework/collection/CompositeComparator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/collection/CompositeComparator.java
rename to application/src/main/java/org/opentripplanner/framework/collection/CompositeComparator.java
diff --git a/src/main/java/org/opentripplanner/framework/collection/ListSection.java b/application/src/main/java/org/opentripplanner/framework/collection/ListSection.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/collection/ListSection.java
rename to application/src/main/java/org/opentripplanner/framework/collection/ListSection.java
diff --git a/src/main/java/org/opentripplanner/framework/collection/ListUtils.java b/application/src/main/java/org/opentripplanner/framework/collection/ListUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/collection/ListUtils.java
rename to application/src/main/java/org/opentripplanner/framework/collection/ListUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/collection/MapUtils.java b/application/src/main/java/org/opentripplanner/framework/collection/MapUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/collection/MapUtils.java
rename to application/src/main/java/org/opentripplanner/framework/collection/MapUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/collection/SetUtils.java b/application/src/main/java/org/opentripplanner/framework/collection/SetUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/collection/SetUtils.java
rename to application/src/main/java/org/opentripplanner/framework/collection/SetUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/concurrent/LogMDCRunnableDecorator.java b/application/src/main/java/org/opentripplanner/framework/concurrent/LogMDCRunnableDecorator.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/concurrent/LogMDCRunnableDecorator.java
rename to application/src/main/java/org/opentripplanner/framework/concurrent/LogMDCRunnableDecorator.java
diff --git a/src/main/java/org/opentripplanner/framework/concurrent/OtpRequestThreadFactory.java b/application/src/main/java/org/opentripplanner/framework/concurrent/OtpRequestThreadFactory.java
similarity index 95%
rename from src/main/java/org/opentripplanner/framework/concurrent/OtpRequestThreadFactory.java
rename to application/src/main/java/org/opentripplanner/framework/concurrent/OtpRequestThreadFactory.java
index e88bbb420cd..cb738363bcb 100644
--- a/src/main/java/org/opentripplanner/framework/concurrent/OtpRequestThreadFactory.java
+++ b/application/src/main/java/org/opentripplanner/framework/concurrent/OtpRequestThreadFactory.java
@@ -2,7 +2,6 @@
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import java.util.concurrent.ThreadFactory;
-import javax.annotation.Nonnull;
import org.opentripplanner.framework.application.LogMDCSupport;
/**
@@ -34,7 +33,7 @@ public static ThreadFactory of(String nameFormat) {
}
@Override
- public Thread newThread(@Nonnull Runnable r) {
+ public Thread newThread(Runnable r) {
if (LogMDCSupport.isRequestTracingInLoggingEnabled()) {
return delegate.newThread(new LogMDCRunnableDecorator(r));
}
diff --git a/src/main/java/org/opentripplanner/framework/doc/DocumentedEnum.java b/application/src/main/java/org/opentripplanner/framework/doc/DocumentedEnum.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/doc/DocumentedEnum.java
rename to application/src/main/java/org/opentripplanner/framework/doc/DocumentedEnum.java
diff --git a/src/main/java/org/opentripplanner/framework/error/DefaultOtpError.java b/application/src/main/java/org/opentripplanner/framework/error/DefaultOtpError.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/error/DefaultOtpError.java
rename to application/src/main/java/org/opentripplanner/framework/error/DefaultOtpError.java
diff --git a/src/main/java/org/opentripplanner/framework/error/OtpError.java b/application/src/main/java/org/opentripplanner/framework/error/OtpError.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/error/OtpError.java
rename to application/src/main/java/org/opentripplanner/framework/error/OtpError.java
diff --git a/src/main/java/org/opentripplanner/framework/functional/FunctionUtils.java b/application/src/main/java/org/opentripplanner/framework/functional/FunctionUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/functional/FunctionUtils.java
rename to application/src/main/java/org/opentripplanner/framework/functional/FunctionUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/CompactElevationProfile.java b/application/src/main/java/org/opentripplanner/framework/geometry/CompactElevationProfile.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/CompactElevationProfile.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/CompactElevationProfile.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/CompactLineStringUtils.java b/application/src/main/java/org/opentripplanner/framework/geometry/CompactLineStringUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/CompactLineStringUtils.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/CompactLineStringUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/CoordinateArrayListSequence.java b/application/src/main/java/org/opentripplanner/framework/geometry/CoordinateArrayListSequence.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/CoordinateArrayListSequence.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/CoordinateArrayListSequence.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/DirectionUtils.java b/application/src/main/java/org/opentripplanner/framework/geometry/DirectionUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/DirectionUtils.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/DirectionUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/DlugoszVarLenIntPacker.java b/application/src/main/java/org/opentripplanner/framework/geometry/DlugoszVarLenIntPacker.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/DlugoszVarLenIntPacker.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/DlugoszVarLenIntPacker.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/EncodedPolyline.java b/application/src/main/java/org/opentripplanner/framework/geometry/EncodedPolyline.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/EncodedPolyline.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/EncodedPolyline.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/GeometryUtils.java b/application/src/main/java/org/opentripplanner/framework/geometry/GeometryUtils.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/GeometryUtils.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/GeometryUtils.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/HashGridSpatialIndex.java b/application/src/main/java/org/opentripplanner/framework/geometry/HashGridSpatialIndex.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/HashGridSpatialIndex.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/HashGridSpatialIndex.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/PolylineEncoder.java b/application/src/main/java/org/opentripplanner/framework/geometry/PolylineEncoder.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/PolylineEncoder.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/PolylineEncoder.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/SphericalDistanceLibrary.java b/application/src/main/java/org/opentripplanner/framework/geometry/SphericalDistanceLibrary.java
similarity index 95%
rename from src/main/java/org/opentripplanner/framework/geometry/SphericalDistanceLibrary.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/SphericalDistanceLibrary.java
index 38c80e86d79..531170ad137 100644
--- a/src/main/java/org/opentripplanner/framework/geometry/SphericalDistanceLibrary.java
+++ b/application/src/main/java/org/opentripplanner/framework/geometry/SphericalDistanceLibrary.java
@@ -196,6 +196,20 @@ public static double metersToLonDegrees(double distanceMeters, double latDeg) {
return dLatDeg / minCosLat;
}
+ /**
+ * Approximately move a coordinate a given number of meters. This will fail if crossing the anti-
+ * meridian or any of the poles.
+ */
+ public static WgsCoordinate moveMeters(
+ WgsCoordinate coordinate,
+ double latMeters,
+ double lonMeters
+ ) {
+ var degreesLat = metersToDegrees(latMeters);
+ var degreesLon = metersToLonDegrees(lonMeters, coordinate.latitude());
+ return coordinate.add(degreesLat, degreesLon);
+ }
+
public static Envelope bounds(double lat, double lon, double latDistance, double lonDistance) {
double radiusOfEarth = RADIUS_OF_EARTH_IN_M;
diff --git a/src/main/java/org/opentripplanner/framework/geometry/SplitLineString.java b/application/src/main/java/org/opentripplanner/framework/geometry/SplitLineString.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/SplitLineString.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/SplitLineString.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/UnsupportedGeometryException.java b/application/src/main/java/org/opentripplanner/framework/geometry/UnsupportedGeometryException.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/geometry/UnsupportedGeometryException.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/UnsupportedGeometryException.java
diff --git a/src/main/java/org/opentripplanner/framework/geometry/WgsCoordinate.java b/application/src/main/java/org/opentripplanner/framework/geometry/WgsCoordinate.java
similarity index 88%
rename from src/main/java/org/opentripplanner/framework/geometry/WgsCoordinate.java
rename to application/src/main/java/org/opentripplanner/framework/geometry/WgsCoordinate.java
index e818d50c1f6..6c3dbf0f9d3 100644
--- a/src/main/java/org/opentripplanner/framework/geometry/WgsCoordinate.java
+++ b/application/src/main/java/org/opentripplanner/framework/geometry/WgsCoordinate.java
@@ -163,6 +163,34 @@ public WgsCoordinate roundToApproximate100m() {
return new WgsCoordinate(lat, lng);
}
+ /**
+ * Return a new coordinate that is moved an approximate number of meters east.
+ */
+ public WgsCoordinate moveEastMeters(double meters) {
+ return SphericalDistanceLibrary.moveMeters(this, 0, meters);
+ }
+
+ /**
+ * Return a new coordinate that is moved an approximate number of meters west.
+ */
+ public WgsCoordinate moveWestMeters(double meters) {
+ return SphericalDistanceLibrary.moveMeters(this, 0, -meters);
+ }
+
+ /**
+ * Return a new coordinate that is moved an approximate number of meters north.
+ */
+ public WgsCoordinate moveNorthMeters(double meters) {
+ return SphericalDistanceLibrary.moveMeters(this, meters, 0);
+ }
+
+ /**
+ * Return a new coordinate that is moved an approximate number of meters south.
+ */
+ public WgsCoordinate moveSouthMeters(double meters) {
+ return SphericalDistanceLibrary.moveMeters(this, -meters, 0);
+ }
+
/**
* Return a string on the form: {@code "(60.12345, 11.12345)"}. Up to 5 digits are used after the
* period(.), even if the coordinate is specified with a higher precision.
diff --git a/src/main/java/org/opentripplanner/framework/graphql/GraphQLResponseSerializer.java b/application/src/main/java/org/opentripplanner/framework/graphql/GraphQLResponseSerializer.java
similarity index 100%
rename from src/main/java/org/opentripplanner/framework/graphql/GraphQLResponseSerializer.java
rename to application/src/main/java/org/opentripplanner/framework/graphql/GraphQLResponseSerializer.java
diff --git a/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java b/application/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java
similarity index 95%
rename from src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java
rename to application/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java
index 334513fd419..ff5485d75b2 100644
--- a/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java
+++ b/application/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java
@@ -4,7 +4,6 @@
import java.util.Locale;
import java.util.Map;
import java.util.Optional;
-import javax.annotation.Nonnull;
import org.opentripplanner.framework.i18n.I18NString;
public class GraphQLUtils {
@@ -65,7 +64,7 @@ private static Optional