------------------------------------------------------------
revno: 17765
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Mon 2014-12-22 10:29:06 +0100
message:
supports more validation types in SchemaValidator, wip
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/DefaultSchemaValidator.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/DefaultSchemaValidator.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/DefaultSchemaValidator.java 2014-12-22 08:04:25 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/DefaultSchemaValidator.java 2014-12-22 09:29:06 +0000
@@ -28,14 +28,18 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.apache.commons.validator.GenericValidator;
import org.hisp.dhis.common.IdentifiableObject;
import org.hisp.dhis.schema.Property;
+import org.hisp.dhis.schema.PropertyType;
import org.hisp.dhis.schema.Schema;
import org.hisp.dhis.schema.SchemaService;
import org.hisp.dhis.system.util.ReflectionUtils;
+import org.hisp.dhis.system.util.ValidationUtils;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
/**
@@ -68,12 +72,133 @@
continue;
}
- if ( String.class.isInstance( value ) && property.getMax() < ((String) value).length() )
- {
- validationViolations.add( new ValidationViolation( "Property '" + property.getName() + "' is too long ("
- + ((String) value).length() + "), maximum length is " + property.getMax() ) );
- continue;
- }
+ validationViolations.addAll( validateString( value, property ) );
+ validationViolations.addAll( validateCollection( value, property ) );
+ validationViolations.addAll( validateInteger( value, property ) );
+ validationViolations.addAll( validateFloat( value, property ) );
+ validationViolations.addAll( validateDouble( value, property ) );
+ }
+
+ return validationViolations;
+ }
+
+ private Collection<? extends ValidationViolation> validateString( Object object, Property property )
+ {
+ List<ValidationViolation> validationViolations = new ArrayList<>();
+
+ if ( !String.class.isInstance( object ) )
+ {
+ return validationViolations;
+ }
+
+ String value = (String) object;
+
+ if ( value.length() < property.getMin() || value.length() > property.getMax() )
+ {
+ validationViolations.add( new ValidationViolation( "Value violates allowed range for length ["
+ + property.getMin() + ", " + property.getMax() + "], length is " + value.length() ) );
+ }
+
+ if ( PropertyType.EMAIL == property.getPropertyType() && !GenericValidator.isEmail( value ) )
+ {
+ validationViolations.add( new ValidationViolation( "Value is not a valid email." ) );
+ }
+
+ if ( PropertyType.URL == property.getPropertyType() && !GenericValidator.isUrl( value ) )
+ {
+ validationViolations.add( new ValidationViolation( "Value is not a valid URL." ) );
+ }
+
+ if ( PropertyType.PASSWORD == property.getPropertyType() && !ValidationUtils.passwordIsValid( value ) )
+ {
+ validationViolations.add( new ValidationViolation( "Value is not a valid password." ) );
+ }
+
+ /* TODO add proper validation for both Points and Polygons, ValidationUtils only supports points at this time
+ if ( PropertyType.GEOLOCATION == property.getPropertyType() && !ValidationUtils.coordinateIsValid( value ) )
+ {
+ validationViolations.add( new ValidationViolation( "Value is not a valid coordinate pair [lon, lat]." ) );
+ }
+ */
+
+ return validationViolations;
+ }
+
+ private Collection<? extends ValidationViolation> validateCollection( Object object, Property property )
+ {
+ List<ValidationViolation> validationViolations = new ArrayList<>();
+
+ if ( !Collection.class.isInstance( object ) )
+ {
+ return validationViolations;
+ }
+
+ Collection value = (Collection) object;
+
+ if ( value.size() < property.getMin() || value.size() > property.getMax() )
+ {
+ validationViolations.add( new ValidationViolation( "Value violates allowed range for size ["
+ + property.getMin() + ", " + property.getMax() + "], length is " + value.size() ) );
+ }
+
+ return validationViolations;
+ }
+
+ private Collection<? extends ValidationViolation> validateInteger( Object object, Property property )
+ {
+ List<ValidationViolation> validationViolations = new ArrayList<>();
+
+ if ( !Integer.class.isInstance( object ) )
+ {
+ return validationViolations;
+ }
+
+ Integer value = (Integer) object;
+
+ if ( !GenericValidator.isInRange( value, property.getMin(), property.getMax() ) )
+ {
+ validationViolations.add( new ValidationViolation( "Value violates allowed range for value ["
+ + property.getMin() + ", " + property.getMax() + "], value is " + value ) );
+ }
+
+ return validationViolations;
+ }
+
+ private Collection<? extends ValidationViolation> validateFloat( Object object, Property property )
+ {
+ List<ValidationViolation> validationViolations = new ArrayList<>();
+
+ if ( !Float.class.isInstance( object ) )
+ {
+ return validationViolations;
+ }
+
+ Float value = (Float) object;
+
+ if ( !GenericValidator.isInRange( value, property.getMin(), property.getMax() ) )
+ {
+ validationViolations.add( new ValidationViolation( "Value violates allowed range for value ["
+ + property.getMin() + ", " + property.getMax() + "], value is " + value ) );
+ }
+
+ return validationViolations;
+ }
+
+ private Collection<? extends ValidationViolation> validateDouble( Object object, Property property )
+ {
+ List<ValidationViolation> validationViolations = new ArrayList<>();
+
+ if ( !Double.class.isInstance( object ) )
+ {
+ return validationViolations;
+ }
+
+ Double value = (Double) object;
+
+ if ( !GenericValidator.isInRange( value, property.getMin(), property.getMax() ) )
+ {
+ validationViolations.add( new ValidationViolation( "Value violates allowed range for value ["
+ + property.getMin() + ", " + property.getMax() + "], value is " + value ) );
}
return validationViolations;
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
