Add null checks in rules

Author: testower

README.md

@@ -38,6 +38,7 @@ Existing rules:
 Planned rules:
 
 * Either station_information or station_status is required if the other is present
-* vehicle_types is required vehicle types are referenced in other files
+  * Can this be checked by cross-checking ids between files - using schema patching?
+* vehicle_types is required if vehicle types are referenced in other files (already covered?)
 * system_pricing_plans is required if pricing plans are referenced in other files
 

src/main/java/org/entur/gbfs/validation/validator/rules/VehicleTypeDefaultPricingPlanIdExistsInSystemPricingPlans.java

@@ -40,9 +40,13 @@ public class VehicleTypeDefaultPricingPlanIdExistsInSystemPricingPlans implement
     @Override
     public DocumentContext addRule(DocumentContext rawSchemaDocumentContext, Map<String, JSONObject> feeds) {
         JSONObject pricingPlansFeed = feeds.get("system_pricing_plans");
-        JSONArray pricingPlanIds = JsonPath.parse(pricingPlansFeed).read("$.data.plans[*].plan_id");
         JSONObject defaultPricingPlanIdSchema = rawSchemaDocumentContext.read(DEFAULT_PRICING_PLAN_ID_SCHEMA_PATH);
-        defaultPricingPlanIdSchema.put("enum", pricingPlanIds);
+
+        if (pricingPlansFeed != null) {
+            JSONArray pricingPlanIds = JsonPath.parse(pricingPlansFeed).read("$.data.plans[*].plan_id");
+            defaultPricingPlanIdSchema.put("enum", pricingPlanIds);
+        }
+
         return rawSchemaDocumentContext.set(DEFAULT_PRICING_PLAN_ID_SCHEMA_PATH, defaultPricingPlanIdSchema);
     }
 }

src/main/java/org/entur/gbfs/validation/validator/rules/VehicleTypeIdsInVehicleTypesAvailableExistsInVehicleTypes.java

@@ -40,9 +40,13 @@ public class VehicleTypeIdsInVehicleTypesAvailableExistsInVehicleTypes implement
     @Override
     public DocumentContext addRule(DocumentContext rawSchemaDocumentContext, Map<String, JSONObject> feeds) {
         JSONObject vehicleTypesFeed = feeds.get("vehicle_types");
-        JSONArray vehicleTypeIds = JsonPath.parse(vehicleTypesFeed).read("$.data.vehicle_types[*].vehicle_type_id");
         JSONObject vehicleTypeIdSchema = rawSchemaDocumentContext.read(VEHICLE_TYPE_ID_SCHEMA_PATH);
-        vehicleTypeIdSchema.put("enum", vehicleTypeIds);
+
+        if (vehicleTypesFeed != null) {
+            JSONArray vehicleTypeIds = JsonPath.parse(vehicleTypesFeed).read("$.data.vehicle_types[*].vehicle_type_id");
+            vehicleTypeIdSchema.put("enum", vehicleTypeIds);
+        }
+
         return rawSchemaDocumentContext.set(VEHICLE_TYPE_ID_SCHEMA_PATH, vehicleTypeIdSchema);
     }
 }