From f03969dad8c66500a4d8a70ce9f675e401f14d64 Mon Sep 17 00:00:00 2001
From: cnenning <cnenning@apache.org>
Date: Wed, 10 Jun 2015 14:27:17 +0200
Subject: [PATCH] fixed some generics related warnings and did a little
 re-formatting

---
 .../interceptor/BeanValidationInterceptor.java       |  5 +++--
 .../interceptor/DefaultBeanValidationManager.java    | 12 +++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
index 162e8e664..10888891b 100644
--- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
+++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java
@@ -109,7 +109,8 @@ public class BeanValidationInterceptor extends MethodFilterInterceptor {
 
         if (action instanceof ModelDriven) {
             LOG.trace("Performing validation on model..");
-            constraintViolations = validator.validate(((ModelDriven) action).getModel());
+            Object model = (Object)((ModelDriven<?>) action).getModel();
+            constraintViolations = validator.validate(model);
         } else {
             LOG.trace("Performing validation on action..");
             constraintViolations = validator.validate(action);
@@ -173,7 +174,7 @@ public class BeanValidationInterceptor extends MethodFilterInterceptor {
     /**
      * This is copied from DefaultActionInvocation
      */
-    protected Method getActionMethod(Class actionClass, String methodName) throws NoSuchMethodException {
+    protected Method getActionMethod(Class<?> actionClass, String methodName) throws NoSuchMethodException {
         Method method;
 
         try {
diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java
index f03e19e63..81aebf84f 100644
--- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java
+++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/DefaultBeanValidationManager.java
@@ -55,7 +55,7 @@ public class DefaultBeanValidationManager
 
     private static final Logger LOG = LogManager.getLogger(DefaultBeanValidationManager.class);
 
-    protected Class<? extends ValidationProvider> providerClass;
+    protected Class<? extends ValidationProvider<? extends Configuration<?>>> providerClass;
 
     private ValidatorFactory validationFactory;
 
@@ -68,7 +68,8 @@ public class DefaultBeanValidationManager
 
         if (StringUtils.isNotBlank(providerClassName)) {
             try {
-                this.providerClass = (Class<? extends ValidationProvider>) Class.forName(providerClassName);
+                this.providerClass =
+                    (Class<? extends ValidationProvider<? extends Configuration<?>>>) Class.forName(providerClassName);
                 LOG.info(this.providerClass.getName() + " validator found");
             } catch (ClassNotFoundException e) {
                 LOG.error("Unable to find any bean validator implementation for " + providerClassName);
@@ -80,9 +81,10 @@ public class DefaultBeanValidationManager
             LOG.info("********** No bean validator class defined - Falling back to default provider **********");
         }
 
-        Configuration configuration =
-                (this.providerClass != null ? Validation.byProvider(this.providerClass).configure()
-                        : Validation.byDefaultProvider().configure());
+        Configuration<? extends Configuration<?>> configuration =
+                this.providerClass != null
+                    ? Validation.byProvider(this.providerClass).configure()
+                    : Validation.byDefaultProvider().configure();
         if (BooleanUtils.toBoolean(ignoreXMLConfiguration)) {
             configuration.ignoreXmlConfiguration();
             LOG.info("XML configurations will be ignore by Validator, to enable XML based validation, set struts.beanValidation.ignoreXMLConfiguration to false.");