/*
 * Copyright 2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.broadleafcommerce.openadmin.server.service.persistence.validation;

import org.broadleafcommerce.openadmin.dto.Entity;

import java.io.Serializable;
import java.util.Map;


/**
 * Validates a field against a configured 'regularExpression' item
 * 
 * @author Phillip Verheyden
 */
public class RegexPropertyValidator implements PropertyValidator {

    @Override
    public boolean validate(Entity entity, Map<String, String> validationConfiguration, Serializable instance, String value) {
        String expression = validationConfiguration.get("regularExpression");
        return value.matches(expression);
    }

}

@@ -1204,16 +1204,41 @@
   return
+ (value == null) ? true :
  value.m

Update regex property validator such that it works with null