You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bval.apache.org by mb...@apache.org on 2018/02/22 16:41:06 UTC
[1/2] bval git commit: BVAL-153 upgrade OWB and Arquillian
Repository: bval
Updated Branches:
refs/heads/bv2 f09af4ddb -> 79c352dea
BVAL-153 upgrade OWB and Arquillian
Project: http://git-wip-us.apache.org/repos/asf/bval/repo
Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/3511fb85
Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/3511fb85
Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/3511fb85
Branch: refs/heads/bv2
Commit: 3511fb8525d3e43ef83b036aebbbf107eecced72
Parents: f09af4d
Author: Mark Struberg <st...@apache.org>
Authored: Mon Jul 10 10:03:30 2017 +0000
Committer: Matt Benson <mb...@apache.org>
Committed: Thu Feb 22 09:39:59 2018 -0600
----------------------------------------------------------------------
bval-tck11/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bval/blob/3511fb85/bval-tck11/pom.xml
----------------------------------------------------------------------
diff --git a/bval-tck11/pom.xml b/bval-tck11/pom.xml
index 63611b9..e4758c1 100644
--- a/bval-tck11/pom.xml
+++ b/bval-tck11/pom.xml
@@ -32,8 +32,8 @@ under the License.
<properties>
<tck.version>1.1.4.Final</tck.version>
- <owb.version>1.6.0</owb.version>
- <arquillian.version>1.1.8.Final</arquillian.version>
+ <owb.version>1.7.2</owb.version>
+ <arquillian.version>1.1.13.Final</arquillian.version>
<validation.provider>org.apache.bval.jsr.ApacheValidationProvider</validation.provider>
</properties>
[2/2] bval git commit: address Oracle compiler complaints
Posted by mb...@apache.org.
address Oracle compiler complaints
Project: http://git-wip-us.apache.org/repos/asf/bval/repo
Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/79c352de
Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/79c352de
Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/79c352de
Branch: refs/heads/bv2
Commit: 79c352dea70dc653aabaac720c3398f71f94c212
Parents: 3511fb8
Author: Matt Benson <mb...@apache.org>
Authored: Thu Feb 22 10:41:01 2018 -0600
Committer: Matt Benson <mb...@apache.org>
Committed: Thu Feb 22 10:41:01 2018 -0600
----------------------------------------------------------------------
.../apache/bval/jsr/ConstraintAnnotationAttributes.java | 4 ++--
.../java/org/apache/bval/jsr/job/ValidateProperty.java | 12 +++++-------
.../java/org/apache/bval/jsr/metadata/XmlBuilder.java | 4 +---
3 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bval/blob/79c352de/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintAnnotationAttributes.java
----------------------------------------------------------------------
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintAnnotationAttributes.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintAnnotationAttributes.java
index 3e67cee..f40e301 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintAnnotationAttributes.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintAnnotationAttributes.java
@@ -133,8 +133,8 @@ public enum ConstraintAnnotationAttributes {
public <C extends Annotation> Worker<C> analyze(final Class<C> clazz) {
if (clazz.getName().startsWith("javax.validation.constraint.")) { // cache only APIs classes to avoid memory leaks
- @SuppressWarnings("unchecked")
- final Worker<C> w = (Worker<C>) WORKER_CACHE.computeIfAbsent((Class<?>) clazz, Worker::new);
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ final Worker<C> w = (Worker<C>) WORKER_CACHE.computeIfAbsent(clazz, c -> new Worker((c)));
return w;
}
return new Worker<C>(clazz);
http://git-wip-us.apache.org/repos/asf/bval/blob/79c352de/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateProperty.java
----------------------------------------------------------------------
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateProperty.java b/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateProperty.java
index 67e90ca..8d8ddc8 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateProperty.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateProperty.java
@@ -105,14 +105,13 @@ public final class ValidateProperty<T> extends ValidationJob<T> {
return new GraphContext(validatorContext, PathImpl.create(), rootBean).child(path, value.get());
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
- public ValidationJob<T>.Frame<?> frame(ValidateProperty<T> job, PathImpl path) {
+ public ValidateProperty<T>.Frame<?> frame(ValidateProperty<T> job, PathImpl path) {
if (job.descriptor instanceof BeanDescriptor) {
return job.new LeafFrame(leafContext.get());
}
- return job.new PropertyFrame(job.new BeanFrame(leafContext.get()), job.descriptor,
- leafContext.get().child(path, value.get()));
+ return job.new PropertyFrame<PropertyD<?>>(job.new BeanFrame(leafContext.get()),
+ (PropertyD<?>) job.descriptor, leafContext.get().child(path, value.get()));
}
}
@@ -124,14 +123,13 @@ public final class ValidateProperty<T> extends ValidationJob<T> {
this.value = value;
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
- public ValidationJob<T>.Frame<?> frame(ValidateProperty<T> job, PathImpl path) {
+ public ValidateProperty<T>.Frame<?> frame(ValidateProperty<T> job, PathImpl path) {
final GraphContext context = new GraphContext(job.validatorContext, path, value);
if (job.descriptor instanceof BeanDescriptor) {
return job.new LeafFrame(context);
}
- return job.new PropertyFrame(null, job.descriptor, context);
+ return job.new PropertyFrame<PropertyD<?>>(null, (PropertyD<?>) job.descriptor, context);
}
}
http://git-wip-us.apache.org/repos/asf/bval/blob/79c352de/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlBuilder.java
----------------------------------------------------------------------
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlBuilder.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlBuilder.java
index 1c8c9bf..8743be5 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlBuilder.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlBuilder.java
@@ -527,10 +527,8 @@ public class XmlBuilder {
return createConstraint(constraint, ConstraintTarget.IMPLICIT);
}
- @SuppressWarnings("unchecked")
private <A extends Annotation, T> A createConstraint(final ConstraintType constraint, ConstraintTarget target) {
-
- final Class<A> annotationClass = (Class<A>) loadClass(toQualifiedClassName(constraint.getAnnotation()));
+ final Class<A> annotationClass = this.<A> loadClass(toQualifiedClassName(constraint.getAnnotation()));
final AnnotationProxyBuilder<A> annoBuilder = new AnnotationProxyBuilder<A>(annotationClass);
if (constraint.getMessage() != null) {