From 7500a48226c5a5fe4d5264cd96db2517cd1a47c5 Mon Sep 17 00:00:00 2001
From: Henryk Konsek <hekonsek@gmail.com>
Date: Tue, 18 Feb 2014 16:19:10 +0100
Subject: [PATCH] Refactoring.

---
 .../beanvalidator/DefaultValidatorBean.java   | 28 -------------------
 .../HibernateValidationProviderResolver.java  | 20 -------------
 .../beanvalidator/ValidatorBean.java          | 10 -------
 .../OSGI-INF/blueprint/blueprint.xml          | 10 -------
 .../pom.xml                                   | 23 ++-------------
 5 files changed, 3 insertions(+), 88 deletions(-)
 delete mode 100644 fuse-pocs-blueprint-beanvalidator/fuse-pocs-blueprint-beanvalidator-bundle/src/main/java/fuse/pocs/blueprint/beanvalidator/DefaultValidatorBean.java
 delete mode 100644 fuse-pocs-blueprint-beanvalidator/fuse-pocs-blueprint-beanvalidator-bundle/src/main/java/fuse/pocs/blueprint/beanvalidator/HibernateValidationProviderResolver.java
 delete mode 100644 fuse-pocs-blueprint-beanvalidator/fuse-pocs-blueprint-beanvalidator-bundle/src/main/java/fuse/pocs/blueprint/beanvalidator/ValidatorBean.java
 delete mode 100644 fuse-pocs-blueprint-beanvalidator/fuse-pocs-blueprint-beanvalidator-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml

diff --git a/fuse-pocs-blueprint-beanvalidator/fuse-pocs-blueprint-beanvalidator-bundle/src/main/java/fuse/pocs/blueprint/beanvalidator/DefaultValidatorBean.java b/fuse-pocs-blueprint-beanvalidator/fuse-pocs-blueprint-beanvalidator-bundle/src/main/java/fuse/pocs/blueprint/beanvalidator/DefaultValidatorBean.java
deleted file mode 100644
index 9919122..0000000
--- a/fuse-pocs-blueprint-beanvalidator/fuse-pocs-blueprint-beanvalidator-bundle/src/main/java/fuse/pocs/blueprint/beanvalidator/DefaultValidatorBean.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package fuse.pocs.blueprint.beanvalidator;
-
-import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator;
-import org.hibernate.validator.resourceloading.PlatformResourceBundleLocator;
-
-import javax.validation.Configuration;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-import java.util.Set;
-
-public class DefaultValidatorBean implements ValidatorBean {
-
-    @Override
-    public Set<ConstraintViolation<Event>> validateEvent(Event event) {
-        Configuration<?> configuration =
-                Validation.byDefaultProvider().providerResolver(new HibernateValidationProviderResolver()).configure();
-        PlatformResourceBundleLocator platformResourceBundleLocator = new PlatformResourceBundleLocator("fuse.pocs.blueprint.beanvalidator.ValidationMessages");
-        ResourceBundleMessageInterpolator resourceBundleMessageInterpolator = new ResourceBundleMessageInterpolator(platformResourceBundleLocator);
-        ValidatorFactory factory = configuration
-                .messageInterpolator(resourceBundleMessageInterpolator)
-                .buildValidatorFactory();
-        Validator validator = factory.getValidator();
-        return validator.validate(event);
-    }
-
-}
\ No newline at end of file
diff --git a/fuse-pocs-blueprint-beanvalidator/fuse-pocs-blueprint-beanvalidator-bundle/src/main/java/fuse/pocs/blueprint/beanvalidator/HibernateValidationProviderResolver.java b/fuse-pocs-blueprint-beanvalidator/fuse-pocs-blueprint-beanvalidator-bundle/src/main/java/fuse/pocs/blueprint/beanvalidator/HibernateValidationProviderResolver.java
deleted file mode 100644
index c8f1f8c..0000000
--- a/fuse-pocs-blueprint-beanvalidator/fuse-pocs-blueprint-beanvalidator-bundle/src/main/java/fuse/pocs/blueprint/beanvalidator/HibernateValidationProviderResolver.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package fuse.pocs.blueprint.beanvalidator;
-
-import org.hibernate.validator.HibernateValidator;
-
-import javax.validation.ValidationProviderResolver;
-import java.util.List;
-
-import static java.util.Collections.singletonList;
-
-/**
- * Provided since Camel 2.13.0 (CAMEL-7168).
- */
-public class HibernateValidationProviderResolver implements ValidationProviderResolver {
-
-    @Override
-    public List getValidationProviders() {
-        return singletonList(new HibernateValidator());
-    }
-
-}
\ No newline at end of file
diff --git a/fuse-pocs-blueprint-beanvalidator/fuse-pocs-blueprint-beanvalidator-bundle/src/main/java/fuse/pocs/blueprint/beanvalidator/ValidatorBean.java b/fuse-pocs-blueprint-beanvalidator/fuse-pocs-blueprint-beanvalidator-bundle/src/main/java/fuse/pocs/blueprint/beanvalidator/ValidatorBean.java
deleted file mode 100644
index ae08a8f..0000000
--- a/fuse-pocs-blueprint-beanvalidator/fuse-pocs-blueprint-beanvalidator-bundle/src/main/java/fuse/pocs/blueprint/beanvalidator/ValidatorBean.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package fuse.pocs.blueprint.beanvalidator;
-
-import javax.validation.ConstraintViolation;
-import java.util.Set;
-
-public interface ValidatorBean {
-
-    Set<ConstraintViolation<Event>> validateEvent(Event event);
-
-}
\ No newline at end of file
diff --git a/fuse-pocs-blueprint-beanvalidator/fuse-pocs-blueprint-beanvalidator-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/fuse-pocs-blueprint-beanvalidator/fuse-pocs-blueprint-beanvalidator-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
deleted file mode 100644
index 8fb41c4..0000000
--- a/fuse-pocs-blueprint-beanvalidator/fuse-pocs-blueprint-beanvalidator-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
-
-    <bean id="validatorBean" class="fuse.pocs.blueprint.beanvalidator.DefaultValidatorBean"/>
-
-    <service interface="fuse.pocs.blueprint.beanvalidator.ValidatorBean" ref="validatorBean"/>
-
-</blueprint>
\ No newline at end of file
diff --git a/fuse-pocs-blueprint-beanvalidator/fuse-pocs-blueprint-beanvalidator-event/pom.xml b/fuse-pocs-blueprint-beanvalidator/fuse-pocs-blueprint-beanvalidator-event/pom.xml
index 1a07128..6603f63 100644
--- a/fuse-pocs-blueprint-beanvalidator/fuse-pocs-blueprint-beanvalidator-event/pom.xml
+++ b/fuse-pocs-blueprint-beanvalidator/fuse-pocs-blueprint-beanvalidator-event/pom.xml
@@ -14,26 +14,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>5.0.1.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>javax.el-api</artifactId>
-            <version>3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.web</groupId>
-            <artifactId>javax.el</artifactId>
-            <version>2.2.6</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>1.1.0.Final</version>
         </dependency>
     </dependencies>