From 35bddb9f268a109f42574305a158a2c4df1c055e Mon Sep 17 00:00:00 2001 From: "Christian P. MOMON" Date: Thu, 7 Jan 2021 02:04:37 +0100 Subject: [PATCH] Fixed organization.memberof.* checks. --- src/fr/devinsy/statoolinfos/checker/PropertyChecker.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/fr/devinsy/statoolinfos/checker/PropertyChecker.java b/src/fr/devinsy/statoolinfos/checker/PropertyChecker.java index 5d5ed4b..de04922 100644 --- a/src/fr/devinsy/statoolinfos/checker/PropertyChecker.java +++ b/src/fr/devinsy/statoolinfos/checker/PropertyChecker.java @@ -123,10 +123,10 @@ public class PropertyChecker this.organizationRules.add("organization.guide.technical", URL, PropertyMode.WISHED); this.organizationRules.add("organization.startdate", DATE, PropertyMode.WISHED); this.organizationRules.add("organization.enddate", DATE, PropertyMode.OPTIONAL); - this.organizationRules.add("organization.memberof.startdate", DATE, PropertyMode.MANDATORY); - this.organizationRules.add("organization.memberof.enddate", DATE, PropertyMode.OPTIONAL); - this.organizationRules.add("organization.memberof.status.level", "^(ACTIVE|IDLE|AWAY)$", PropertyMode.MANDATORY); - this.organizationRules.add("organization.memberof.status.description", STRING, PropertyMode.OPTIONAL); + this.organizationRules.add("organization.memberof.*.startdate", "^organization\\.memberof\\.\\S+\\.startdate$", DATE, PropertyMode.MANDATORY); + this.organizationRules.add("organization.memberof.*.enddate", "^organization\\.memberof\\.\\S+\\.enddate$", DATE, PropertyMode.OPTIONAL); + this.organizationRules.add("organization.memberof.*.status.level", "^organization\\.memberof\\.\\S+\\.status.level$", "^(ACTIVE|IDLE|AWAY)$", PropertyMode.MANDATORY); + this.organizationRules.add("organization.memberof.*.status.description", "^organization\\.memberof\\.\\S+\\.status.description$", STRING, PropertyMode.OPTIONAL); this.organizationRules.add(SUBS, URL, PropertyMode.OPTIONAL); this.organizationRules.add(METRICS_NAME, STRING, PropertyMode.OPTIONAL);