You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2008/07/14 19:58:22 UTC
svn commit: r676664 [6/12] - in /myfaces/extensions/validator: branches/
branches/jsf_1.1/ branches/jsf_1.1/core/ branches/jsf_1.1/core/src/
branches/jsf_1.1/core/src/main/ branches/jsf_1.1/core/src/main/config/
branches/jsf_1.1/core/src/main/java/ bra...
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.myfaces.extensions.validator.crossval;
+
+import org.apache.myfaces.extensions.validator.util.CrossValidationUtils;
+import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.event.PhaseEvent;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+import javax.faces.validator.ValidatorException;
+import java.util.MissingResourceException;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class CrossValidationPhaseListener implements PhaseListener {
+ private boolean isInitialized = false;
+
+ public void afterPhase(PhaseEvent event) {
+
+ try {
+ CrossValidationStorage crossValidationStorage = CrossValidationUtils.getOrInitCrossValidationStorage();
+ for (CrossValidationStorageEntry entry : crossValidationStorage.getCrossValidationStorageEntries()) {
+ try {
+ entry.getValidationStrategy().processCrossValidation(entry, crossValidationStorage);
+ } catch (ValidatorException e) {
+
+ FacesMessage facesMessage = e.getFacesMessage();
+
+ if (facesMessage != null && facesMessage.getSummary() != null && facesMessage.getDetail() != null) {
+ UIComponent component = entry.getComponent();
+ String clientId = null;
+
+ //TODO
+ if (component != null) {
+ clientId = component.getClientId(event.getFacesContext());
+ }
+
+ event.getFacesContext().addMessage(clientId, facesMessage);
+ }
+
+ event.getFacesContext().renderResponse();
+ } catch (MissingResourceException e) {
+ event.getFacesContext().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "custom validation message not found", e.toString()));
+ event.getFacesContext().renderResponse();
+ throw e;
+ }
+ }
+ } finally {
+ CrossValidationUtils.resetCrossValidationStorage();
+ }
+ }
+
+ public void beforePhase(PhaseEvent event) {
+ if (!isInitialized) {
+ if (WebXmlParameter.DEACTIVATE_CROSSVALIDATION != null && WebXmlParameter.DEACTIVATE_CROSSVALIDATION.equalsIgnoreCase("true")) {
+ ExtValUtils.deregisterPhaseListener(this);
+ } else {
+ isInitialized = true;
+ }
+ }
+ }
+
+ public PhaseId getPhaseId() {
+ return PhaseId.ANY_PHASE;
+ }
+}
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationStorage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationStorage.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationStorage.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationStorage.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.myfaces.extensions.validator.crossval;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class CrossValidationStorage {
+ private List<CrossValidationStorageEntry> crossValidationStorageEntries = new ArrayList<CrossValidationStorageEntry>();
+
+ public void add(CrossValidationStorageEntry entry) {
+ this.crossValidationStorageEntries.add(entry);
+ }
+
+ public List<CrossValidationStorageEntry> getCrossValidationStorageEntries() {
+ return crossValidationStorageEntries;
+ }
+
+ public void setCrossValidationStorageEntries(List<CrossValidationStorageEntry> crossValidationStorageEntries) {
+ this.crossValidationStorageEntries = crossValidationStorageEntries;
+ }
+}
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationStorageEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationStorageEntry.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationStorageEntry.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationStorageEntry.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.myfaces.extensions.validator.crossval;
+
+import org.apache.myfaces.extensions.validator.core.annotation.AnnotationEntry;
+import org.apache.myfaces.extensions.validator.crossval.strategy.CrossValidationStrategy;
+
+import javax.faces.component.UIComponent;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class CrossValidationStorageEntry {
+ private AnnotationEntry annotationEntry;
+ //for complex components (e.g. a table) stores the object of entry (#{entry.property})
+ private Object bean;
+ private UIComponent component;
+ private Object convertedObject;
+ private CrossValidationStrategy validationStrategy;
+
+ public AnnotationEntry getAnnotationEntry() {
+ return annotationEntry;
+ }
+
+ public void setAnnotationEntry(AnnotationEntry annotationEntry) {
+ this.annotationEntry = annotationEntry;
+ }
+
+ public Object getBean() {
+ return bean;
+ }
+
+ public void setBean(Object bean) {
+ this.bean = bean;
+ }
+
+ public UIComponent getComponent() {
+ return component;
+ }
+
+ public void setComponent(UIComponent component) {
+ this.component = component;
+ }
+
+ public Object getConvertedObject() {
+ return convertedObject;
+ }
+
+ public void setConvertedObject(Object convertedObject) {
+ this.convertedObject = convertedObject;
+ }
+
+ public CrossValidationStrategy getValidationStrategy() {
+ return validationStrategy;
+ }
+
+ public void setValidationStrategy(CrossValidationStrategy validationStrategy) {
+ this.validationStrategy = validationStrategy;
+ }
+}
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/WebXmlParameter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/WebXmlParameter.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/WebXmlParameter.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/WebXmlParameter.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.myfaces.extensions.validator.crossval;
+
+import org.apache.myfaces.extensions.validator.util.WebXmlUtils;
+
+/**
+ * centralized in order that these information arn't spread over the complete code base
+ *
+ * @author Gerhard Petracek
+ */
+public interface WebXmlParameter {
+ static final String DEACTIVATE_CROSSVALIDATION = WebXmlUtils.getInitParameter("DEACTIVATE_CROSSVALIDATION");
+}
\ No newline at end of file
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/DateIs.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/DateIs.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/DateIs.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/DateIs.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.myfaces.extensions.validator.crossval.annotation;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+import java.text.DateFormat;
+
+/**
+ * @author Gerhard Petracek
+ */
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
+//TODO DateIsEntry (value, type)
+public @interface DateIs {
+ String[] valueOf();
+
+ /*
+ * optional section
+ */
+
+ DateIsType type() default DateIsType.same;
+
+ String validationErrorMsgKey() default "";
+
+ String notBeforeErrorMsgKey() default "wrong_date_not_before";
+
+ String notAfterErrorMsgKey() default "wrong_date_not_after";
+
+ String notEqualErrorMsgKey() default "wrong_date_not_equal";
+
+ int errorMessageDateStyle() default DateFormat.MEDIUM;
+}
\ No newline at end of file
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/DateIsType.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/DateIsType.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/DateIsType.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/DateIsType.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.myfaces.extensions.validator.crossval.annotation;
+
+/**
+ * @author Gerhard Petracek
+ */
+public enum DateIsType {
+ before, after, same //TODO: beforeOrSame, afterOrSame
+}
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/Equals.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/Equals.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/Equals.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/Equals.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.myfaces.extensions.validator.crossval.annotation;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+
+/**
+ * @author Gerhard Petracek
+ */
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
+public @interface Equals {
+ String[] value();
+
+ String validationErrorMsgKey() default "duplicated_content_required";
+}
\ No newline at end of file
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/NotEquals.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/NotEquals.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/NotEquals.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/NotEquals.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.myfaces.extensions.validator.crossval.annotation;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+
+/**
+ * @author Gerhard Petracek
+ */
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
+public @interface NotEquals {
+ String[] value();
+
+ String validationErrorMsgKey() default "duplicated_content_denied";
+}
\ No newline at end of file
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/RequiredIf.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/RequiredIf.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/RequiredIf.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/RequiredIf.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.myfaces.extensions.validator.crossval.annotation;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+
+/**
+ * @author Gerhard Petracek
+ */
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
+//TODO DateIsEntry (value, type)
+public @interface RequiredIf {
+ String[] valueOf();
+
+ /*
+ * optional section
+ */
+
+ RequiredIfType is() default RequiredIfType.not_empty;
+
+ String validationErrorMsgKey() default "empty_field";
+}
\ No newline at end of file
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/RequiredIfType.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/RequiredIfType.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/RequiredIfType.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/RequiredIfType.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.myfaces.extensions.validator.crossval.annotation;
+
+/**
+ * @author Gerhard Petracek
+ */
+public enum RequiredIfType {
+ empty, not_empty
+}
\ No newline at end of file
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/TargetAlias.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/TargetAlias.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/TargetAlias.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/TargetAlias.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.myfaces.extensions.validator.crossval.annotation;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+
+/**
+ * @author Gerhard Petracek
+ */
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
+public @interface TargetAlias {
+ String value() default "";
+}
\ No newline at end of file
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/extractor/DefaultValueBindingScanningAnnotationExtractor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/extractor/DefaultValueBindingScanningAnnotationExtractor.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/extractor/DefaultValueBindingScanningAnnotationExtractor.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/annotation/extractor/DefaultValueBindingScanningAnnotationExtractor.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.myfaces.extensions.validator.crossval.annotation.extractor;
+
+import org.apache.myfaces.extensions.validator.core.annotation.AnnotationEntry;
+import org.apache.myfaces.extensions.validator.core.annotation.extractor.DefaultComponentAnnotationExtractor;
+import org.apache.myfaces.extensions.validator.util.ELUtils;
+
+import javax.faces.context.FacesContext;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * to support the usage of vb-xpressions (to reference the target bean)
+ *
+ * @author Gerhard Petracek
+ */
+public class DefaultValueBindingScanningAnnotationExtractor extends DefaultComponentAnnotationExtractor {
+
+ @Override
+ public List<AnnotationEntry> extractAnnotations(FacesContext facesContext, Object object) {
+ //should never occur
+ if (!(object instanceof String)) {
+ return new ArrayList<AnnotationEntry>();
+ }
+
+ String valueBindingExpression = ((String) object).trim();
+
+ List<AnnotationEntry> annotationEntries = new ArrayList<AnnotationEntry>();
+
+ Class entity = ELUtils.getTypeOfValueBindingForExpression(facesContext, valueBindingExpression);
+
+ if (entity != null) {
+ //find and add annotations
+ addPropertyAccessAnnotations(entity, annotationEntries, valueBindingExpression);
+ addFieldAccessAnnotations(entity, annotationEntries, valueBindingExpression);
+ }
+
+ return annotationEntries;
+ }
+
+ protected void addPropertyAccessAnnotations(Class entity, List<AnnotationEntry> annotationEntries, String valueBindingExpression) {
+ AnnotationEntry templateEntry;
+
+ for (Method method : entity.getDeclaredMethods()) {
+ templateEntry = new AnnotationEntry();
+ templateEntry.setEntityClass(entity.getClass());
+ templateEntry.setValueBindingExpression(valueBindingExpression);
+ templateEntry.setBoundTo("[method]:" + method.getName());
+
+ addAnnotationToAnnotationEntries(annotationEntries, Arrays.asList(method.getAnnotations()), templateEntry);
+ }
+ }
+
+ protected void addFieldAccessAnnotations(Class entity, List<AnnotationEntry> annotationEntries, String valueBindingExpression) {
+ AnnotationEntry templateEntry;
+
+ for (Field field : entity.getDeclaredFields()) {
+ templateEntry = new AnnotationEntry();
+ templateEntry.setEntityClass(entity.getClass());
+ templateEntry.setValueBindingExpression(valueBindingExpression);
+ templateEntry.setBoundTo("[field]:" + field.getName());
+
+ addAnnotationToAnnotationEntries(annotationEntries, Arrays.asList(field.getAnnotations()), templateEntry);
+ }
+ }
+}
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages.properties
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages.properties?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages.properties (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/bundle/validation_messages.properties Mon Jul 14 10:58:09 2008
@@ -0,0 +1,37 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+duplicated_content_required=input is different
+duplicated_content_required_details=input is different
+
+duplicated_content_denied=same input isn't allowed
+duplicated_content_denied_details=same input isn't allowed
+
+wrong_date=wrong date
+wrong_date_details=wrong date
+
+wrong_date_not_before=date has to be after {0}
+wrong_date_not_before_details=date has to be after {0}
+
+wrong_date_not_after=date has to be before {0}
+wrong_date_not_after_details=date has to be before {0}
+
+wrong_date_not_equal=date isn't equal to {0}
+wrong_date_not_equal_details=date isn't equal to {0}
+
+empty_field=field is required
+empty_field_details=field is required
\ No newline at end of file
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/resolver/DefaultValidationErrorMessageResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/resolver/DefaultValidationErrorMessageResolver.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/resolver/DefaultValidationErrorMessageResolver.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/message/resolver/DefaultValidationErrorMessageResolver.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.myfaces.extensions.validator.crossval.message.resolver;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class DefaultValidationErrorMessageResolver extends org.apache.myfaces.extensions.validator.core.validation.message.resolver.DefaultValidationErrorMessageResolver {
+ private static String BASE_NAME = null;
+
+ @Override
+ protected String getBaseName() {
+ if (BASE_NAME == null) {
+ BASE_NAME = super.getBaseName();
+ }
+
+ return BASE_NAME;
+ }
+}
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractAliasCompareStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractAliasCompareStrategy.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractAliasCompareStrategy.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractAliasCompareStrategy.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,241 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.myfaces.extensions.validator.crossval.referencing.strategy;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.extensions.validator.core.annotation.AnnotationEntry;
+import org.apache.myfaces.extensions.validator.core.annotation.extractor.AnnotationExtractor;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorage;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
+import org.apache.myfaces.extensions.validator.crossval.annotation.TargetAlias;
+import org.apache.myfaces.extensions.validator.crossval.annotation.extractor.DefaultValueBindingScanningAnnotationExtractor;
+import org.apache.myfaces.extensions.validator.crossval.strategy.AbstractCompareStrategy;
+import org.apache.myfaces.extensions.validator.util.ELUtils;
+
+import javax.faces.context.FacesContext;
+import java.lang.reflect.Field;
+
+/**
+ * referencing validation targets - possible formats:
+ * "#{[bean_name]}:@[alias_name]" ... cross-entity validation with @TargetAlias
+ * or "@[alias_name]" ... global alias -> additional abstraction - doesn't depend on bean names, property names...
+ * component which is annotated with the @TargetAlias has to be within the same page
+ *
+ * @author Gerhard Petracek
+ */
+public class AbstractAliasCompareStrategy implements ReferencingStrategy {
+ protected final Log logger = LogFactory.getLog(getClass());
+
+ public boolean evalReferenceAndValidate(CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorage crossValidationStorage, String validationTarget, AbstractCompareStrategy compareStrategy) {
+ if (validationTarget.startsWith("@")) {
+ tryToValidateWithAlias(crossValidationStorageEntry, crossValidationStorage, validationTarget.substring(1), compareStrategy);
+ return true;
+ } else if (validationTarget.contains(":@*")) {
+ if (validateBindingFormatWithAlias(validationTarget)) {
+ tryToValidateBindingWithAlias(crossValidationStorageEntry, validationTarget, crossValidationStorage, compareStrategy, false);
+ return true;
+ }
+ } else if (validationTarget.contains(":@")) {
+ if (validateBindingFormatWithAlias(validationTarget)) {
+ tryToValidateBindingWithAlias(crossValidationStorageEntry, validationTarget, crossValidationStorage, compareStrategy, true);
+ return true;
+ }
+ }
+ return false;
+ }
+
+ protected void tryToValidateWithAlias(CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorage crossValidationStorage, String validationTarget, AbstractCompareStrategy compareStrategy) {
+ boolean validationExecuted = false;
+
+ boolean useModelValue = true;
+ if (validationTarget.startsWith("*")) {
+ useModelValue = false;
+ validationTarget = validationTarget.substring(1);
+ }
+
+ //search for TargetAlias annotations
+ for (CrossValidationStorageEntry entry : crossValidationStorage.getCrossValidationStorageEntries()) {
+
+ if (entry.getAnnotationEntry().getAnnotation() instanceof TargetAlias) {
+ validationExecuted = validateTargetWithAlias(validationTarget, crossValidationStorageEntry, entry, useModelValue, compareStrategy);
+ }
+
+ if (validationExecuted) {
+ break;
+ }
+ }
+ }
+
+ protected boolean tryToValidateBindingWithAlias(CrossValidationStorageEntry crossValidationStorageEntry, String targetProperty, CrossValidationStorage crossValidationStorage, AbstractCompareStrategy compareStrategy, boolean useModelValue) {
+ String[] crossEntityReferenceWithBinding = extractCrossEntityReferenceWithBinding(targetProperty);
+
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+
+ if (!ELUtils.isExpressionValid(facesContext, crossEntityReferenceWithBinding[0])) {
+ return false;
+ }
+
+ AnnotationExtractor extractor = new DefaultValueBindingScanningAnnotationExtractor();
+
+ String alias;
+ AnnotationEntry foundAnnotationEntry = null;
+
+ int aliasStartIndex;
+
+ if (useModelValue) {
+ aliasStartIndex = crossEntityReferenceWithBinding[1].indexOf('@') + 1;
+ } else {
+ aliasStartIndex = crossEntityReferenceWithBinding[1].indexOf('@') + 2;
+ }
+ String targetAliasName = crossEntityReferenceWithBinding[1].substring(aliasStartIndex);
+ for (AnnotationEntry entry : extractor.extractAnnotations(facesContext, crossEntityReferenceWithBinding[0])) {
+ if (entry.getAnnotation() instanceof TargetAlias) {
+ alias = ((TargetAlias) entry.getAnnotation()).value();
+ if (targetAliasName.equals(alias)) {
+ foundAnnotationEntry = entry;
+ break;
+ }
+ }
+ }
+
+ if (foundAnnotationEntry == null) {
+ return false;
+ }
+
+ Object referencedBean = null;
+ Object validationTargetObject = null;
+ if (useModelValue) {
+ referencedBean = ELUtils.getValueOfExpression(facesContext, crossEntityReferenceWithBinding[0]);
+ validationTargetObject = getValidationTargetObject(crossValidationStorageEntry, foundAnnotationEntry, referencedBean, crossValidationStorage);
+ } else {
+ for (CrossValidationStorageEntry entry : crossValidationStorage.getCrossValidationStorageEntries()) {
+ if (foundAnnotationEntry.getAnnotation() instanceof TargetAlias && entry.getAnnotationEntry().getAnnotation() != null && entry.getAnnotationEntry().getAnnotation() instanceof TargetAlias) {
+ if (((TargetAlias) foundAnnotationEntry.getAnnotation()).value().equals(((TargetAlias) entry.getAnnotationEntry().getAnnotation()).value())) {
+ validationTargetObject = entry.getConvertedObject();
+ break;
+ }
+ }
+ }
+ }
+
+ validateFoundEntry(crossValidationStorageEntry, foundAnnotationEntry, referencedBean, crossValidationStorage, validationTargetObject, compareStrategy);
+
+ return true;
+ }
+
+ protected Object getValidationTargetObject(CrossValidationStorageEntry crossValidationStorageEntry, AnnotationEntry foundAnnotationEntry, Object referencedBean, CrossValidationStorage crossValidationStorage) {
+ if (foundAnnotationEntry == null || foundAnnotationEntry.getBoundTo() == null || foundAnnotationEntry.getBoundTo().indexOf(":") < 0) {
+ //TODO logging
+ return null;
+ }
+
+ Object validationTargetObject = null;
+ String boundTo = foundAnnotationEntry.getBoundTo();
+ String name = boundTo.substring(boundTo.indexOf(":") + 1);
+ if (boundTo.startsWith("[method]")) {
+ String baseValueBindingExpression = foundAnnotationEntry.getValueBindingExpression();
+
+ String targetValueBindingExpression = baseValueBindingExpression.substring(0, baseValueBindingExpression.length() - 1) + "." + name + "}";
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+
+ if (ELUtils.isExpressionValid(facesContext, targetValueBindingExpression)) {
+ validationTargetObject = ELUtils.getValueOfExpression(facesContext, targetValueBindingExpression);
+ }
+ } else if (boundTo.startsWith("[field]")) {
+ try {
+ Field foundField;
+ try {
+ foundField = referencedBean.getClass().getDeclaredField(name);
+ foundField.setAccessible(true);
+ validationTargetObject = foundField.get(referencedBean);
+ } catch (NoSuchFieldException e) {
+ foundField = referencedBean.getClass().getDeclaredField("_" + name);
+ foundField.setAccessible(true);
+ validationTargetObject = foundField.get(referencedBean);
+ }
+ } catch (Exception e) {
+ logger.warn("couldn't access field " + name + " details: boundTo=" + boundTo, e);
+ }
+ }
+
+ return validationTargetObject;
+ }
+
+ protected void validateFoundEntry(CrossValidationStorageEntry crossValidationStorageEntry, AnnotationEntry foundAnnotationEntry, Object referencedBean, CrossValidationStorage crossValidationStorage, Object validationTargetObject, AbstractCompareStrategy compareStrategy) {
+ boolean violationFound = false;
+
+ if (compareStrategy.isViolation(crossValidationStorageEntry.getConvertedObject(), validationTargetObject, crossValidationStorageEntry.getAnnotationEntry().getAnnotation())) {
+ compareStrategy.handleTargetViolation(crossValidationStorageEntry, null);
+
+ violationFound = true;
+ }
+
+ if (violationFound) {
+ compareStrategy.processSourceComponentAfterViolation(crossValidationStorageEntry);
+ }
+ }
+
+ //TODO
+ protected boolean validateTargetWithAlias(String validationTarget, CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorageEntry entry, boolean useModelValue, AbstractCompareStrategy compareStrategy) {
+ boolean validationExecuted = false;
+ boolean violationFound = false;
+
+ if (validationTarget.equals(((TargetAlias) entry.getAnnotationEntry().getAnnotation()).value())) {
+ //get an object to store all results
+
+ Object validationTargetObject;
+
+ if (useModelValue) {
+ validationTargetObject = ELUtils.getValueOfExpression(FacesContext.getCurrentInstance(), entry.getAnnotationEntry().getValueBindingExpression());
+ } else {
+ validationTargetObject = entry.getConvertedObject();
+ }
+ if (compareStrategy.isViolation(crossValidationStorageEntry.getConvertedObject(), validationTargetObject, crossValidationStorageEntry.getAnnotationEntry().getAnnotation())) {
+ violationFound = true;
+
+ compareStrategy.handleTargetViolation(crossValidationStorageEntry, entry);
+ }
+ validationExecuted = true;
+ }
+
+ if (violationFound) {
+ compareStrategy.processSourceComponentAfterViolation(crossValidationStorageEntry);
+ }
+
+ return validationExecuted;
+ }
+
+ protected boolean validateBindingFormatWithAlias(String targetProperty) {
+ int bindingStartIndex = targetProperty.indexOf("#{");
+ int bindingEndIndex = targetProperty.indexOf("}");
+ int separatorIndex = targetProperty.indexOf(":@");
+
+ return (bindingStartIndex > -1 && bindingEndIndex > -1 && separatorIndex > -1 && bindingStartIndex < bindingEndIndex && bindingEndIndex < separatorIndex);
+ }
+
+ protected String[] extractCrossEntityReferenceWithBinding(String targetProperty) {
+ String[] result = new String[2];
+
+ result[0] = targetProperty.substring(0, targetProperty.indexOf(":"));
+ result[1] = targetProperty.substring(targetProperty.indexOf(":") + 1);
+
+ return result;
+ }
+}
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractELCompareStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractELCompareStrategy.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractELCompareStrategy.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractELCompareStrategy.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.myfaces.extensions.validator.crossval.referencing.strategy;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.extensions.validator.core.ProcessedInformationEntry;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorage;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
+import org.apache.myfaces.extensions.validator.crossval.strategy.AbstractCompareStrategy;
+import org.apache.myfaces.extensions.validator.util.ELUtils;
+import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+
+import javax.faces.context.FacesContext;
+import java.util.Map;
+
+/**
+ * referencing validation targets - possible formats:
+ * "#{[bean_name].[property_name]}" ... cross-entity validation with value binding
+ *
+ * @author Gerhard Petracek
+ */
+public class AbstractELCompareStrategy implements ReferencingStrategy {
+ protected final Log logger = LogFactory.getLog(getClass());
+
+ public boolean evalReferenceAndValidate(CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorage crossValidationStorage, String validationTarget, AbstractCompareStrategy compareStrategy) {
+ if (validationTarget.startsWith("#{") && validationTarget.endsWith("}") && validateValueBindingFormat(validationTarget)) {
+ tryToValidateValueBinding(crossValidationStorageEntry, validationTarget, crossValidationStorage, compareStrategy);
+ return true;
+ }
+ return false;
+ }
+
+ protected boolean tryToValidateValueBinding(CrossValidationStorageEntry crossValidationStorageEntry, String validationTarget, CrossValidationStorage crossValidationStorage, AbstractCompareStrategy compareStrategy) {
+ boolean violationFound = false;
+
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+
+ if (!ELUtils.isExpressionValid(facesContext, validationTarget)) {
+ return false;
+ }
+
+ if (compareStrategy.isViolation(crossValidationStorageEntry.getConvertedObject(), ELUtils.getValueOfExpression(facesContext, validationTarget), crossValidationStorageEntry.getAnnotationEntry().getAnnotation())) {
+
+ ProcessedInformationEntry validationTargetEntry;
+ Map<String, ProcessedInformationEntry> valueBindingConvertedValueMapping = ExtValUtils.getOrInitValueBindingConvertedValueMapping();
+
+ validationTargetEntry = valueBindingConvertedValueMapping.get(validationTarget);
+
+ CrossValidationStorageEntry tmpCrossValidationStorageEntry = null;
+
+ if (validationTargetEntry != null) {
+ tmpCrossValidationStorageEntry = new CrossValidationStorageEntry();
+ tmpCrossValidationStorageEntry.setComponent(validationTargetEntry.getComponent());
+ tmpCrossValidationStorageEntry.setConvertedObject(validationTargetEntry.getConvertedValue());
+ tmpCrossValidationStorageEntry.setValidationStrategy(compareStrategy);
+ }
+
+ compareStrategy.handleTargetViolation(crossValidationStorageEntry, tmpCrossValidationStorageEntry);
+
+ violationFound = true;
+ }
+
+ if (violationFound) {
+ compareStrategy.processSourceComponentAfterViolation(crossValidationStorageEntry);
+ }
+
+ return true;
+ }
+
+ protected boolean validateValueBindingFormat(String targetProperty) {
+ int bindingStartIndex = targetProperty.indexOf("#{");
+ int bindingEndIndex = targetProperty.indexOf("}");
+ int separatorIndex = targetProperty.indexOf(".");
+
+ return (bindingStartIndex > -1 && bindingEndIndex > -1 && separatorIndex > -1 && bindingStartIndex < bindingEndIndex && bindingEndIndex > separatorIndex);
+ }
+}
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractLocalCompareStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractLocalCompareStrategy.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractLocalCompareStrategy.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/AbstractLocalCompareStrategy.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.myfaces.extensions.validator.crossval.referencing.strategy;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.extensions.validator.core.ProcessedInformationEntry;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorage;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
+import org.apache.myfaces.extensions.validator.crossval.strategy.AbstractCompareStrategy;
+import org.apache.myfaces.extensions.validator.util.ELUtils;
+import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+
+import javax.faces.context.FacesContext;
+import java.util.Map;
+
+/**
+ * "[property_name]" ... local validation -> cross-component, but no cross-entity validation
+ *
+ * @author Gerhard Petracek
+ */
+public class AbstractLocalCompareStrategy implements ReferencingStrategy {
+ protected final Log logger = LogFactory.getLog(getClass());
+
+ public boolean evalReferenceAndValidate(CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorage crossValidationStorage, String validationTarget, AbstractCompareStrategy compareStrategy) {
+ tryToValidateLocally(crossValidationStorageEntry, validationTarget, compareStrategy);
+
+ //TODO
+ return true;
+ }
+
+ protected void tryToValidateLocally(CrossValidationStorageEntry crossValidationStorageEntry, String validationTarget, AbstractCompareStrategy compareStrategy) {
+ boolean violationFound = false;
+
+ String baseValueBindingExpression = crossValidationStorageEntry.getAnnotationEntry().getValueBindingExpression();
+ baseValueBindingExpression = baseValueBindingExpression.substring(0, baseValueBindingExpression.lastIndexOf("."));
+
+ String targetValueBindingExpression;
+
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+
+ Map<String, ProcessedInformationEntry> valueBindingConvertedValueMapping = ExtValUtils.getOrInitValueBindingConvertedValueMapping();
+ ProcessedInformationEntry validationTargetEntry;
+
+ targetValueBindingExpression = baseValueBindingExpression + "." + validationTarget + "}";
+
+ if (!ELUtils.isExpressionValid(facesContext, targetValueBindingExpression)) {
+ return;
+ }
+
+ if (!valueBindingConvertedValueMapping.containsKey(targetValueBindingExpression)) {
+ return;
+ }
+ validationTargetEntry = compareStrategy.resolveValidationTargetEntry(valueBindingConvertedValueMapping, targetValueBindingExpression, crossValidationStorageEntry.getBean());
+
+ if (validationTargetEntry == null) {
+ logger.warn("couldn't find converted object for " + targetValueBindingExpression);
+ return;
+ }
+
+ if (compareStrategy.isViolation(crossValidationStorageEntry.getConvertedObject(), validationTargetEntry.getConvertedValue(), crossValidationStorageEntry.getAnnotationEntry().getAnnotation())) {
+
+ CrossValidationStorageEntry tmpCrossValidationStorageEntry = new CrossValidationStorageEntry();
+ if (compareStrategy.useTargetComponentToDisplayErrorMsg(crossValidationStorageEntry)) {
+ tmpCrossValidationStorageEntry.setComponent(validationTargetEntry.getComponent());
+ } else {
+ tmpCrossValidationStorageEntry.setComponent(crossValidationStorageEntry.getComponent());
+ }
+ tmpCrossValidationStorageEntry.setConvertedObject(validationTargetEntry.getConvertedValue());
+ tmpCrossValidationStorageEntry.setValidationStrategy(compareStrategy);
+
+ compareStrategy.handleTargetViolation(crossValidationStorageEntry, tmpCrossValidationStorageEntry);
+
+ violationFound = true;
+ }
+
+ if (violationFound) {
+ compareStrategy.processSourceComponentAfterViolation(crossValidationStorageEntry);
+ }
+ }
+}
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/ReferencingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/ReferencingStrategy.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/ReferencingStrategy.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/referencing/strategy/ReferencingStrategy.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.myfaces.extensions.validator.crossval.referencing.strategy;
+
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorage;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
+import org.apache.myfaces.extensions.validator.crossval.strategy.AbstractCompareStrategy;
+
+/**
+ * @author Gerhard Petracek
+ */
+public interface ReferencingStrategy {
+ boolean evalReferenceAndValidate(CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorage crossValidationStorage, String validationTarget, AbstractCompareStrategy abstractCompareStrategy);
+}
\ No newline at end of file
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,219 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.myfaces.extensions.validator.crossval.strategy;
+
+import org.apache.myfaces.extensions.validator.core.ProcessedInformationEntry;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorage;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
+import org.apache.myfaces.extensions.validator.crossval.referencing.strategy.AbstractAliasCompareStrategy;
+import org.apache.myfaces.extensions.validator.crossval.referencing.strategy.AbstractELCompareStrategy;
+import org.apache.myfaces.extensions.validator.crossval.referencing.strategy.AbstractLocalCompareStrategy;
+import org.apache.myfaces.extensions.validator.crossval.referencing.strategy.ReferencingStrategy;
+import org.apache.myfaces.extensions.validator.util.ClassUtils;
+import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import javax.faces.validator.ValidatorException;
+import java.lang.annotation.Annotation;
+import java.util.*;
+
+/**
+ * @author Gerhard Petracek
+ */
+public abstract class AbstractCompareStrategy extends AbstractCrossValidationStrategy {
+ protected static List<ReferencingStrategy> referencingStrategies;
+ protected Map<Object, Object> violationResultStorage = new HashMap<Object, Object>();
+
+ public AbstractCompareStrategy() {
+ initReferencingStrategies();
+ }
+
+ protected void initReferencingStrategies() {
+ if (referencingStrategies == null) {
+ referencingStrategies = new ArrayList<ReferencingStrategy>();
+
+ String customReferencingStrategyClassName = ExtValUtils.getBasePackage() + "ReferencingStrategy";
+ ReferencingStrategy customReferencingStrategy = (ReferencingStrategy) ClassUtils.tryToInstantiateClassForName(customReferencingStrategyClassName);
+
+ if (customReferencingStrategy != null) {
+ referencingStrategies.add(customReferencingStrategy);
+ }
+
+ referencingStrategies.add(new AbstractELCompareStrategy());
+ referencingStrategies.add(new AbstractAliasCompareStrategy());
+ referencingStrategies.add(new AbstractLocalCompareStrategy());
+ }
+ }
+
+ public void processCrossValidation(CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorage crossValidationStorage) throws ValidatorException {
+
+ String[] validationTargets = getValidationTargets(crossValidationStorageEntry.getAnnotationEntry().getAnnotation());
+
+ for (String validationTarget : validationTargets) {
+ validationTarget = validationTarget.trim();
+
+ //select validation method
+ tryToValidate(crossValidationStorageEntry, crossValidationStorage, validationTarget);
+ }
+ }
+
+ private boolean tryToValidate(CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorage crossValidationStorage, String validationTarget) {
+ for (ReferencingStrategy referencingStrategy : referencingStrategies) {
+ if (referencingStrategy.evalReferenceAndValidate(crossValidationStorageEntry, crossValidationStorage, validationTarget, this)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ //has to be public for custom referencing strategies!!!
+ public void handleTargetViolation(CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorageEntry entry) {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+
+ //get validation error messages for the target component
+ String summary = getErrorMessageSummary(crossValidationStorageEntry.getAnnotationEntry().getAnnotation(), true);
+ String details = getErrorMessageDetails(crossValidationStorageEntry.getAnnotationEntry().getAnnotation(), true);
+
+ //validation target isn't bound to a component withing the current page (see validateFoundEntry, tryToValidateLocally and tryToValidateBindingOnly)
+ if (entry == null) {
+ entry = crossValidationStorageEntry;
+ }
+
+ FacesMessage message;
+ if (entry.getAnnotationEntry() != null) {
+ message = getTargetComponentErrorMessage(entry.getAnnotationEntry().getAnnotation(), summary, details);
+ } else {
+ //TODO document possible side effects
+ //due to a missing target annotation (see: tryToValidateLocally)
+ message = getTargetComponentErrorMessage(crossValidationStorageEntry.getAnnotationEntry().getAnnotation(), summary, details);
+ }
+
+ if (message.getSummary() != null || message.getDetail() != null) {
+ facesContext.addMessage(entry.getComponent().getClientId(facesContext), message);
+ }
+ }
+
+ //has to be public for custom referencing strategies!!!
+ public void processSourceComponentAfterViolation(CrossValidationStorageEntry crossValidationStorageEntry) {
+
+ //get validation error messages for the current component
+ String summary = getErrorMessageSummary(crossValidationStorageEntry.getAnnotationEntry().getAnnotation(), false);
+ String details = getErrorMessageDetails(crossValidationStorageEntry.getAnnotationEntry().getAnnotation(), false);
+
+ FacesMessage message = getSourceComponentErrorMessage(crossValidationStorageEntry.getAnnotationEntry().getAnnotation(), summary, details);
+
+ if (message.getSummary() != null || message.getDetail() != null) {
+ //TODO
+ throw new ValidatorException(message);
+ } else {
+ throw new ValidatorException(new FacesMessage());
+ }
+ }
+
+ //has to be public for custom referencing strategies!!!
+ public FacesMessage getSourceComponentErrorMessage(Annotation annotation, String summary, String details) {
+ FacesMessage message = new FacesMessage();
+
+ message.setSeverity(FacesMessage.SEVERITY_ERROR);
+ message.setSummary(summary);
+ message.setDetail(details);
+
+ return message;
+ }
+
+ //has to be public for custom referencing strategies!!!
+ public FacesMessage getTargetComponentErrorMessage(Annotation foundAnnotation, String summary, String details) {
+ FacesMessage message = new FacesMessage();
+
+ message.setSeverity(FacesMessage.SEVERITY_ERROR);
+ message.setSummary(summary);
+ message.setDetail(details);
+
+ return message;
+ }
+
+ //has to be public for custom referencing strategies!!!
+ public ProcessedInformationEntry resolveValidationTargetEntry(Map<String, ProcessedInformationEntry> valueBindingConvertedValueMapping, String targetValueBinding, Object bean) {
+ ProcessedInformationEntry processedInformationEntry = valueBindingConvertedValueMapping.get(targetValueBinding);
+
+ //simple case
+ if (processedInformationEntry.getFurtherEntries() == null) {
+ return processedInformationEntry;
+ }
+
+ //process complex component entries (e.g. a table)
+ //supported: cross-component but no cross-entity validation (= locale validation)
+ if (processedInformationEntry.getBean().equals(bean)) {
+ return processedInformationEntry;
+ }
+
+ for (ProcessedInformationEntry entry : processedInformationEntry.getFurtherEntries()) {
+ if (entry.getBean().equals(bean)) {
+ return entry;
+ }
+ }
+
+ return null;
+ }
+
+ protected String getErrorMessageSummary(Annotation annotation, boolean isTargetComponent) {
+ return resolveMessage(getValidationErrorMsgKey(annotation, isTargetComponent));
+ }
+
+ protected String getErrorMessageDetails(Annotation annotation, boolean isTargetComponent) {
+ try {
+ String key = getValidationErrorMsgKey(annotation, isTargetComponent);
+ return (key != null) ? resolveMessage(key + DETAIL_MESSAGE_KEY_POSTFIX) : null;
+ } catch (MissingResourceException e) {
+ logger.warn("couldn't find key " + getValidationErrorMsgKey(annotation, isTargetComponent) + DETAIL_MESSAGE_KEY_POSTFIX, e);
+ }
+ return null;
+ }
+
+ protected String getValidationErrorMsgKey(Annotation annotation) {
+ return getValidationErrorMsgKey(annotation, false);
+ }
+
+ /*
+ * recommended methods to override - have to be public for custom referencing strategies!!!
+ */
+
+ /*
+ * abstract methods
+ */
+
+ protected abstract String getValidationErrorMsgKey(Annotation annotation, boolean isTargetComponent);
+
+ public abstract boolean useTargetComponentToDisplayErrorMsg(CrossValidationStorageEntry crossValidationStorageEntry);
+
+ /*
+ * implements the specific validation logic
+ */
+
+ public abstract boolean isViolation(Object object1, Object object2, Annotation annotation);
+
+ /*
+ * returns the referenced validation targets of the annotation
+ * e.g. @DateIs(type = DateIsType.before, value = "finalExam")
+ * -> method returns an array with one value ("finalExam")
+ */
+ public abstract String[] getValidationTargets(Annotation annotation);
+}
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCrossValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCrossValidationStrategy.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCrossValidationStrategy.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCrossValidationStrategy.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.myfaces.extensions.validator.crossval.strategy;
+
+import org.apache.myfaces.extensions.validator.core.annotation.AnnotationEntry;
+import org.apache.myfaces.extensions.validator.core.validation.strategy.AbstractValidationStrategy;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
+import org.apache.myfaces.extensions.validator.util.CrossValidationUtils;
+import org.apache.myfaces.extensions.validator.util.ELUtils;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.validator.ValidatorException;
+
+/**
+ * @author Gerhard Petracek
+ */
+public abstract class AbstractCrossValidationStrategy extends AbstractValidationStrategy implements CrossValidationStrategy {
+
+ //init cross-validation
+ public void processValidation(FacesContext facesContext, UIComponent uiComponent, AnnotationEntry annotationEntry, Object convertedObject) throws ValidatorException {
+ CrossValidationStorageEntry entry = getCrossValidationStorageEntry(facesContext, uiComponent, annotationEntry, convertedObject);
+
+ CrossValidationUtils.getOrInitCrossValidationStorage().add(entry);
+ }
+
+ public CrossValidationStorageEntry getCrossValidationStorageEntry(FacesContext facesContext, UIComponent uiComponent, AnnotationEntry annotationEntry, Object convertedObject) {
+ CrossValidationStorageEntry entry = new CrossValidationStorageEntry();
+
+ entry.setAnnotationEntry(annotationEntry);
+ entry.setBean(ELUtils.getBeanObject(annotationEntry.getValueBindingExpression()));
+ entry.setComponent(uiComponent);
+ entry.setConvertedObject(convertedObject);
+ entry.setValidationStrategy(this);
+
+ return entry;
+ }
+}
Added: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/CrossValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/CrossValidationStrategy.java?rev=676664&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/CrossValidationStrategy.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/cross-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/CrossValidationStrategy.java Mon Jul 14 10:58:09 2008
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.myfaces.extensions.validator.crossval.strategy;
+
+import org.apache.myfaces.extensions.validator.core.annotation.AnnotationEntry;
+import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorage;
+import org.apache.myfaces.extensions.validator.crossval.CrossValidationStorageEntry;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.validator.ValidatorException;
+
+/**
+ * @author Gerhard Petracek
+ */
+public interface CrossValidationStrategy extends ValidationStrategy {
+ CrossValidationStorageEntry getCrossValidationStorageEntry(FacesContext facesContext, UIComponent uiComponent, AnnotationEntry annotationEntry, Object convertedObject);
+
+ void processCrossValidation(CrossValidationStorageEntry crossValidationStorageEntry, CrossValidationStorage crossValidationStorage) throws ValidatorException;
+}