Changeset 12713 in josm for trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java

Timestamp:

2017-09-03T12:32:11+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - remove dependencies of CheckParameterUtil on various data classes

File:

• trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java

@@ -3 +3 @@
 
 import java.text.MessageFormat;
+import java.util.function.Predicate;
 
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -21 +22 @@
 
     /**
+     * Ensures that a parameter is not null and that a certain condition holds.
+     * @param <T> parameter type
+     * @param obj parameter value
+     * @param parameterName parameter name
+     * @param conditionMsg string, stating the condition
+     * @param condition the condition to check
+     * @throws IllegalArgumentException in case the object is null or the condition
+     * is violated
+     * @since 12713
+     */
+    public static <T> void ensure(T obj, String parameterName, String conditionMsg, Predicate<T> condition) {
+        ensureParameterNotNull(obj, parameterName);
+        if (!condition.test(obj))
+            throw new IllegalArgumentException(
+                    MessageFormat.format("Parameter value ''{0}'' of type {1} is invalid, violated condition: ''{2}'', got ''{3}''",
+                            parameterName,
+                            obj.getClass().getCanonicalName(),
+                            conditionMsg,
+                            obj));
+    }
+
+    /**
+     * Ensures that a parameter is not null and that a certain condition holds.
+     * @param <T> parameter type
+     * @param obj parameter value
+     * @param parameterName parameter name
+     * @param condition the condition to check
+     * @throws IllegalArgumentException in case the object is null or the condition
+     * is violated
+     * @since 12713
+     */
+    public static <T> void ensure(T obj, String parameterName, Predicate<T> condition) {
+        ensureParameterNotNull(obj, parameterName);
+        if (!condition.test(obj))
+            throw new IllegalArgumentException(
+                    MessageFormat.format("Parameter value ''{0}'' of type {1} is invalid, got ''{2}''",
+                            parameterName,
+                            obj.getClass().getCanonicalName(),
+                            obj));
+    }
+
+    /**
      * Ensures an OSM primitive ID is valid
      * @param id The id to check
      * @param parameterName The parameter name
      * @throws IllegalArgumentException if the primitive ID is not valid (negative or zero)
+     * @deprecated use {@link #ensure(Object, String, String, Predicate)}
      */
+    @Deprecated
     public static void ensureValidPrimitiveId(PrimitiveId id, String parameterName) {
         ensureParameterNotNull(id, parameterName);
@@ -39 +84 @@
      * @throws IllegalArgumentException if the lat/lon are {@code null} or not valid
      * @since 5980
+     * @deprecated use {@link #ensure(Object, String, Predicate)}
      */
+    @Deprecated
     public static void ensureValidCoordinates(LatLon latlon, String parameterName) {
         ensureParameterNotNull(latlon, parameterName);
@@ -53 +100 @@
      * @throws IllegalArgumentException if the east/north are {@code null} or not valid
      * @since 5980
+     * @deprecated use {@link #ensure(Object, String, Predicate)}
      */
+    @Deprecated
     public static void ensureValidCoordinates(EastNorth eastnorth, String parameterName) {
         ensureParameterNotNull(eastnorth, parameterName);
@@ -66 +115 @@
      * @param parameterName The parameter name
      * @throws IllegalArgumentException if the version is not valid (negative)
+     * @deprecated use {@link #ensure(Object, String, String, Predicate)}
      */
+    @Deprecated
     public static void ensureValidVersion(long version, String parameterName) {
         if (version < 0)
@@ -113 +164 @@
      * @throws IllegalArgumentException if id is null
      * @throws IllegalArgumentException if id.getType() != NODE
+     * @deprecated use {@link #ensure(Object, String, String, Predicate)}
      */
+    @Deprecated
     public static void ensureValidNodeId(PrimitiveId id, String parameterName) {
         ensureParameterNotNull(id, parameterName);