The Unified and Autonomous Development Platform
Fix issue #935 - Upgrade dev environment to Java 11 and set it as minimum runtime requirement
Robin Shenbaa2267b2db0
diff --git a/pom.xml b/pom.xmlindex 682a6fe36f..a49f046c05 100644--- a/pom.xml+++ b/pom.xml@@ -6,10 +6,10 @@<parent><groupId>io.onedev</groupId><artifactId>parent</artifactId>- <version>1.0.5</version>+ <version>1.1.0</version></parent><artifactId>server</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version><packaging>pom</packaging><build><finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>@@ -38,7 +38,7 @@<plugin><groupId>io.onedev</groupId><artifactId>plugin-maven</artifactId>- <version>2.2.0</version>+ <version>2.3.0</version><executions><execution><?m2e execute onConfiguration,onIncremental?>@@ -139,6 +139,11 @@<artifactId>slf4j-api</artifactId><version>${slf4j.version}</version></dependency>+ <dependency>+ <groupId>org.slf4j</groupId>+ <artifactId>log4j-over-slf4j</artifactId>+ <version>${slf4j.version}</version>+ </dependency><dependency><groupId>org.slf4j</groupId><artifactId>jul-to-slf4j</artifactId>@@ -225,9 +230,9 @@<version>2.1.3</version></dependency><dependency>- <groupId>org.hibernate</groupId>+ <groupId>org.hibernate.validator</groupId><artifactId>hibernate-validator</artifactId>- <version>5.3.6.Final</version>+ <version>6.2.5.Final</version></dependency><dependency><groupId>org.hibernate</groupId>@@ -569,6 +574,21 @@<artifactId>slack-api-client</artifactId><version>1.25.0</version></dependency>+ <dependency>+ <groupId>org.jetbrains</groupId>+ <artifactId>annotations</artifactId>+ <version>20.1.0</version>+ </dependency>+ <dependency>+ <groupId>net.bytebuddy</groupId>+ <artifactId>byte-buddy</artifactId>+ <version>1.12.14</version>+ </dependency>+ <dependency>+ <groupId>org.javassist</groupId>+ <artifactId>javassist</artifactId>+ <version>3.29.1-GA</version>+ </dependency></dependencies></dependencyManagement><repositories>@@ -588,16 +608,15 @@</repository></repositories><properties>- <commons.version>2.2.10</commons.version>- <agent.version>1.4.5</agent.version>- <slf4j.version>1.7.30</slf4j.version>- <logback.version>1.2.9</logback.version>+ <commons.version>2.4.0</commons.version>+ <agent.version>1.5.0</agent.version>+ <slf4j.version>1.7.36</slf4j.version>+ <logback.version>1.2.11</logback.version><antlr.version>4.7.2</antlr.version><jetty.version>9.4.43.v20210629</jetty.version><wicket.version>7.17.0</wicket.version>- <jersey.version>2.26</jersey.version>+ <jersey.version>2.37</jersey.version><hibernate.version>5.4.24.Final</hibernate.version>- <wicketbootstrap.version>0.10.18</wicketbootstrap.version><lucene.version>8.7.0</lucene.version><shiro.version>1.7.1</shiro.version><jgit.version>5.13.0.202109080827-r</jgit.version>diff --git a/server-core/pom.xml b/server-core/pom.xmlindex 6df32bd7b9..cabebf2b0b 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><build><plugins>@@ -241,7 +241,7 @@<artifactId>oauth2-client</artifactId></dependency><dependency>- <groupId>org.hibernate</groupId>+ <groupId>org.hibernate.validator</groupId><artifactId>hibernate-validator</artifactId></dependency><dependency>diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Import.java b/server-core/src/main/java/io/onedev/server/buildspec/Import.javaindex 17ac707eeb..957de0aa70 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/Import.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/Import.java@@ -15,7 +15,7 @@ import javax.validation.Validator;import org.apache.shiro.subject.Subject;import org.eclipse.jgit.revwalk.RevCommit;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import com.google.common.base.Preconditions;import com.google.common.base.Throwables;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Property.java b/server-core/src/main/java/io/onedev/server/buildspec/Property.javaindex 938ae0aad8..d9cf3b30c4 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/Property.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/Property.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputCompletion;import io.onedev.commons.codeassist.InputStatus;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Service.java b/server-core/src/main/java/io/onedev/server/buildspec/Service.javaindex 2d79203397..e1f220674b 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/Service.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/Service.java@@ -6,7 +6,7 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputCompletion;import io.onedev.commons.codeassist.InputStatus;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.javaindex aaaf58c05e..9318b93c98 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java@@ -5,7 +5,7 @@ import java.util.List;import javax.validation.ConstraintValidatorContext;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.PathUtils;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java b/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.javaindex b2a9071344..9f66d552bc 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.job;import java.io.Serializable;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.buildspec.BuildSpec;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.javaindex 57b15ba8e0..ac839c0577 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java@@ -27,7 +27,7 @@ import javax.ws.rs.core.HttpHeaders;import org.apache.wicket.Component;import org.eclipse.jgit.lib.ObjectId;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputCompletion;import io.onedev.commons.codeassist.InputStatus;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.javaindex bc38ab4a28..419d0f2e65 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java@@ -5,7 +5,7 @@ import java.util.ArrayList;import java.util.List;import org.apache.wicket.Component;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.buildspec.BuildSpec;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.javaindex 8a738cc4bb..25c26fe668 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java@@ -8,7 +8,7 @@ import java.util.List;import javax.validation.Valid;import javax.validation.ValidationException;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/PostBuildAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/PostBuildAction.javaindex 8e11296164..76c50124d1 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/PostBuildAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/PostBuildAction.java@@ -2,7 +2,7 @@ package io.onedev.server.buildspec.job.action;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.Job;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.javaindex 979a587f3f..3f64e0369e 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java@@ -8,7 +8,7 @@ import javax.validation.Valid;import javax.validation.ValidationException;import org.apache.wicket.Component;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/SendNotificationAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/SendNotificationAction.javaindex e934a8679f..b02297fd32 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/SendNotificationAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/SendNotificationAction.java@@ -1,6 +1,6 @@package io.onedev.server.buildspec.job.action;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.event.build.BuildFinished;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.java b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.javaindex a13feb3e9e..2a985a4e4b 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.java@@ -5,7 +5,7 @@ import java.util.stream.Collectors;import javax.validation.ConstraintValidatorContext;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.k8shelper.CloneInfo;import io.onedev.k8shelper.HttpCloneInfo;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.javaindex 30b57950cc..88ade25a01 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java@@ -7,7 +7,7 @@ import java.util.stream.Collectors;import javax.validation.ConstraintValidatorContext;import org.apache.sshd.common.config.keys.PublicKeyEntry;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.k8shelper.CloneInfo;import io.onedev.k8shelper.SshCloneInfo;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.java b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.javaindex ea40bd94b8..6e838081f7 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.java@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.job.projectdependency;import java.util.ArrayList;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.javaindex b75e7656de..91c6fce665 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java@@ -8,7 +8,7 @@ import java.util.stream.Collectors;import javax.annotation.Nullable;import javax.validation.constraints.NotNull;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.codeassist.InputSuggestion;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/SpecifiedBuild.java b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/SpecifiedBuild.javaindex e6c66232a7..27bf4c7348 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/SpecifiedBuild.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/SpecifiedBuild.java@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.job.projectdependency;import java.util.ArrayList;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.javaindex efc20fe30d..08c02a0971 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java@@ -1,6 +1,6 @@package io.onedev.server.buildspec.job.trigger;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.SubmitReason;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.javaindex 46fabd9e71..ab51808348 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java@@ -6,7 +6,7 @@ import javax.annotation.Nullable;import javax.validation.Valid;import org.apache.wicket.Component;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.buildspec.ParamSpecAware;import io.onedev.server.model.support.inputspec.InputSpec;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/supply/ParamSupply.java b/server-core/src/main/java/io/onedev/server/buildspec/param/supply/ParamSupply.javaindex 33ea50d851..e6a8ecde1c 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/supply/ParamSupply.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/supply/ParamSupply.java@@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/supply/PassthroughValues.java b/server-core/src/main/java/io/onedev/server/buildspec/param/supply/PassthroughValues.javaindex f134ef89f5..58dc772382 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/supply/PassthroughValues.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/supply/PassthroughValues.java@@ -6,7 +6,7 @@ import java.util.stream.Collectors;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.buildspec.param.ParamCombination;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/supply/ScriptingValues.java b/server-core/src/main/java/io/onedev/server/buildspec/param/supply/ScriptingValues.javaindex 442567f228..49f07e381f 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/supply/ScriptingValues.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/supply/ScriptingValues.java@@ -8,7 +8,7 @@ import java.util.Map;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.model.Build;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.javaindex 94ead24880..30ee3351ac 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java@@ -2,7 +2,7 @@ package io.onedev.server.buildspec.step;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.k8shelper.BuildImageFacade;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.javaindex 90a4de59b9..8434aed100 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.java@@ -4,7 +4,7 @@ import java.io.File;import java.util.List;import java.util.Map;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.ExplicitException;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.javaindex 0994b12197..80ce7e162b 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java@@ -2,7 +2,7 @@ package io.onedev.server.buildspec.step;import javax.validation.constraints.NotNull;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.k8shelper.StepFacade;import io.onedev.server.buildspec.param.ParamCombination;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.javaindex e968bf020d..9f2169c1ee 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java@@ -7,7 +7,7 @@ import java.util.Map;import org.bouncycastle.openpgp.PGPSecretKeyRing;import org.eclipse.jgit.lib.PersonIdent;import org.eclipse.jgit.lib.Ref;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.ExplicitException;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.javaindex 87ec6ec3a9..02376b4c38 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java@@ -5,7 +5,7 @@ import java.util.List;import java.util.Map;import java.util.concurrent.Callable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.FileUtils;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishReportStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishReportStep.javaindex 885fd4dc57..562409fa24 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishReportStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishReportStep.java@@ -2,7 +2,7 @@ package io.onedev.server.buildspec.step;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.k8shelper.ExecuteCondition;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.javaindex 9ada6a13d5..d10dbfa486 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java@@ -11,7 +11,7 @@ import java.util.stream.Collectors;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import com.google.common.base.Splitter;import com.google.common.collect.Lists;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.javaindex 2976caa892..951b1adfa9 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java@@ -7,7 +7,7 @@ import java.util.Map;import javax.annotation.Nullable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.k8shelper.RunContainerFacade;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildDescriptionStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildDescriptionStep.javaindex e6e5527f27..679b68a162 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildDescriptionStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildDescriptionStep.java@@ -5,7 +5,7 @@ import java.util.List;import java.util.Map;import java.util.concurrent.Callable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.loader.ListenerRegistry;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.javaindex 0eed1941fd..587fd45454 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.java@@ -9,7 +9,7 @@ import java.util.List;import java.util.Map;import java.util.concurrent.Callable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.loader.ListenerRegistry;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java b/server-core/src/main/java/io/onedev/server/buildspec/step/Step.javaindex 6e73e880d6..bb0930b1bb 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java@@ -4,7 +4,7 @@ import java.io.Serializable;import javax.validation.constraints.NotNull;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.k8shelper.Action;import io.onedev.k8shelper.ExecuteCondition;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplate.java b/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplate.javaindex e6f4960caf..37a33caff6 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplate.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplate.java@@ -7,7 +7,7 @@ import java.util.List;import javax.validation.Valid;import javax.validation.constraints.Size;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputCompletion;import io.onedev.commons.codeassist.InputStatus;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.javaindex 5f2bf37886..c42c0513bd 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java@@ -9,7 +9,7 @@ import java.util.stream.Collectors;import javax.validation.ConstraintValidatorContext;import org.apache.commons.lang3.SystemUtils;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.codeassist.InputSuggestion;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.javaindex a67b6f215a..b28f762f41 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java@@ -7,7 +7,7 @@ import java.util.concurrent.atomic.AtomicInteger;import javax.validation.Valid;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.utils.ExplicitException;import io.onedev.k8shelper.Action;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/VolumeMount.java b/server-core/src/main/java/io/onedev/server/buildspec/step/VolumeMount.javaindex 3fe016565e..fb92abe8dc 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/VolumeMount.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/VolumeMount.java@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.step;import java.io.Serializable;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.buildspec.BuildSpec;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/ShellInterpreter.java b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/ShellInterpreter.javaindex 5d749c6fca..96b5221150 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/ShellInterpreter.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/ShellInterpreter.java@@ -4,7 +4,7 @@ import java.util.List;import javax.validation.constraints.Size;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.k8shelper.ShellFacade;import io.onedev.k8shelper.CommandFacade;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildMetricManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildMetricManager.javaindex 799bd1e8cc..81e9ef7713 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildMetricManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildMetricManager.java@@ -147,7 +147,7 @@ public class DefaultBuildMetricManager implements BuildMetricManager {for (Object[] fields: dao.getSession().createQuery(criteriaQuery).list()) {try {- T metric = metricClass.newInstance();+ T metric = metricClass.getDeclaredConstructor().newInstance();int index = 0;for (Method setter: setters) {double value = (double)fields[index++];diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.javaindex 281d520ba2..a1f8edaa6e 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java@@ -1,6 +1,7 @@package io.onedev.server.entitymanager.impl;import java.io.Serializable;+import java.lang.reflect.InvocationTargetException;import java.util.Collection;import java.util.HashSet;import java.util.List;@@ -589,10 +590,11 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implementsT contributedSetting = (T) getContributedSettings().get(settingClass.getName());if (contributedSetting == null) {try {- T value = settingClass.newInstance();+ T value = settingClass.getDeclaredConstructor().newInstance();if (OneDev.getInstance(Validator.class).validate(value).isEmpty())contributedSetting = value;- } catch (InstantiationException | IllegalAccessException e) {+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}}diff --git a/server-core/src/main/java/io/onedev/server/git/config/SpecifiedCurl.java b/server-core/src/main/java/io/onedev/server/git/config/SpecifiedCurl.javaindex 80b5b6771d..9ee4dcf5a8 100644--- a/server-core/src/main/java/io/onedev/server/git/config/SpecifiedCurl.java+++ b/server-core/src/main/java/io/onedev/server/git/config/SpecifiedCurl.java@@ -1,6 +1,6 @@package io.onedev.server.git.config;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/git/config/SpecifiedGit.java b/server-core/src/main/java/io/onedev/server/git/config/SpecifiedGit.javaindex bd382495a9..91412406ed 100644--- a/server-core/src/main/java/io/onedev/server/git/config/SpecifiedGit.java+++ b/server-core/src/main/java/io/onedev/server/git/config/SpecifiedGit.java@@ -1,6 +1,6 @@package io.onedev.server.git.config;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.javaindex 39f886fc89..9335ac7575 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java@@ -572,6 +572,8 @@ public class Upgrade extends DefaultPersistManager {wrapperConf = StringUtils.replace(wrapperConf, "io.onedev.commons.launcher.bootstrap.Bootstrap","io.onedev.commons.bootstrap.Bootstrap");wrapperConf = StringUtils.replace(wrapperConf, "wrapper.pidfile=../status/onedev.pid", "");+ wrapperConf = StringUtils.replace(wrapperConf, "-XX:+IgnoreUnrecognizedVMOptions",+ "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED");if (!wrapperConf.contains("wrapper.disable_console_input"))wrapperConf += "\r\nwrapper.disable_console_input=TRUE";diff --git a/server-core/src/main/java/io/onedev/server/migration/VersionedXmlDoc.java b/server-core/src/main/java/io/onedev/server/migration/VersionedXmlDoc.javaindex 03c208af27..815b930a5a 100644--- a/server-core/src/main/java/io/onedev/server/migration/VersionedXmlDoc.java+++ b/server-core/src/main/java/io/onedev/server/migration/VersionedXmlDoc.java@@ -10,6 +10,7 @@ import java.io.ObjectOutput;import java.io.OutputStream;import java.io.StringReader;import java.io.Writer;+import java.lang.reflect.InvocationTargetException;import java.nio.charset.StandardCharsets;import java.util.Iterator;import java.util.List;@@ -474,7 +475,7 @@ public final class VersionedXmlDoc implements Document, Externalizable {getRootElement().setName(xstream.getMapper().serializedClass(beanClass));if (getVersion() != null) {try {- Object migrator = beanClass.newInstance();+ Object migrator = beanClass.getDeclaredConstructor().newInstance();if (MigrationHelper.migrate(getVersion(), migrator, this)) {setVersion(MigrationHelper.getVersion(migrator.getClass()));Object bean = xstream.unmarshal(domReader);@@ -482,7 +483,8 @@ public final class VersionedXmlDoc implements Document, Externalizable {} else {return (T) xstream.unmarshal(domReader);}- } catch (InstantiationException | IllegalAccessException e) {+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}} else {diff --git a/server-core/src/main/java/io/onedev/server/migration/VersionedYamlDoc.java b/server-core/src/main/java/io/onedev/server/migration/VersionedYamlDoc.javaindex 6e17179765..a733236c18 100644--- a/server-core/src/main/java/io/onedev/server/migration/VersionedYamlDoc.java+++ b/server-core/src/main/java/io/onedev/server/migration/VersionedYamlDoc.java@@ -5,6 +5,7 @@ import java.beans.PropertyDescriptor;import java.io.IOException;import java.io.StringReader;import java.io.StringWriter;+import java.lang.reflect.InvocationTargetException;import java.lang.reflect.Method;import java.util.ArrayList;import java.util.Collection;@@ -58,9 +59,10 @@ public class VersionedYamlDoc extends MappingNode {setTag(new Tag(beanClass));if (getVersion() != null) {try {- MigrationHelper.migrate(getVersion(), beanClass.newInstance(), this);+ MigrationHelper.migrate(getVersion(), beanClass.getDeclaredConstructor().newInstance(), this);removeVersion();- } catch (InstantiationException | IllegalAccessException e) {+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}}diff --git a/server-core/src/main/java/io/onedev/server/model/AgentAttribute.java b/server-core/src/main/java/io/onedev/server/model/AgentAttribute.javaindex c9faaeab80..e357681f61 100644--- a/server-core/src/main/java/io/onedev/server/model/AgentAttribute.java+++ b/server-core/src/main/java/io/onedev/server/model/AgentAttribute.java@@ -14,7 +14,7 @@ import javax.persistence.UniqueConstraint;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.validation.annotation.AttributeName;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 463cd51f5f..9c3964229d 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -16,6 +16,7 @@ import static io.onedev.server.model.Build.PROP_VERSION;import java.io.File;import java.io.IOException;import java.io.Serializable;+import java.lang.reflect.InvocationTargetException;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;@@ -790,8 +791,10 @@ public class Build extends AbstractEntity implements Referenceable, AttachmentStpublic Serializable getParamBean() {Serializable paramBean;try {- paramBean = (Serializable) ParamUtils.defineBeanClass(getJob().getParamSpecs()).newInstance();- } catch (InstantiationException | IllegalAccessException e) {+ paramBean = (Serializable) ParamUtils.defineBeanClass(getJob().getParamSpecs())+ .getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}BeanDescriptor descriptor = new BeanDescriptor(paramBean.getClass());diff --git a/server-core/src/main/java/io/onedev/server/model/EmailAddress.java b/server-core/src/main/java/io/onedev/server/model/EmailAddress.javaindex decf87eeb8..2bda8929d1 100644--- a/server-core/src/main/java/io/onedev/server/model/EmailAddress.java+++ b/server-core/src/main/java/io/onedev/server/model/EmailAddress.java@@ -11,8 +11,8 @@ import javax.persistence.Table;import org.apache.commons.lang3.RandomStringUtils;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;-import org.hibernate.validator.constraints.Email;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.Email;+import javax.validation.constraints.NotEmpty;import com.fasterxml.jackson.annotation.JsonIgnore;diff --git a/server-core/src/main/java/io/onedev/server/model/Group.java b/server-core/src/main/java/io/onedev/server/model/Group.javaindex 23a7ecd73d..5659b1708f 100644--- a/server-core/src/main/java/io/onedev/server/model/Group.java+++ b/server-core/src/main/java/io/onedev/server/model/Group.java@@ -12,7 +12,7 @@ import javax.persistence.OneToMany;import org.apache.shiro.authz.Permission;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.security.permission.CreateRootProjects;import io.onedev.server.security.permission.ProjectPermission;diff --git a/server-core/src/main/java/io/onedev/server/model/LinkSpec.java b/server-core/src/main/java/io/onedev/server/model/LinkSpec.javaindex 23af5121a3..9f044184d3 100644--- a/server-core/src/main/java/io/onedev/server/model/LinkSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/LinkSpec.java@@ -12,7 +12,7 @@ import javax.persistence.OneToMany;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.model.support.issue.LinkSpecOpposite;import io.onedev.server.search.entity.issue.IssueQuery;diff --git a/server-core/src/main/java/io/onedev/server/model/Milestone.java b/server-core/src/main/java/io/onedev/server/model/Milestone.javaindex ff61902260..b7ade12c33 100644--- a/server-core/src/main/java/io/onedev/server/model/Milestone.java+++ b/server-core/src/main/java/io/onedev/server/model/Milestone.java@@ -21,7 +21,7 @@ import javax.persistence.UniqueConstraint;import org.apache.commons.lang3.StringUtils;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Multiline;diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex ca44642b3c..d2ce406a2d 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -11,6 +11,7 @@ import java.io.FilterInputStream;import java.io.IOException;import java.io.InputStream;import java.io.OutputStream;+import java.lang.reflect.InvocationTargetException;import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.Collection;@@ -75,7 +76,7 @@ import org.eclipse.jgit.treewalk.TreeWalk;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.annotations.DynamicUpdate;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -1814,10 +1815,11 @@ public class Project extends AbstractEntity {T contributedSetting = (T) contributedSettings.get(settingClass.getName());if (contributedSetting == null) {try {- T value = settingClass.newInstance();+ T value = settingClass.getDeclaredConstructor().newInstance();if (OneDev.getInstance(Validator.class).validate(value).isEmpty())contributedSetting = value;- } catch (InstantiationException | IllegalAccessException e) {+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}}diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.javaindex 4e0a24dc78..1e826e8f20 100644--- a/server-core/src/main/java/io/onedev/server/model/Role.java+++ b/server-core/src/main/java/io/onedev/server/model/Role.java@@ -20,7 +20,7 @@ import javax.validation.constraints.NotNull;import org.apache.shiro.authz.Permission;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import com.google.common.collect.Lists;diff --git a/server-core/src/main/java/io/onedev/server/model/SshKey.java b/server-core/src/main/java/io/onedev/server/model/SshKey.javaindex 5aed857f1b..5eda704b2a 100644--- a/server-core/src/main/java/io/onedev/server/model/SshKey.java+++ b/server-core/src/main/java/io/onedev/server/model/SshKey.java@@ -18,7 +18,7 @@ import javax.validation.ConstraintValidatorContext;import org.apache.sshd.common.config.keys.KeyUtils;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import com.fasterxml.jackson.annotation.JsonIgnore;diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.javaindex df2837defe..409b88cdba 100644--- a/server-core/src/main/java/io/onedev/server/model/User.java+++ b/server-core/src/main/java/io/onedev/server/model/User.java@@ -31,7 +31,7 @@ import org.apache.shiro.subject.Subject;import org.eclipse.jgit.lib.PersonIdent;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import com.fasterxml.jackson.annotation.JsonIgnore;import com.google.common.base.MoreObjects;diff --git a/server-core/src/main/java/io/onedev/server/model/support/BaseGpgKey.java b/server-core/src/main/java/io/onedev/server/model/support/BaseGpgKey.javaindex 0be98ec425..b3ecbab964 100644--- a/server-core/src/main/java/io/onedev/server/model/support/BaseGpgKey.java+++ b/server-core/src/main/java/io/onedev/server/model/support/BaseGpgKey.java@@ -10,7 +10,7 @@ import javax.persistence.MappedSuperclass;import javax.validation.ConstraintValidatorContext;import org.bouncycastle.openpgp.PGPPublicKey;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.model.AbstractEntity;import io.onedev.server.util.GpgUtils;diff --git a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.javaindex 371bb3f6b0..ee0eef4f82 100644--- a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java@@ -13,7 +13,7 @@ import javax.annotation.Nullable;import javax.validation.Valid;import org.eclipse.jgit.lib.ObjectId;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java b/server-core/src/main/java/io/onedev/server/model/support/FileProtection.javaindex 11681d2ad4..58ad5043f4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java@@ -6,7 +6,7 @@ import java.util.List;import javax.validation.ConstraintValidatorContext;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedAgentQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedAgentQuery.javaindex 8e08313da0..2e7c12b5c2 100644--- a/server-core/src/main/java/io/onedev/server/model/support/NamedAgentQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedAgentQuery.java@@ -1,6 +1,6 @@package io.onedev.server.model.support;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.AgentQuery;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.javaindex e218bfcec4..e33dc7704f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.java@@ -1,6 +1,6 @@package io.onedev.server.model.support;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.CodeCommentQuery;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.javaindex 137c715524..304af8b9c0 100644--- a/server-core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.java@@ -1,6 +1,6 @@package io.onedev.server.model.support;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.CommitQuery;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedProjectQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedProjectQuery.javaindex dcc9291446..573a5189ed 100644--- a/server-core/src/main/java/io/onedev/server/model/support/NamedProjectQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedProjectQuery.java@@ -1,6 +1,6 @@package io.onedev.server.model.support;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.ProjectQuery;diff --git a/server-core/src/main/java/io/onedev/server/model/support/RegistryLogin.java b/server-core/src/main/java/io/onedev/server/model/support/RegistryLogin.javaindex ce2ff0808c..c63dfb3f73 100644--- a/server-core/src/main/java/io/onedev/server/model/support/RegistryLogin.java+++ b/server-core/src/main/java/io/onedev/server/model/support/RegistryLogin.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Password;diff --git a/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java b/server-core/src/main/java/io/onedev/server/model/support/TagProtection.javaindex afb9531b81..89fc7627b1 100644--- a/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/model/support/WebHook.java b/server-core/src/main/java/io/onedev/server/model/support/WebHook.javaindex 62500c2dfa..5bfa97a40b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/WebHook.java+++ b/server-core/src/main/java/io/onedev/server/model/support/WebHook.java@@ -7,7 +7,7 @@ import java.util.List;import javax.validation.constraints.Size;import org.apache.commons.lang3.RandomStringUtils;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.event.Event;import io.onedev.server.event.RefUpdated;diff --git a/server-core/src/main/java/io/onedev/server/model/support/Widget.java b/server-core/src/main/java/io/onedev/server/model/support/Widget.javaindex dd559c8fd4..3c0f6f10c2 100644--- a/server-core/src/main/java/io/onedev/server/model/support/Widget.java+++ b/server-core/src/main/java/io/onedev/server/model/support/Widget.java@@ -5,7 +5,7 @@ import java.io.Serializable;import org.apache.wicket.Component;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.basic.Label;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.unbescape.html.HtmlEscape;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/BackupSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/BackupSetting.javaindex f9a3d6022f..29caef6a02 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/BackupSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/BackupSetting.java@@ -5,7 +5,7 @@ import java.text.ParseException;import javax.validation.ConstraintValidatorContext;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.quartz.CronExpression;import io.onedev.server.util.validation.Validatable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/BrandingSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/BrandingSetting.javaindex 81c208a0e1..3fd2581e21 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/BrandingSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/BrandingSetting.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.administration;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.javaindex 5ca0f9a9b4..fbadd1f8ab 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java@@ -5,7 +5,7 @@ import java.util.List;import javax.validation.constraints.Size;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/ProjectDesignation.java b/server-core/src/main/java/io/onedev/server/model/support/administration/ProjectDesignation.javaindex 02fdcb54b1..298927b1a8 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/ProjectDesignation.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/ProjectDesignation.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.List;import java.util.stream.Collectors;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SenderAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SenderAuthorization.javaindex 76a78ca9e2..be0c11b84a 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SenderAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SenderAuthorization.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.List;import org.apache.shiro.authz.Permission;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.ExplicitException;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SshSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SshSetting.javaindex 69bddf62a3..204e8346c5 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SshSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SshSetting.java@@ -10,7 +10,7 @@ import javax.validation.ConstraintValidatorContext;import org.apache.sshd.common.config.keys.KeyUtils;import org.apache.sshd.common.digest.BuiltinDigests;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.ssh.SshKeyUtils;import io.onedev.server.util.validation.Validatable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.javaindex b3e5c30050..3373feb761 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java@@ -10,7 +10,7 @@ import javax.validation.Valid;import javax.validation.constraints.NotNull;import org.apache.commons.lang3.StringUtils;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.javaindex b08779186b..4aecbb1c12 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java@@ -12,7 +12,7 @@ import java.util.Map;import javax.annotation.Nullable;import javax.ws.rs.core.Response;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import com.google.common.base.Splitter;import com.google.common.base.Throwables;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/NodeSelectorEntry.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/NodeSelectorEntry.javaindex 0cb4628e69..8793e8df0f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/NodeSelectorEntry.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/NodeSelectorEntry.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.administration.jobexecutor;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/GmailSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/GmailSetting.javaindex 65b8ef6c97..9fcc192e04 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/GmailSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/GmailSetting.java@@ -4,8 +4,8 @@ import java.util.Collection;import java.util.HashMap;import java.util.Map;-import org.hibernate.validator.constraints.Email;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.Email;+import javax.validation.constraints.NotEmpty;import com.google.common.collect.Lists;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/Office365Setting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/Office365Setting.javaindex 6dfc11fa89..50d67ae964 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/Office365Setting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/Office365Setting.java@@ -4,8 +4,8 @@ import java.util.Collection;import java.util.HashMap;import java.util.Map;-import org.hibernate.validator.constraints.Email;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.Email;+import javax.validation.constraints.NotEmpty;import com.google.common.collect.Lists;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherInboxPollSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherInboxPollSetting.javaindex ef800995c9..c7ae6bfb63 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherInboxPollSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherInboxPollSetting.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.administration.mailsetting;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Password;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherMailSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherMailSetting.javaindex ab8d584638..246d0af175 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherMailSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherMailSetting.java@@ -1,7 +1,7 @@package io.onedev.server.model.support.administration.mailsetting;-import org.hibernate.validator.constraints.Email;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.Email;+import javax.validation.constraints.NotEmpty;import io.onedev.server.mail.BasicAuthPassword;import io.onedev.server.mail.MailCheckSetting;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java b/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.javaindex 0f69cbc29e..9e4cb397b5 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/sso/SsoConnector.java@@ -3,7 +3,7 @@ package io.onedev.server.model.support.administration.sso;import java.io.Serializable;import java.net.URI;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.usage.Usage;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/DefaultFixedIssueFilter.java b/server-core/src/main/java/io/onedev/server/model/support/build/DefaultFixedIssueFilter.javaindex 17238f8f4f..d172952395 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/DefaultFixedIssueFilter.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/DefaultFixedIssueFilter.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.codeassist.InputSuggestion;diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java b/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.javaindex 89796b2f96..62f2abe67e 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.java b/server-core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.javaindex 0556574ff4..1445926d69 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.build;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.web.editable.annotation.BuildQuery;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.javaindex 3349f638f1..68610abbe4 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.javaindex 4b87b00453..4060fc46ab 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.java@@ -3,7 +3,7 @@ package io.onedev.server.model.support.inputspec.choiceinput.choiceprovider;import java.io.Serializable;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.web.editable.annotation.Color;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ScriptingChoices.javaindex 969f0e4c7a..a024f13b84 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ScriptingChoices.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ScriptingChoices.java@@ -4,7 +4,7 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.javaindex 58f626fff3..a1e4768cd4 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.inputspec.choiceinput.defaultmultivalueprimport java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.javaindex 7891538772..355353f2e2 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java@@ -5,7 +5,7 @@ import java.util.List;import javax.validation.Validator;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import com.google.common.collect.Lists;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.javaindex 7e32bb9a59..b192101895 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 234db4ac46..a1c7290504 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -5,7 +5,7 @@ import java.util.List;import javax.validation.Validator;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.javaindex e88e83ee55..29b9c1fdd2 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider;import java.util.Date;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/datetimeinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/datetimeinput/defaultvalueprovider/ScriptingDefaultValue.javaindex 5f67532d6a..b2f2b0d004 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/datetimeinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/datetimeinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.inputspec.datetimeinput.defaultvalueproviimport java.util.Date;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/floatinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/floatinput/defaultvalueprovider/ScriptingDefaultValue.javaindex 4c40c3c145..a210fa5b3b 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/floatinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/floatinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.inputspec.floatinput.defaultvalueprovider;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.javaindex db3cb8fbb8..d26629cbc3 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java@@ -5,7 +5,7 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javaindex 87f2aa5966..111eac3440 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex e2ecc1da4c..c6a8e90934 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -4,7 +4,7 @@ import java.util.List;import javax.validation.Validator;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import com.google.common.collect.Lists;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/integerinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/integerinput/defaultvalueprovider/ScriptingDefaultValue.javaindex f3c78fbc6a..eaa0507b59 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/integerinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/integerinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.inputspec.integerinput.defaultvalueprovider;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ShowCondition.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ShowCondition.javaindex 63b4ad466c..b8b64d7a58 100644--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ShowCondition.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ShowCondition.java@@ -6,7 +6,7 @@ import java.util.List;import javax.validation.constraints.NotNull;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.javaindex 6befe61367..f335b7f6bd 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 1920f856df..147c041121 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.javaindex 669d092a46..97651a9f93 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java@@ -6,7 +6,7 @@ import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.javaindex b76bf3adc3..b8a54f4f4c 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.inputspec.userchoiceinput.defaultmultivalimport java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.javaindex 8ecd731996..68a414ad52 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java@@ -5,7 +5,7 @@ import java.util.List;import javax.validation.Validator;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.model.User;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javaindex f56d15c914..cefabf061c 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 58fe87582d..7f446729cd 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -3,7 +3,7 @@ package io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueproimport java.util.ArrayList;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import com.google.common.collect.Sets;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/workingperiodinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/workingperiodinput/defaultvalueprovider/ScriptingDefaultValue.javaindex f981ad91c5..65390ff271 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/workingperiodinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/workingperiodinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.inputspec.workingperiodinput.defaultvalueprovider;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.javaindex 8840ccfab3..7b9a667733 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java@@ -13,7 +13,7 @@ import java.util.Set;import javax.annotation.Nullable;import javax.validation.constraints.Size;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.unbescape.html.HtmlEscape;import com.google.common.collect.Lists;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.java b/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.javaindex 7d0d32f4fc..07a6383ee4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/IssueTemplate.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.issue;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.search.entity.issue.IssueQueryUpdater;import io.onedev.server.util.usage.Usage;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java b/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.javaindex 3457c40384..364c072cb7 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java@@ -4,7 +4,7 @@ import java.io.Serializable;import javax.annotation.Nullable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.model.Project;import io.onedev.server.search.entity.issue.IssueQuery;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java b/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.javaindex 30d04b5b68..486949b4a8 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.issue;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.javaindex ec90e33e34..f9edd799c5 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.issue;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Color;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.javaindex e034c048d6..1f35aeac97 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java@@ -11,7 +11,7 @@ import javax.annotation.Nullable;import javax.validation.constraints.NotNull;import javax.validation.constraints.Size;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.javaindex af89eeb32b..db6c61111b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java@@ -9,7 +9,7 @@ import java.util.Set;import javax.validation.Valid;import org.apache.wicket.MarkupContainer;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/FieldSupply.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/FieldSupply.javaindex 3ab12a06b7..046efe6cd7 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/FieldSupply.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/FieldSupply.java@@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/ScriptingValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/ScriptingValue.javaindex 724af5effe..11378d6bee 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/ScriptingValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/ScriptingValue.java@@ -8,7 +8,7 @@ import java.util.Map;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.model.Build;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.javaindex 1a5b34a61c..dd64a239ff 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java@@ -7,7 +7,7 @@ import java.util.Map;import javax.annotation.Nullable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.javaindex 9561347fbb..a3420dc0f8 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.pullrequest;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.javaindex 2201d7a9a3..8b1ff0d9d8 100644--- a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java+++ b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java@@ -6,7 +6,7 @@ import java.util.List;import javax.annotation.Nullable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.codeassist.InputSuggestion;diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.javaindex b7d6552201..59a9982dd8 100644--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java@@ -230,7 +230,7 @@ public class DefaultPersistManager implements PersistManager {protected Connection getConnection() {try {Driver driver = (Driver) Class.forName(properties.getDriver(), true,- Thread.currentThread().getContextClassLoader()).newInstance();+ Thread.currentThread().getContextClassLoader()).getDeclaredConstructor().newInstance();Properties connectProps = new Properties();String user = properties.getUser();String password = properties.getPassword();diff --git a/server-core/src/main/java/io/onedev/server/rest/EmailAddressResource.java b/server-core/src/main/java/io/onedev/server/rest/EmailAddressResource.javaindex 951eaf94fd..4ed34676d9 100644--- a/server-core/src/main/java/io/onedev/server/rest/EmailAddressResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/EmailAddressResource.java@@ -17,8 +17,8 @@ import javax.ws.rs.core.MediaType;import javax.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;-import org.hibernate.validator.constraints.Email;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.Email;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.entitymanager.EmailAddressManager;diff --git a/server-core/src/main/java/io/onedev/server/rest/IssueResource.java b/server-core/src/main/java/io/onedev/server/rest/IssueResource.javaindex f4ccc4741a..44f708753b 100644--- a/server-core/src/main/java/io/onedev/server/rest/IssueResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/IssueResource.java@@ -25,7 +25,7 @@ import javax.ws.rs.core.MediaType;import javax.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.IssueManager;diff --git a/server-core/src/main/java/io/onedev/server/rest/JobRunResource.java b/server-core/src/main/java/io/onedev/server/rest/JobRunResource.javaindex 59a096737b..71975278b5 100644--- a/server-core/src/main/java/io/onedev/server/rest/JobRunResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/JobRunResource.java@@ -21,7 +21,7 @@ import org.apache.shiro.authz.UnauthorizedException;import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.buildspec.job.JobManager;import io.onedev.server.buildspec.job.SubmitReason;diff --git a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.javaindex 80cbc42f66..b2c4dfbaa1 100644--- a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java@@ -25,7 +25,7 @@ import javax.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;import org.hibernate.criterion.Restrictions;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.entitymanager.MilestoneManager;diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.javaindex 17cb6ec7be..464c14cb50 100644--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java@@ -22,7 +22,7 @@ import javax.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;import org.eclipse.jgit.lib.ObjectId;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.joda.time.DateTime;import io.onedev.commons.utils.ExplicitException;diff --git a/server-core/src/main/java/io/onedev/server/rest/RepositoryResource.java b/server-core/src/main/java/io/onedev/server/rest/RepositoryResource.javaindex 69d256865e..0e74ca7eb8 100644--- a/server-core/src/main/java/io/onedev/server/rest/RepositoryResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/RepositoryResource.java@@ -37,7 +37,7 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevTree;import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-core/src/main/java/io/onedev/server/rest/TriggerJobResource.java b/server-core/src/main/java/io/onedev/server/rest/TriggerJobResource.javaindex 4cb6925db8..9dbf73a6ca 100644--- a/server-core/src/main/java/io/onedev/server/rest/TriggerJobResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/TriggerJobResource.java@@ -20,7 +20,7 @@ import javax.ws.rs.core.UriInfo;import org.apache.shiro.authz.UnauthorizedException;import org.apache.shiro.util.ThreadContext;import org.eclipse.jgit.revwalk.RevCommit;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.utils.StringUtils;import io.onedev.server.buildspec.job.JobManager;diff --git a/server-core/src/main/java/io/onedev/server/rest/UserResource.java b/server-core/src/main/java/io/onedev/server/rest/UserResource.javaindex 416b78c592..7b68a6d59d 100644--- a/server-core/src/main/java/io/onedev/server/rest/UserResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/UserResource.java@@ -26,8 +26,8 @@ import javax.ws.rs.core.Response;import org.apache.shiro.authc.credential.PasswordService;import org.apache.shiro.authz.UnauthenticatedException;import org.apache.shiro.authz.UnauthorizedException;-import org.hibernate.validator.constraints.Email;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.Email;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.entitymanager.EmailAddressManager;diff --git a/server-core/src/main/java/io/onedev/server/rest/jersey/ParamCheckFilter.java b/server-core/src/main/java/io/onedev/server/rest/jersey/ParamCheckFilter.javaindex 16d1817ddd..8af21e5f10 100644--- a/server-core/src/main/java/io/onedev/server/rest/jersey/ParamCheckFilter.java+++ b/server-core/src/main/java/io/onedev/server/rest/jersey/ParamCheckFilter.java@@ -15,7 +15,7 @@ import javax.ws.rs.core.Context;import javax.ws.rs.core.UriInfo;import javax.ws.rs.ext.Provider;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.rest.TriggerJobResource;import io.onedev.server.rest.exception.InvalidParamException;diff --git a/server-core/src/main/java/io/onedev/server/rest/support/FileEditRequest.java b/server-core/src/main/java/io/onedev/server/rest/support/FileEditRequest.javaindex 382b975a92..bd2b936e5b 100644--- a/server-core/src/main/java/io/onedev/server/rest/support/FileEditRequest.java+++ b/server-core/src/main/java/io/onedev/server/rest/support/FileEditRequest.java@@ -2,7 +2,7 @@ package io.onedev.server.rest.support;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;public abstract class FileEditRequest implements Serializable {diff --git a/server-core/src/main/java/io/onedev/server/rest/support/JobRun.java b/server-core/src/main/java/io/onedev/server/rest/support/JobRun.javaindex f14113deba..ecd194a22f 100644--- a/server-core/src/main/java/io/onedev/server/rest/support/JobRun.java+++ b/server-core/src/main/java/io/onedev/server/rest/support/JobRun.java@@ -7,7 +7,7 @@ import java.util.Map;import javax.validation.constraints.NotNull;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.rest.annotation.Api;diff --git a/server-core/src/main/java/io/onedev/server/rest/support/JobRunOnCommit.java b/server-core/src/main/java/io/onedev/server/rest/support/JobRunOnCommit.javaindex 2d5df35b81..fd125e0fca 100644--- a/server-core/src/main/java/io/onedev/server/rest/support/JobRunOnCommit.java+++ b/server-core/src/main/java/io/onedev/server/rest/support/JobRunOnCommit.java@@ -2,7 +2,7 @@ package io.onedev.server.rest.support;import javax.validation.constraints.NotNull;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.model.Build;import io.onedev.server.rest.annotation.Api;diff --git a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.javaindex dd254b0580..c7b1c5d63a 100644--- a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java@@ -1,6 +1,7 @@package io.onedev.server.util;import java.io.IOException;+import java.lang.reflect.InvocationTargetException;import java.util.HashMap;import java.util.Map;@@ -105,12 +106,12 @@ public class GroovyUtils {Class<?> scriptClass = compile(scriptContent);Script script;try {- Object instance = scriptClass.newInstance();+ Object instance = scriptClass.getDeclaredConstructor().newInstance();if (!(instance instanceof Script))return scriptClass;elsescript = (Script) instance;- } catch (InstantiationException | IllegalAccessException e) {+ } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {throw new RuntimeException(e);}script.setBinding(getBinding(variables));diff --git a/server-core/src/main/java/io/onedev/server/util/channelnotification/ChannelNotification.java b/server-core/src/main/java/io/onedev/server/util/channelnotification/ChannelNotification.javaindex 2773d3b80f..8dd47cb8e3 100644--- a/server-core/src/main/java/io/onedev/server/util/channelnotification/ChannelNotification.java+++ b/server-core/src/main/java/io/onedev/server/util/channelnotification/ChannelNotification.java@@ -2,7 +2,7 @@ package io.onedev.server.util.channelnotification;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.event.ProjectEvent;import io.onedev.server.event.RefUpdated;diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.javaindex f602351ca2..c310fe8bf9 100644--- a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java+++ b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java@@ -1,6 +1,7 @@package io.onedev.server.util.jackson.hibernate;import java.io.IOException;+import java.lang.reflect.InvocationTargetException;import org.hibernate.proxy.HibernateProxy;@@ -84,8 +85,9 @@ public class EntityDeserializer extends BeanDeserializer {// reach end of objectAbstractEntity entity;try {- entity = entityClass.newInstance();- } catch (InstantiationException | IllegalAccessException e) {+ entity = entityClass.getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}for (PropertyValue pv = buffer; pv != null; pv = pv.next)diff --git a/server-core/src/main/java/io/onedev/server/web/avatar/AvatarGenerator.java b/server-core/src/main/java/io/onedev/server/web/avatar/AvatarGenerator.javaindex 0b61d782ce..944498913e 100644--- a/server-core/src/main/java/io/onedev/server/web/avatar/AvatarGenerator.java+++ b/server-core/src/main/java/io/onedev/server/web/avatar/AvatarGenerator.java@@ -70,7 +70,7 @@ public class AvatarGenerator {ig2.setColor(background);ig2.fillRect(0, 0, width, height);- int fontSize = new Double(height * 0.5d).intValue();+ int fontSize = Double.valueOf(height * 0.5d).intValue();Font font = new Font(fontFamily, Font.PLAIN, fontSize);Map<TextAttribute, Object> map = new Hashtable<TextAttribute, Object>();map.put(TextAttribute.WEIGHT, TextAttribute.WEIGHT_BOLD);diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/create/BranchBean.java b/server-core/src/main/java/io/onedev/server/web/component/branch/create/BranchBean.javaindex f5f547de1c..8ec5814dc9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/create/BranchBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/create/BranchBean.java@@ -6,7 +6,7 @@ import javax.validation.ConstraintValidatorContext;import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.Repository;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;diff --git a/server-core/src/main/java/io/onedev/server/web/component/createtag/TagBean.java b/server-core/src/main/java/io/onedev/server/web/component/createtag/TagBean.javaindex 7f1b52e5ee..c1043caae4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/createtag/TagBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/createtag/TagBean.java@@ -6,7 +6,7 @@ import javax.validation.ConstraintValidatorContext;import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.Repository;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/SuggestionBatchApplyBean.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/SuggestionBatchApplyBean.javaindex 4c4bea3298..b77a953fcc 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/SuggestionBatchApplyBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/SuggestionBatchApplyBean.java@@ -2,7 +2,7 @@ package io.onedev.server.web.component.diff.revision;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Multiline;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.javaindex 29e836a308..3ad9e4e667 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java@@ -1,6 +1,7 @@package io.onedev.server.web.component.issue.list;import java.io.Serializable;+import java.lang.reflect.InvocationTargetException;import java.util.ArrayList;import java.util.Collection;import java.util.HashSet;@@ -211,8 +212,9 @@ abstract class BatchEditPanel extends Panel implements InputContext {customFieldsBean = issue.getFieldBean(fieldBeanClass, false);} else {try {- customFieldsBean = fieldBeanClass.newInstance();- } catch (InstantiationException | IllegalAccessException e) {+ customFieldsBean = fieldBeanClass.getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}FieldUtils.clearFields(customFieldsBean);diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.javaindex a4341eaa90..f2c4ef0d88 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.List;import java.util.stream.Collectors;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldResolution.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldResolution.javaindex 8691d6a5d9..aaf325ebaa 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldResolution.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldResolution.java@@ -6,7 +6,7 @@ import java.util.List;import javax.validation.constraints.NotNull;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValueResolution.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValueResolution.javaindex 4829785010..fa410befc8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValueResolution.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValueResolution.java@@ -6,7 +6,7 @@ import java.util.List;import javax.validation.constraints.NotNull;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import com.google.common.base.Preconditions;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedStateResolution.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedStateResolution.javaindex a9238a83f6..99764f470e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedStateResolution.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedStateResolution.java@@ -6,7 +6,7 @@ import java.util.List;import javax.validation.constraints.NotNull;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.javaindex 83d5b03024..929741c929 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java@@ -1,6 +1,7 @@package io.onedev.server.web.component.job;import java.io.Serializable;+import java.lang.reflect.InvocationTargetException;import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;@@ -93,8 +94,10 @@ public abstract class RunJobLink extends AjaxLink<Void> {if (refNames.size() > 1 || !job.getParamSpecs().isEmpty()) {Serializable paramBean;try {- paramBean = ParamUtils.defineBeanClass(job.getParamSpecs()).newInstance();- } catch (InstantiationException | IllegalAccessException e) {+ paramBean = ParamUtils.defineBeanClass(job.getParamSpecs())+ .getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryBean.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryBean.javaindex 71754fc8b4..6b7e50fd78 100644--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryBean.java@@ -2,7 +2,7 @@ package io.onedev.server.web.component.savedquery;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyBean.java b/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyBean.javaindex e34a617c71..07aa2e6793 100644--- a/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/SuggestionApplyBean.java@@ -2,7 +2,7 @@ package io.onedev.server.web.component.suggestionapply;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.BranchChoice;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditBean.java b/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditBean.javaindex f02cc70fae..2ef763785c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditBean.java@@ -2,7 +2,7 @@ package io.onedev.server.web.component.user.passwordedit;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.validation.annotation.CurrentPassword;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.javaindex 67b7ed1b81..c30bcf7781 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable;import java.io.Serializable;+import java.lang.reflect.InvocationTargetException;import java.lang.reflect.Method;import java.util.ArrayList;import java.util.Collection;@@ -100,8 +101,9 @@ public class BeanDescriptor implements Serializable {public Object newBeanInstance() {try {- return getBeanClass().newInstance();- } catch (InstantiationException | IllegalAccessException e) {+ return getBeanClass().getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/EditableStringTransformer.java b/server-core/src/main/java/io/onedev/server/web/editable/EditableStringTransformer.javaindex 3d2c1c5de0..473f29441b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/EditableStringTransformer.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/EditableStringTransformer.java@@ -25,8 +25,9 @@ public class EditableStringTransformer {T transformed;try {- transformed = clazz.newInstance();- } catch (InstantiationException | IllegalAccessException e) {+ transformed = clazz.getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.java b/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.javaindex 83a8c4985d..c554509326 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.model.support.build.JobSecret;import io.onedev.server.web.editable.annotation.ChoiceProvider;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.javaindex 1150d29779..cb7033fa0d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java@@ -12,7 +12,7 @@ import javax.annotation.Nullable;import javax.validation.constraints.NotNull;import javax.validation.constraints.Size;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import com.google.common.base.Preconditions;import com.google.common.collect.Sets;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.javaindex d0620532e5..bb5277f9a7 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable.bean;import java.io.Serializable;+import java.lang.reflect.InvocationTargetException;import java.util.HashSet;import java.util.Set;@@ -121,8 +122,9 @@ public class BeanPropertyEditor extends PropertyEditor<Serializable> {private Serializable newProperty() {try {- return (Serializable) getDescriptor().getPropertyClass().newInstance();- } catch (InstantiationException | IllegalAccessException e) {+ return (Serializable) getDescriptor().getPropertyClass().getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.javaindex 48306ebe3b..0bec30e4fb 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable.beanlist;import java.io.Serializable;+import java.lang.reflect.InvocationTargetException;import java.util.ArrayList;import java.util.HashSet;import java.util.Iterator;@@ -80,8 +81,9 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {private List<Serializable> newList() {if (ClassUtils.isConcrete(getDescriptor().getPropertyClass())) {try {- return (List<Serializable>) getDescriptor().getPropertyClass().newInstance();- } catch (InstantiationException | IllegalAccessException e) {+ return (List<Serializable>) getDescriptor().getPropertyClass().getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}} else {@@ -91,8 +93,9 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {private Serializable newElement() {try {- return (Serializable) elementClass.newInstance();- } catch (InstantiationException | IllegalAccessException e) {+ return (Serializable) elementClass.getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditPanel.javaindex 459e890a8f..ad5cd6e326 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditPanel.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable.buildspec.param.supply;import java.io.Serializable;+import java.lang.reflect.InvocationTargetException;import java.util.ArrayList;import java.util.HashMap;import java.util.LinkedHashMap;@@ -118,8 +119,10 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {private Serializable getDefaultParamBean() {if (defaultParamBean == null) {try {- defaultParamBean = ParamUtils.defineBeanClass(new ArrayList<>(getParamSpecs().values())).newInstance();- } catch (InstantiationException | IllegalAccessException e) {+ defaultParamBean = ParamUtils.defineBeanClass(new ArrayList<>(getParamSpecs().values()))+ .getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}}@@ -290,8 +293,9 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {Serializable paramBean;try {- paramBean = getDefaultParamBean().getClass().newInstance();- } catch (InstantiationException | IllegalAccessException e) {+ paramBean = getDefaultParamBean().getClass().getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.javaindex 8118f5e4c6..3555f2c59f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable.buildspec.step;import java.io.Serializable;+import java.lang.reflect.InvocationTargetException;import java.util.ArrayList;import java.util.Collections;import java.util.List;@@ -76,8 +77,9 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {Step step;try {- step = type.newInstance();- } catch (InstantiationException | IllegalAccessException e) {+ step = type.getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.javaindex 66f60c2036..5fd6ce5873 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable.issue.fieldsupply;import java.io.Serializable;+import java.lang.reflect.InvocationTargetException;import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;@@ -91,8 +92,9 @@ class FieldListEditPanel extends PropertyEditor<List<Serializable>> {if (defaultFieldBean == null) {Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass();try {- defaultFieldBean = (Serializable) fieldBeanClass.newInstance();- } catch (InstantiationException | IllegalAccessException e) {+ defaultFieldBean = (Serializable) fieldBeanClass.getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}}@@ -232,8 +234,9 @@ class FieldListEditPanel extends PropertyEditor<List<Serializable>> {Serializable fieldBean;try {- fieldBean = getDefaultFieldBean().getClass().newInstance();- } catch (InstantiationException | IllegalAccessException e) {+ fieldBean = getDefaultFieldBean().getClass().getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.javaindex b23ea6047d..ac514d80d2 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable.polymorphic;import java.io.Serializable;+import java.lang.reflect.InvocationTargetException;import java.util.ArrayList;import java.util.HashSet;import java.util.List;@@ -121,7 +122,7 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {for (Class<?> each: implementations) {if (getDisplayName(each).equals(object)) {try {- propertyValue = (Serializable) each.newInstance();+ propertyValue = (Serializable) each.getDeclaredConstructor().newInstance();Serializable prevPropertyValue = PolymorphicPropertyEditor.this.getConvertedInput();if (prevPropertyValue != null) {BeanDescriptor prevDescriptor = new BeanDescriptor(prevPropertyValue.getClass());@@ -134,7 +135,8 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {}}}- } catch (InstantiationException | IllegalAccessException e) {+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}break;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticationToken.java b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticationToken.javaindex a6408df991..95e5132042 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticationToken.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticationToken.java@@ -2,7 +2,7 @@ package io.onedev.server.web.page.admin.authenticator;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Password;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AddAgentPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AddAgentPanel.htmlindex 961c25454a..36156f74e7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AddAgentPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AddAgentPanel.html@@ -13,7 +13,7 @@<div class="alert alert-light p-0 py-4"><div class="px-3 mb-2">Follow below steps to install agent on remote machine (supports Linux/Windows/Mac OS X/FreeBSD):</div><ol class="mb-0">- <li>Make sure <a href="https://openjdk.java.net" target="_blank">JDK 1.8 or higher</a> is installed</li>+ <li>Make sure <a href="https://openjdk.java.net" target="_blank">Java 11 or higher</a> is installed</li><li>Make sure docker engine is installed and docker command line is available in system path</li><li>Make sure current user has permission to run docker containers</li><li>Make sure git version 2.11.1 or higher is installed and available in system path</li>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.javaindex 3d7e86678b..48bb97e8d1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java@@ -1,6 +1,7 @@package io.onedev.server.web.page.admin.buildsetting.jobexecutor;import java.io.Serializable;+import java.lang.reflect.InvocationTargetException;import java.lang.reflect.ParameterizedType;import java.lang.reflect.Type;import java.util.List;@@ -152,8 +153,9 @@ abstract class JobExecutorEditPanel extends Panel {if (testDataClass != null) {if (testData == null || testData.getClass() != testDataClass) {try {- testData = testDataClass.newInstance();- } catch (InstantiationException | IllegalAccessException e) {+ testData = testDataClass.getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.javaindex adca2b4523..acb0582454 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/pluginsettings/ContributedAdministrationSettingPage.java@@ -1,6 +1,7 @@package io.onedev.server.web.page.admin.pluginsettings;import java.io.Serializable;+import java.lang.reflect.InvocationTargetException;import javax.annotation.Nullable;import javax.validation.Validator;@@ -104,8 +105,9 @@ public class ContributedAdministrationSettingPage extends AdministrationPage {beanEditor.setVisible(object);} else {try {- form.replace(newBeanEditor(settingClass.newInstance()));- } catch (InstantiationException | IllegalAccessException e) {+ form.replace(newBeanEditor(settingClass.getDeclaredConstructor().newInstance()));+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}}@@ -117,8 +119,11 @@ public class ContributedAdministrationSettingPage extends AdministrationPage {protected void onConfigure() {super.onConfigure();try {- setVisible(!OneDev.getInstance(Validator.class).validate(settingClass.newInstance()).isEmpty());- } catch (InstantiationException | IllegalAccessException e) {+ setVisible(!OneDev.getInstance(Validator.class)+ .validate(settingClass.getDeclaredConstructor().newInstance())+ .isEmpty());+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.javaindex 99035c6210..163f82347a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java@@ -2,6 +2,7 @@ package io.onedev.server.web.page.help;import java.io.Serializable;import java.lang.reflect.Field;+import java.lang.reflect.InvocationTargetException;import java.lang.reflect.Method;import java.lang.reflect.Modifier;import java.lang.reflect.Type;@@ -75,8 +76,9 @@ public class ApiHelpUtils {collection = new HashSet<>();} else {try {- collection = (Collection<Object>) valueClass.newInstance();- } catch (InstantiationException | IllegalAccessException e) {+ collection = (Collection<Object>) valueClass.getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}}@@ -95,8 +97,9 @@ public class ApiHelpUtils {map = new HashMap<>();} else {try {- map = (Map<Object, Object>) valueClass.newInstance();- } catch (InstantiationException | IllegalAccessException e) {+ map = (Map<Object, Object>) valueClass.getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}}@@ -120,7 +123,7 @@ public class ApiHelpUtils {Object fieldValue = new ExampleProvider(valueClass, field.getAnnotation(Api.class)).getExample();if (fieldValue == null) {if (field.getAnnotation(ManyToOne.class) != null || field.getAnnotation(JoinColumn.class) != null) {- fieldValue = field.getType().newInstance();+ fieldValue = field.getType().getDeclaredConstructor().newInstance();Field idField = AbstractEntity.class.getDeclaredField("id");Object id = new ExampleProvider(idField.getType(), idField.getAnnotation(Api.class)).getExample();if (id == null)@@ -135,7 +138,8 @@ public class ApiHelpUtils {field.set(value, fieldValue);}}- } catch (InstantiationException | IllegalAccessException | NoSuchFieldException | SecurityException e) {+ } catch (InstantiationException | IllegalAccessException | NoSuchFieldException | SecurityException+ | IllegalArgumentException | InvocationTargetException | NoSuchMethodException e) {throw new RuntimeException(e);}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/IncompatibilitiesPage.html b/server-core/src/main/java/io/onedev/server/web/page/help/IncompatibilitiesPage.htmlindex 7073d0e7ed..c139377df6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/IncompatibilitiesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/help/IncompatibilitiesPage.html@@ -1,8 +1,8 @@<wicket:extend><div class="m-2 m-sm-5 card"><div class="card-body">- <div wicket:id="warning" class="alert alert-warning mb-5">- <wicket:svg href="warning" class="icon"/> There are incompatibilities since your upgraded version+ <div wicket:id="warning" class="alert alert-notice alert-light-warning font-size-lg font-weight-bolder mb-5">+ There are incompatibilities since your upgraded version</div><div wicket:id="incompatibilities"></div><wicket:enclosure>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.javaindex 7e6592ee8a..4172b73f54 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java@@ -4,6 +4,7 @@ import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer.getUrlSegment;import java.io.Serializable;+import java.lang.reflect.InvocationTargetException;import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.Collection;@@ -1083,8 +1084,9 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Busuper.onSubmit(target, form);T newElement;try {- newElement = elementClass.newInstance();- } catch (InstantiationException | IllegalAccessException e) {+ newElement = elementClass.getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.javaindex 8c2257627b..8f62ab7433 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java@@ -80,7 +80,7 @@ public abstract class AdvancedSearchPanel extends Panel {Class<? extends SearchOption> activeTab = WebSession.get().getMetaData(ACTIVE_TAB);if (activeTab != null) {try {- option = activeTab.newInstance();+ option = activeTab.getDeclaredConstructor().newInstance();} catch (Exception e) {throw ExceptionUtils.unchecked(e);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/BranchBeanWithRevision.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/BranchBeanWithRevision.javaindex a443298c1d..844ff454b6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/BranchBeanWithRevision.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/BranchBeanWithRevision.java@@ -1,6 +1,6 @@package io.onedev.server.web.page.project.branches;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.component.branch.create.BranchBean;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/AuthorizationBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/AuthorizationBean.javaindex 25432d38d2..b38118b3ae 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/AuthorizationBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/AuthorizationBean.java@@ -4,7 +4,7 @@ import java.io.Serializable;import javax.validation.constraints.Size;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.RoleChoice;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.javaindex 4f8d7b4865..91718d51f1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java@@ -1,6 +1,7 @@package io.onedev.server.web.page.project.setting.pluginsettings;import java.io.Serializable;+import java.lang.reflect.InvocationTargetException;import javax.annotation.Nullable;import javax.validation.Validator;@@ -107,8 +108,9 @@ public class ContributedProjectSettingPage extends ProjectSettingPage {beanEditor.setVisible(object);} else {try {- form.replace(newBeanEditor(settingClass.newInstance()));- } catch (InstantiationException | IllegalAccessException e) {+ form.replace(newBeanEditor(settingClass.getDeclaredConstructor().newInstance()));+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}}@@ -120,8 +122,11 @@ public class ContributedProjectSettingPage extends ProjectSettingPage {protected void onConfigure() {super.onConfigure();try {- setVisible(!OneDev.getInstance(Validator.class).validate(settingClass.newInstance()).isEmpty());- } catch (InstantiationException | IllegalAccessException e) {+ setVisible(!OneDev.getInstance(Validator.class)+ .validate(settingClass.getDeclaredConstructor().newInstance())+ .isEmpty());+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/TagBeanWithRevision.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/TagBeanWithRevision.javaindex d09d81768d..f20aa562bb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/TagBeanWithRevision.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/TagBeanWithRevision.java@@ -1,6 +1,6 @@package io.onedev.server.web.page.project.tags;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.component.createtag.TagBean;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/web/resourcebundle/ResourceBundleReferences.java b/server-core/src/main/java/io/onedev/server/web/resourcebundle/ResourceBundleReferences.javaindex dabd0131cd..921dffbc04 100644--- a/server-core/src/main/java/io/onedev/server/web/resourcebundle/ResourceBundleReferences.java+++ b/server-core/src/main/java/io/onedev/server/web/resourcebundle/ResourceBundleReferences.java@@ -1,6 +1,7 @@package io.onedev.server.web.resourcebundle;import java.lang.reflect.Constructor;+import java.lang.reflect.InvocationTargetException;import java.util.ArrayList;import java.util.Collection;import java.util.HashSet;@@ -173,8 +174,9 @@ public class ResourceBundleReferences {if (hasDefaultCtor) {ResourceReference resource;try {- resource = resourceClass.newInstance();- } catch (InstantiationException | IllegalAccessException e) {+ resource = resourceClass.getDeclaredConstructor().newInstance();+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}dependencyMap.put(resource, getDependencyAware(resource));diff --git a/server-core/src/main/java/io/onedev/server/web/util/CommitMessageBean.java b/server-core/src/main/java/io/onedev/server/web/util/CommitMessageBean.javaindex 2e4b5eb6bf..39e7fc7221 100644--- a/server-core/src/main/java/io/onedev/server/web/util/CommitMessageBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/CommitMessageBean.java@@ -2,7 +2,7 @@ package io.onedev.server.web.util;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Multiline;diff --git a/server-core/src/main/java/io/onedev/server/web/util/editablebean/NewUserBean.java b/server-core/src/main/java/io/onedev/server/web/util/editablebean/NewUserBean.javaindex a5ba174f3c..edbabdfd87 100644--- a/server-core/src/main/java/io/onedev/server/web/util/editablebean/NewUserBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/editablebean/NewUserBean.java@@ -1,7 +1,7 @@package io.onedev.server.web.util.editablebean;-import org.hibernate.validator.constraints.Email;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.Email;+import javax.validation.constraints.NotEmpty;import io.onedev.server.model.User;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/web/util/editablebean/ProjectAuthorizationBean.java b/server-core/src/main/java/io/onedev/server/web/util/editablebean/ProjectAuthorizationBean.javaindex bb825113db..6f7273ddaa 100644--- a/server-core/src/main/java/io/onedev/server/web/util/editablebean/ProjectAuthorizationBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/editablebean/ProjectAuthorizationBean.java@@ -2,7 +2,7 @@ package io.onedev.server.web.util.editablebean;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.ProjectChoice;diff --git a/server-core/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java b/server-core/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.javaindex 41eea9dcd5..d9cd74810b 100644--- a/server-core/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java+++ b/server-core/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java@@ -6,42 +6,36 @@*/package org.hibernate.validator.internal.engine;-import static org.hibernate.validator.internal.util.CollectionHelper.newArrayList;-import static org.hibernate.validator.internal.util.CollectionHelper.newHashMap;import static org.hibernate.validator.internal.util.logging.Messages.MESSAGES;-import java.lang.annotation.ElementType;-import java.lang.reflect.AccessibleObject;+import java.lang.invoke.MethodHandles;import java.lang.reflect.Constructor;-import java.lang.reflect.Field;-import java.lang.reflect.Member;+import java.lang.reflect.Executable;import java.lang.reflect.Method;-import java.lang.reflect.Type;-import java.security.AccessController;-import java.security.PrivilegedAction;+import java.util.ArrayList;import java.util.Arrays;import java.util.Collection;import java.util.Collections;+import java.util.Comparator;+import java.util.HashMap;import java.util.Iterator;import java.util.List;import java.util.Map;+import java.util.Optional;import java.util.Set;-import java.util.concurrent.ConcurrentMap;import javax.validation.ConstraintValidatorFactory;import javax.validation.ConstraintViolation;import javax.validation.ElementKind;-import javax.validation.MessageInterpolator;-import javax.validation.ParameterNameProvider;import javax.validation.Path;import javax.validation.TraversableResolver;import javax.validation.Validator;import javax.validation.executable.ExecutableValidator;import javax.validation.groups.Default;import javax.validation.metadata.BeanDescriptor;+import javax.validation.valueextraction.ValueExtractor;-import org.hibernate.validator.HibernateValidatorPermission;-import org.hibernate.validator.internal.engine.ValidationContext.ValidationContextBuilder;+import org.hibernate.validator.constraintvalidation.HibernateConstraintValidatorInitializationContext;import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorManager;import org.hibernate.validator.internal.engine.groups.Group;import org.hibernate.validator.internal.engine.groups.GroupWithInheritance;@@ -50,10 +44,21 @@ import org.hibernate.validator.internal.engine.groups.ValidationOrder;import org.hibernate.validator.internal.engine.groups.ValidationOrderGenerator;import org.hibernate.validator.internal.engine.path.NodeImpl;import org.hibernate.validator.internal.engine.path.PathImpl;-import org.hibernate.validator.internal.engine.resolver.CachingTraversableResolverForSingleValidation;-import org.hibernate.validator.internal.engine.valuehandling.UnwrapMode;+import org.hibernate.validator.internal.engine.resolver.TraversableResolvers;+import org.hibernate.validator.internal.engine.validationcontext.BaseBeanValidationContext;+import org.hibernate.validator.internal.engine.validationcontext.ExecutableValidationContext;+import org.hibernate.validator.internal.engine.validationcontext.ValidationContextBuilder;+import org.hibernate.validator.internal.engine.validationcontext.ValidatorScopedContext;+import org.hibernate.validator.internal.engine.valuecontext.BeanValueContext;+import org.hibernate.validator.internal.engine.valuecontext.ValueContext;+import org.hibernate.validator.internal.engine.valuecontext.ValueContexts;+import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorDescriptor;+import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorHelper;+import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorManager;import org.hibernate.validator.internal.metadata.BeanMetaDataManager;import org.hibernate.validator.internal.metadata.aggregated.BeanMetaData;+import org.hibernate.validator.internal.metadata.aggregated.CascadingMetaData;+import org.hibernate.validator.internal.metadata.aggregated.ContainerCascadingMetaData;import org.hibernate.validator.internal.metadata.aggregated.ExecutableMetaData;import org.hibernate.validator.internal.metadata.aggregated.ParameterMetaData;import org.hibernate.validator.internal.metadata.aggregated.PropertyMetaData;@@ -61,20 +66,13 @@ import org.hibernate.validator.internal.metadata.aggregated.ReturnValueMetaData;import org.hibernate.validator.internal.metadata.core.MetaConstraint;import org.hibernate.validator.internal.metadata.facets.Cascadable;import org.hibernate.validator.internal.metadata.facets.Validatable;-import org.hibernate.validator.internal.metadata.raw.ExecutableElement;-import org.hibernate.validator.internal.util.ConcurrentReferenceHashMap;-import org.hibernate.validator.internal.util.ConcurrentReferenceHashMap.ReferenceType;+import org.hibernate.validator.internal.metadata.location.ConstraintLocation.ConstraintLocationKind;import org.hibernate.validator.internal.util.Contracts;+import org.hibernate.validator.internal.util.ExecutableHelper;import org.hibernate.validator.internal.util.ReflectionHelper;import org.hibernate.validator.internal.util.TypeHelper;-import org.hibernate.validator.internal.util.TypeResolutionHelper;import org.hibernate.validator.internal.util.logging.Log;import org.hibernate.validator.internal.util.logging.LoggerFactory;-import org.hibernate.validator.internal.util.privilegedactions.GetDeclaredField;-import org.hibernate.validator.internal.util.privilegedactions.GetDeclaredMethod;-import org.hibernate.validator.internal.util.privilegedactions.SetAccessibility;-import org.hibernate.validator.spi.time.TimeProvider;-import org.hibernate.validator.spi.valuehandling.ValidatedValueUnwrapper;import io.onedev.server.util.validation.annotation.ClassValidating;@@ -89,12 +87,7 @@ import io.onedev.server.util.validation.annotation.ClassValidating;*/public class ValidatorImpl implements Validator, ExecutableValidator {- /**- * For compatibility with JDK 7 we cannot use ElementType#TYPE_USE- */- private static final String TYPE_USE = "TYPE_USE";-- private static final Log log = LoggerFactory.make();+ private static final Log LOG = LoggerFactory.make( MethodHandles.lookup() );/*** The default group array used in case any of the validate methods is called without a group.@@ -111,14 +104,9 @@ public class ValidatorImpl implements Validator, ExecutableValidator {*/private final ConstraintValidatorFactory constraintValidatorFactory;- /**- * {@link MessageInterpolator} as passed to the constructor of this instance.- */- private final MessageInterpolator messageInterpolator;-/*** {@link TraversableResolver} as passed to the constructor of this instance.- * Never use it directly, always use {@link #getCachingTraversableResolver()} to retrieved the single threaded caching wrapper.+ * Never use it directly, always use {@link TraversableResolvers#wrapWithCachingForSingleValidation(TraversableResolver, boolean)} to retrieved the single threaded caching wrapper.*/private final TraversableResolver traversableResolver;@@ -133,118 +121,111 @@ public class ValidatorImpl implements Validator, ExecutableValidator {*/private final ConstraintValidatorManager constraintValidatorManager;- /**- * Used for retrieving parameter names to be used in constraint violations or node names.- */- private final ParameterNameProvider parameterNameProvider;-- private final TimeProvider timeProvider;+ private final ValueExtractorManager valueExtractorManager;/**- * Indicates if validation has to be stopped on first constraint violation.+ * Context containing all {@link Validator} level helpers and configuration properties.*/- private final boolean failFast;+ private final ValidatorScopedContext validatorScopedContext;/**- * Used for resolving generic type information.+ * The constraint initialization context is stored at this level to prevent creating a new instance each time we+ * initialize a new constraint validator as, for now, it only contains Validator scoped objects.*/- private final TypeResolutionHelper typeResolutionHelper;-- /**- * Contains handlers to be applied prior to validation when validating elements.- */- private final List<ValidatedValueUnwrapper<?>> validatedValueHandlers;-- /**- * Keeps an accessible version for each non-accessible member whose value needs to be accessed during validation.- */- private final ConcurrentMap<Member, Member> accessibleMembers;+ private final HibernateConstraintValidatorInitializationContext constraintValidatorInitializationContext;public ValidatorImpl(ConstraintValidatorFactory constraintValidatorFactory,- MessageInterpolator messageInterpolator,- TraversableResolver traversableResolver,BeanMetaDataManager beanMetaDataManager,- ParameterNameProvider parameterNameProvider,- TimeProvider timeProvider,- TypeResolutionHelper typeResolutionHelper,- List<ValidatedValueUnwrapper<?>> validatedValueHandlers,+ ValueExtractorManager valueExtractorManager,ConstraintValidatorManager constraintValidatorManager,- boolean failFast) {+ ValidationOrderGenerator validationOrderGenerator,+ ValidatorFactoryScopedContext validatorFactoryScopedContext) {this.constraintValidatorFactory = constraintValidatorFactory;- this.messageInterpolator = messageInterpolator;- this.traversableResolver = traversableResolver;this.beanMetaDataManager = beanMetaDataManager;- this.parameterNameProvider = parameterNameProvider;- this.timeProvider = timeProvider;- this.typeResolutionHelper = typeResolutionHelper;- this.validatedValueHandlers = validatedValueHandlers;+ this.valueExtractorManager = valueExtractorManager;this.constraintValidatorManager = constraintValidatorManager;- this.failFast = failFast;-- validationOrderGenerator = new ValidationOrderGenerator();-- this.accessibleMembers = new ConcurrentReferenceHashMap<Member, Member>(- 100,- ReferenceType.SOFT,- ReferenceType.SOFT- );+ this.validationOrderGenerator = validationOrderGenerator;+ this.validatorScopedContext = new ValidatorScopedContext( validatorFactoryScopedContext );+ this.traversableResolver = validatorFactoryScopedContext.getTraversableResolver();+ this.constraintValidatorInitializationContext = validatorFactoryScopedContext.getConstraintValidatorInitializationContext();}@Overridepublic final <T> Set<ConstraintViolation<T>> validate(T object, Class<?>... groups) {Contracts.assertNotNull( object, MESSAGES.validatedObjectMustNotBeNull() );+ sanityCheckGroups( groups );- if ( !beanMetaDataManager.isConstrained( object.getClass() ) ) {+ @SuppressWarnings("unchecked")+ Class<T> rootBeanClass = (Class<T>) object.getClass();+ BeanMetaData<T> rootBeanMetaData = beanMetaDataManager.getBeanMetaData( rootBeanClass );++ if ( !rootBeanMetaData.hasConstraints() ) {return Collections.emptySet();}- ValidationOrder validationOrder = determineGroupValidationOrder( groups );- ValidationContext<T> validationContext = getValidationContext().forValidate( object );+ BaseBeanValidationContext<T> validationContext = getValidationContextBuilder().forValidate( rootBeanClass, rootBeanMetaData, object );- ValueContext<?, Object> valueContext = ValueContext.getLocalExecutionContext(+ ValidationOrder validationOrder = determineGroupValidationOrder( groups );+ BeanValueContext<?, Object> valueContext = ValueContexts.getLocalExecutionContextForBean(+ validatorScopedContext.getParameterNameProvider(),object,- beanMetaDataManager.getBeanMetaData( object.getClass() ),+ validationContext.getRootBeanMetaData(),PathImpl.createRootPath());- return validateInContext( valueContext, validationContext, validationOrder );+ return validateInContext( validationContext, valueContext, validationOrder );}@Overridepublic final <T> Set<ConstraintViolation<T>> validateProperty(T object, String propertyName, Class<?>... groups) {Contracts.assertNotNull( object, MESSAGES.validatedObjectMustNotBeNull() );-sanityCheckPropertyPath( propertyName );- ValidationOrder validationOrder = determineGroupValidationOrder( groups );- ValidationContext<T> context = getValidationContext().forValidateProperty( object );+ sanityCheckGroups( groups );++ @SuppressWarnings("unchecked")+ Class<T> rootBeanClass = (Class<T>) object.getClass();+ BeanMetaData<T> rootBeanMetaData = beanMetaDataManager.getBeanMetaData( rootBeanClass );- if ( !beanMetaDataManager.isConstrained( context.getRootBeanClass() ) ) {+ if ( !rootBeanMetaData.hasConstraints() ) {return Collections.emptySet();}- return validatePropertyInContext(- context,- PathImpl.createPathFromString( propertyName ),- validationOrder- );+ PathImpl propertyPath = PathImpl.createPathFromString( propertyName );+ BaseBeanValidationContext<T> validationContext = getValidationContextBuilder().forValidateProperty( rootBeanClass, rootBeanMetaData, object,+ propertyPath );++ BeanValueContext<?, Object> valueContext = getValueContextForPropertyValidation( validationContext, propertyPath );++ if ( valueContext.getCurrentBean() == null ) {+ throw LOG.getUnableToReachPropertyToValidateException( validationContext.getRootBean(), propertyPath );+ }++ ValidationOrder validationOrder = determineGroupValidationOrder( groups );++ return validateInContext( validationContext, valueContext, validationOrder );}@Overridepublic final <T> Set<ConstraintViolation<T>> validateValue(Class<T> beanType, String propertyName, Object value, Class<?>... groups) {Contracts.assertNotNull( beanType, MESSAGES.beanTypeCannotBeNull() );+ sanityCheckPropertyPath( propertyName );+ sanityCheckGroups( groups );- if ( !beanMetaDataManager.isConstrained( beanType ) ) {+ BeanMetaData<T> rootBeanMetaData = beanMetaDataManager.getBeanMetaData( beanType );++ if ( !rootBeanMetaData.hasConstraints() ) {return Collections.emptySet();}- sanityCheckPropertyPath( propertyName );+ PathImpl propertyPath = PathImpl.createPathFromString( propertyName );+ BaseBeanValidationContext<T> validationContext = getValidationContextBuilder().forValidateValue( beanType, rootBeanMetaData, propertyPath );+ValidationOrder validationOrder = determineGroupValidationOrder( groups );- ValidationContext<T> context = getValidationContext().forValidateValue( beanType );return validateValueInContext(- context,+ validationContext,value,- PathImpl.createPathFromString( propertyName ),+ propertyPath,validationOrder);}@@ -255,7 +236,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {Contracts.assertNotNull( method, MESSAGES.validatedMethodMustNotBeNull() );Contracts.assertNotNull( parameterValues, MESSAGES.validatedParameterArrayMustNotBeNull() );- return validateParameters( object, ExecutableElement.forMethod( method ), parameterValues, groups );+ return validateParameters( object, (Executable) method, parameterValues, groups );}@Override@@ -263,7 +244,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {Contracts.assertNotNull( constructor, MESSAGES.validatedConstructorMustNotBeNull() );Contracts.assertNotNull( parameterValues, MESSAGES.validatedParameterArrayMustNotBeNull() );- return validateParameters( null, ExecutableElement.forConstructor( constructor ), parameterValues, groups );+ return validateParameters( null, constructor, parameterValues, groups );}@Override@@ -271,7 +252,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {Contracts.assertNotNull( constructor, MESSAGES.validatedConstructorMustNotBeNull() );Contracts.assertNotNull( createdObject, MESSAGES.validatedConstructorCreatedInstanceMustNotBeNull() );- return validateReturnValue( null, ExecutableElement.forConstructor( constructor ), createdObject, groups );+ return validateReturnValue( null, constructor, createdObject, groups );}@Override@@ -279,49 +260,59 @@ public class ValidatorImpl implements Validator, ExecutableValidator {Contracts.assertNotNull( object, MESSAGES.validatedObjectMustNotBeNull() );Contracts.assertNotNull( method, MESSAGES.validatedMethodMustNotBeNull() );- return validateReturnValue( object, ExecutableElement.forMethod( method ), returnValue, groups );+ return validateReturnValue( object, (Executable) method, returnValue, groups );}- private <T> Set<ConstraintViolation<T>> validateParameters(T object, ExecutableElement executable, Object[] parameterValues, Class<?>... groups) {- //this might be the case for parameterless methods- if ( parameterValues == null ) {+ private <T> Set<ConstraintViolation<T>> validateParameters(T object, Executable executable, Object[] parameterValues, Class<?>... groups) {+ sanityCheckGroups( groups );++ @SuppressWarnings("unchecked")+ Class<T> rootBeanClass = object != null ? (Class<T>) object.getClass() : (Class<T>) executable.getDeclaringClass();+ BeanMetaData<T> rootBeanMetaData = beanMetaDataManager.getBeanMetaData( rootBeanClass );++ if ( !rootBeanMetaData.hasConstraints() ) {return Collections.emptySet();}- ValidationOrder validationOrder = determineGroupValidationOrder( groups );-- ValidationContext<T> context = getValidationContext().forValidateParameters(- parameterNameProvider,+ ExecutableValidationContext<T> validationContext = getValidationContextBuilder().forValidateParameters(+ rootBeanClass,+ rootBeanMetaData,object,executable,parameterValues);- if ( !beanMetaDataManager.isConstrained( context.getRootBeanClass() ) ) {- return Collections.emptySet();- }+ ValidationOrder validationOrder = determineGroupValidationOrder( groups );- validateParametersInContext( context, parameterValues, validationOrder );+ validateParametersInContext( validationContext, parameterValues, validationOrder );- return context.getFailingConstraints();+ return validationContext.getFailingConstraints();}- private <T> Set<ConstraintViolation<T>> validateReturnValue(T object, ExecutableElement executable, Object returnValue, Class<?>... groups) {- ValidationOrder validationOrder = determineGroupValidationOrder( groups );+ private <T> Set<ConstraintViolation<T>> validateReturnValue(T object, Executable executable, Object returnValue, Class<?>... groups) {+ sanityCheckGroups( groups );- ValidationContext<T> context = getValidationContext().forValidateReturnValue(+ @SuppressWarnings("unchecked")+ Class<T> rootBeanClass = object != null ? (Class<T>) object.getClass() : (Class<T>) executable.getDeclaringClass();+ BeanMetaData<T> rootBeanMetaData = beanMetaDataManager.getBeanMetaData( rootBeanClass );++ if ( !rootBeanMetaData.hasConstraints() ) {+ return Collections.emptySet();+ }++ ExecutableValidationContext<T> validationContext = getValidationContextBuilder().forValidateReturnValue(+ rootBeanClass,+ rootBeanMetaData,object,executable,returnValue);- if ( !beanMetaDataManager.isConstrained( context.getRootBeanClass() ) ) {- return Collections.emptySet();- }+ ValidationOrder validationOrder = determineGroupValidationOrder( groups );- validateReturnValueInContext( context, object, returnValue, validationOrder );+ validateReturnValueInContext( validationContext, object, returnValue, validationOrder );- return context.getFailingConstraints();+ return validationContext.getFailingConstraints();}@Override@@ -338,7 +329,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {return type.cast( this );}- throw log.getTypeNotSupportedForUnwrappingException( type );+ throw LOG.getTypeNotSupportedForUnwrappingException( type );}@Override@@ -346,33 +337,32 @@ public class ValidatorImpl implements Validator, ExecutableValidator {return this;}- private ValidationContextBuilder getValidationContext() {- return ValidationContext.getValidationContext(+ private ValidationContextBuilder getValidationContextBuilder() {+ return new ValidationContextBuilder(constraintValidatorManager,- messageInterpolator,constraintValidatorFactory,- getCachingTraversableResolver(),- timeProvider,- validatedValueHandlers,- typeResolutionHelper,- failFast+ validatorScopedContext,+ TraversableResolvers.wrapWithCachingForSingleValidation( traversableResolver, validatorScopedContext.isTraversableResolverResultCacheEnabled() ),+ constraintValidatorInitializationContext);}private void sanityCheckPropertyPath(String propertyName) {if ( propertyName == null || propertyName.length() == 0 ) {- throw log.getInvalidPropertyPathException();+ throw LOG.getInvalidPropertyPathException();}}- private ValidationOrder determineGroupValidationOrder(Class<?>[] groups) {+ private void sanityCheckGroups(Class<?>[] groups) {Contracts.assertNotNull( groups, MESSAGES.groupMustNotBeNull() );for ( Class<?> clazz : groups ) {if ( clazz == null ) {throw new IllegalArgumentException( MESSAGES.groupMustNotBeNull() );}}+ }+ private ValidationOrder determineGroupValidationOrder(Class<?>[] groups) {Collection<Class<?>> resultGroups;// if no groups is specified use the defaultif ( groups.length == 0 ) {@@ -387,20 +377,21 @@ public class ValidatorImpl implements Validator, ExecutableValidator {/*** Validates the given object using the available context information.*+ * @param validationContext the global validation context* @param valueContext the current validation context- * @param context the global validation context* @param validationOrder Contains the information which and in which order groups have to be executed* @param <T> The root bean type** @return Set of constraint violations or the empty set if there were no violations.*/- private <T, U> Set<ConstraintViolation<T>> validateInContext(ValueContext<U, Object> valueContext, ValidationContext<T> context, ValidationOrder validationOrder) {+ private <T, U> Set<ConstraintViolation<T>> validateInContext(BaseBeanValidationContext<T> validationContext, BeanValueContext<U, Object> valueContext,+ ValidationOrder validationOrder) {if ( valueContext.getCurrentBean() == null ) {return Collections.emptySet();}- BeanMetaData<U> beanMetaData = beanMetaDataManager.getBeanMetaData( valueContext.getCurrentBeanType() );- if ( beanMetaData.defaultGroupSequenceIsRedefined() ) {+ BeanMetaData<U> beanMetaData = valueContext.getCurrentBeanMetaData();+ if ( beanMetaData.isDefaultGroupSequenceRedefined() ) {validationOrder.assertDefaultGroupSequenceIsExpandable( beanMetaData.getDefaultGroupSequence( valueContext.getCurrentBean() ) );}@@ -410,18 +401,18 @@ public class ValidatorImpl implements Validator, ExecutableValidator {while ( groupIterator.hasNext() ) {Group group = groupIterator.next();valueContext.setCurrentGroup( group.getDefiningClass() );- validateConstraintsForCurrentGroup( context, valueContext );- if ( shouldFailFast( context ) ) {- return context.getFailingConstraints();+ validateConstraintsForCurrentGroup( validationContext, valueContext );+ if ( shouldFailFast( validationContext ) ) {+ return validationContext.getFailingConstraints();}}groupIterator = validationOrder.getGroupIterator();while ( groupIterator.hasNext() ) {Group group = groupIterator.next();valueContext.setCurrentGroup( group.getDefiningClass() );- validateCascadedConstraints( context, valueContext );- if ( shouldFailFast( context ) ) {- return context.getFailingConstraints();+ validateCascadedConstraints( validationContext, valueContext );+ if ( shouldFailFast( validationContext ) ) {+ return validationContext.getFailingConstraints();}}@@ -430,41 +421,30 @@ public class ValidatorImpl implements Validator, ExecutableValidator {while ( sequenceIterator.hasNext() ) {Sequence sequence = sequenceIterator.next();for ( GroupWithInheritance groupOfGroups : sequence ) {- int numberOfViolations = context.getFailingConstraints().size();+ int numberOfViolations = validationContext.getFailingConstraints().size();for ( Group group : groupOfGroups ) {valueContext.setCurrentGroup( group.getDefiningClass() );- validateConstraintsForCurrentGroup( context, valueContext );- if ( shouldFailFast( context ) ) {- return context.getFailingConstraints();+ validateConstraintsForCurrentGroup( validationContext, valueContext );+ if ( shouldFailFast( validationContext ) ) {+ return validationContext.getFailingConstraints();}- validateCascadedConstraints( context, valueContext );- if ( shouldFailFast( context ) ) {- return context.getFailingConstraints();+ validateCascadedConstraints( validationContext, valueContext );+ if ( shouldFailFast( validationContext ) ) {+ return validationContext.getFailingConstraints();}}- if ( context.getFailingConstraints().size() > numberOfViolations ) {+ if ( validationContext.getFailingConstraints().size() > numberOfViolations ) {break;}}}- return context.getFailingConstraints();+ return validationContext.getFailingConstraints();}- private void validateConstraintsForCurrentGroup(ValidationContext<?> validationContext, ValueContext<?, Object> valueContext) {- // we are not validating the default group there is nothing special to consider. If we are validating the default- // group sequence we have to consider that a class in the hierarchy could redefine the default group sequence.- /*- if ( !valueContext.validatingDefault() ) {- validateConstraintsForNonDefaultGroup( validationContext, valueContext );- }- else {- validateConstraintsForDefaultGroup( validationContext, valueContext );- }- */-+ private void validateConstraintsForCurrentGroup(BaseBeanValidationContext<?> validationContext, BeanValueContext<?, Object> valueContext) {/** Make sure child annotation can override parent annotation with same type. To make* this possible, we discard the group sequence definition feature which is rarely used@@ -473,14 +453,14 @@ public class ValidatorImpl implements Validator, ExecutableValidator {}@SuppressWarnings("unused")- private <U> void validateConstraintsForDefaultGroup(ValidationContext<?> validationContext, ValueContext<U, Object> valueContext) {- final BeanMetaData<U> beanMetaData = beanMetaDataManager.getBeanMetaData( valueContext.getCurrentBeanType() );- final Map<Class<?>, Class<?>> validatedInterfaces = newHashMap();+ private <U> void validateConstraintsForDefaultGroup(BaseBeanValidationContext<?> validationContext, BeanValueContext<U, Object> valueContext) {+ final BeanMetaData<U> beanMetaData = valueContext.getCurrentBeanMetaData();+ final Map<Class<?>, Class<?>> validatedInterfaces = new HashMap<>();// evaluating the constraints of a bean per class in hierarchy, this is necessary to detect potential default group re-definitionsfor ( Class<? super U> clazz : beanMetaData.getClassHierarchy() ) {BeanMetaData<? super U> hostingBeanMetaData = beanMetaDataManager.getBeanMetaData( clazz );- boolean defaultGroupSequenceIsRedefined = hostingBeanMetaData.defaultGroupSequenceIsRedefined();+ boolean defaultGroupSequenceIsRedefined = hostingBeanMetaData.isDefaultGroupSequenceRedefined();// if the current class redefined the default group sequence, this sequence has to be applied to all the class hierarchy.if ( defaultGroupSequenceIsRedefined ) {@@ -493,8 +473,11 @@ public class ValidatorImpl implements Validator, ExecutableValidator {for ( Group defaultSequenceMember : groupOfGroups ) {validationSuccessful = validateConstraintsForSingleDefaultGroupElement( validationContext, valueContext, validatedInterfaces, clazz,- metaConstraints, defaultSequenceMember );+ metaConstraints, defaultSequenceMember ) && validationSuccessful;}++ validationContext.markCurrentBeanAsProcessed( valueContext );+if ( !validationSuccessful ) {break;}@@ -506,10 +489,9 @@ public class ValidatorImpl implements Validator, ExecutableValidator {Set<MetaConstraint<?>> metaConstraints = hostingBeanMetaData.getDirectMetaConstraints();validateConstraintsForSingleDefaultGroupElement( validationContext, valueContext, validatedInterfaces, clazz, metaConstraints,Group.DEFAULT_GROUP );+ validationContext.markCurrentBeanAsProcessed( valueContext );}- validationContext.markCurrentBeanAsProcessed( valueContext );-// all constraints in the hierarchy has been validated, stop validation.if ( defaultGroupSequenceIsRedefined ) {break;@@ -517,12 +499,11 @@ public class ValidatorImpl implements Validator, ExecutableValidator {}}- private <U> boolean validateConstraintsForSingleDefaultGroupElement(ValidationContext<?> validationContext, ValueContext<U, Object> valueContext, final Map<Class<?>, Class<?>> validatedInterfaces,+ private <U> boolean validateConstraintsForSingleDefaultGroupElement(BaseBeanValidationContext<?> validationContext, ValueContext<U, Object> valueContext, final Map<Class<?>, Class<?>> validatedInterfaces,Class<? super U> clazz, Set<MetaConstraint<?>> metaConstraints, Group defaultSequenceMember) {boolean validationSuccessful = true;valueContext.setCurrentGroup( defaultSequenceMember.getDefiningClass() );- PathImpl currentPath = valueContext.getPropertyPath();for ( MetaConstraint<?> metaConstraint : metaConstraints ) {// HV-466, an interface implemented more than one time in the hierarchy has to be validated only one@@ -536,106 +517,71 @@ public class ValidatorImpl implements Validator, ExecutableValidator {validatedInterfaces.put( declaringClass, clazz );}- boolean tmp = validateConstraint( validationContext, valueContext, false, metaConstraint );+ boolean tmp = validateMetaConstraint( validationContext, valueContext, valueContext.getCurrentBean(), metaConstraint );if ( shouldFailFast( validationContext ) ) {return false;}validationSuccessful = validationSuccessful && tmp;- // reset property path- valueContext.setPropertyPath( currentPath );}return validationSuccessful;}- private void validateConstraintsForNonDefaultGroup(ValidationContext<?> validationContext, ValueContext<?, Object> valueContext) {- BeanMetaData<?> beanMetaData = beanMetaDataManager.getBeanMetaData( valueContext.getCurrentBeanType() );- PathImpl currentPath = valueContext.getPropertyPath();- for ( MetaConstraint<?> metaConstraint : beanMetaData.getMetaConstraints() ) {+ private void validateConstraintsForNonDefaultGroup(BaseBeanValidationContext<?> validationContext, BeanValueContext<?, Object> valueContext) {+ validateMetaConstraints( validationContext, valueContext, valueContext.getCurrentBean(), valueContext.getCurrentBeanMetaData().getMetaConstraints() );+ validationContext.markCurrentBeanAsProcessed( valueContext );+ }++ private void validateMetaConstraints(BaseBeanValidationContext<?> validationContext, ValueContext<?, Object> valueContext, Object parent,+ Iterable<MetaConstraint<?>> constraints) {++ List<MetaConstraint<?>> sortedConstraints = new ArrayList<>();+ for ( MetaConstraint<?> metaConstraint : constraints )+ sortedConstraints.add(metaConstraint);+ Collections.sort(sortedConstraints, new Comparator<MetaConstraint<?>> () {++ @Override+ public int compare(MetaConstraint<?> o1, MetaConstraint<?> o2) {+ if (o1.getDescriptor().getAnnotationType() == ClassValidating.class)+ return 1;+ else+ return -1;+ }++ });+ for ( MetaConstraint<?> metaConstraint : sortedConstraints ) {if (metaConstraint.getDescriptor().getAnnotationType() == ClassValidating.class&& !validationContext.getFailingConstraints().isEmpty()) {continue;}- validateConstraint( validationContext, valueContext, false, metaConstraint );++ validateMetaConstraint( validationContext, valueContext, parent, metaConstraint );if ( shouldFailFast( validationContext ) ) {- return;+ break;}- // reset the path to the state before this call- valueContext.setPropertyPath( currentPath );}- validationContext.markCurrentBeanAsProcessed( valueContext );}- private boolean validateConstraint(ValidationContext<?> validationContext,- ValueContext<?, Object> valueContext,- boolean propertyPathComplete,- MetaConstraint<?> metaConstraint) {-- boolean validationSuccessful;-- if ( metaConstraint.getElementType() != ElementType.TYPE ) {- PropertyMetaData propertyMetaData = beanMetaDataManager.getBeanMetaData( valueContext.getCurrentBeanType() )- .getMetaDataFor(- ReflectionHelper.getPropertyName( metaConstraint.getLocation().getMember() )- );+ private boolean validateMetaConstraint(BaseBeanValidationContext<?> validationContext, ValueContext<?, Object> valueContext, Object parent, MetaConstraint<?> metaConstraint) {+ BeanValueContext.ValueState<Object> originalValueState = valueContext.getCurrentValueState();+ valueContext.appendNode( metaConstraint.getLocation() );+ boolean success = true;- if ( !propertyPathComplete ) {- valueContext.appendNode( propertyMetaData );- }+ if ( isValidationRequired( validationContext, valueContext, metaConstraint ) ) {- if ( TYPE_USE.equals( metaConstraint.getElementType().name() ) ) {- // TYPE_USE constraints always require UNWRAP- valueContext.setUnwrapMode( UnwrapMode.UNWRAP );+ if ( parent != null ) {+ valueContext.setCurrentValidatedValue( valueContext.getValue( parent, metaConstraint.getLocation() ) );}- else {- // set the unwrapping mode for this validation- valueContext.setUnwrapMode( propertyMetaData.unwrapMode() );- }- }- else {- valueContext.appendBeanNode();- }-- validationSuccessful = validateMetaConstraint( validationContext, valueContext, metaConstraint );-- // reset the unwrapping mode- valueContext.setUnwrapMode( UnwrapMode.AUTOMATIC );- return validationSuccessful;- }-- private boolean validatePropertyTypeConstraint(ValidationContext<?> validationContext, ValueContext<?, Object> valueContext, boolean propertyPathComplete,- MetaConstraint<?> metaConstraint) {- boolean validationSuccessful;+ success = metaConstraint.validateConstraint( validationContext, valueContext );- PropertyMetaData propertyMetaData = beanMetaDataManager.getBeanMetaData( valueContext.getCurrentBeanType() )- .getMetaDataFor(- ReflectionHelper.getPropertyName( metaConstraint.getLocation().getMember() )- );-- if ( !propertyPathComplete ) {- valueContext.appendNode( propertyMetaData );+ validationContext.markConstraintProcessed( valueContext.getCurrentBean(), valueContext.getPropertyPath(), metaConstraint );}- valueContext.setUnwrapMode( UnwrapMode.UNWRAP );- validationSuccessful = validateMetaConstraint( validationContext, valueContext, metaConstraint );- valueContext.setUnwrapMode( UnwrapMode.AUTOMATIC );+ // reset the value context to the state before this call+ valueContext.resetValueState( originalValueState );- return validationSuccessful;- }-- private boolean validateMetaConstraint(ValidationContext<?> validationContext, ValueContext<?, Object> valueContext, MetaConstraint<?> metaConstraint) {- if ( isValidationRequired( validationContext, valueContext, metaConstraint ) ) {- if ( valueContext.getCurrentBean() != null ) {- Object valueToValidate = getBeanMemberValue(- valueContext.getCurrentBean(),- metaConstraint.getLocation().getMember()- );- valueContext.setCurrentValidatedValue( valueToValidate );- }- return metaConstraint.validateConstraint( validationContext, valueContext );- }- return true;+ return success;}/**@@ -645,255 +591,224 @@ public class ValidatorImpl implements Validator, ExecutableValidator {* @param validationContext The execution context* @param valueContext Collected information for single validation*/- private void validateCascadedConstraints(ValidationContext<?> validationContext, ValueContext<?, Object> valueContext) {+ private void validateCascadedConstraints(BaseBeanValidationContext<?> validationContext, ValueContext<?, Object> valueContext) {Validatable validatable = valueContext.getCurrentValidatable();- PathImpl originalPath = valueContext.getPropertyPath();- Class<?> originalGroup = valueContext.getCurrentGroup();+ BeanValueContext.ValueState<Object> originalValueState = valueContext.getCurrentValueState();for ( Cascadable cascadable : validatable.getCascadables() ) {valueContext.appendNode( cascadable );- Class<?> group = cascadable.convertGroup( originalGroup );- valueContext.setCurrentGroup( group );-- ElementType elementType = cascadable.getElementType();- if ( isCascadeRequired(- validationContext,- valueContext.getCurrentBean(),- valueContext.getPropertyPath(),- elementType- ) ) {- Object value = getBeanPropertyValue( validationContext, valueContext.getCurrentBean(), cascadable );+ if ( isCascadeRequired( validationContext, valueContext.getCurrentBean(), valueContext.getPropertyPath(),+ cascadable.getConstraintLocationKind() ) ) {+ Object value = getCascadableValue( validationContext, valueContext.getCurrentBean(), cascadable );+ CascadingMetaData cascadingMetaData = cascadable.getCascadingMetaData();if ( value != null ) {+ CascadingMetaData effectiveCascadingMetaData = cascadingMetaData.addRuntimeContainerSupport( valueExtractorManager, value.getClass() );- // expand the group only if was created by group conversion;- // otherwise we're looping through the right validation order- // already and need only to pass the current element- ValidationOrder validationOrder = validationOrderGenerator.getValidationOrder(- group,- group != originalGroup- );-- Type type = value.getClass();-- // HV-902: First, validate the properties for beans that implements Iterable and Map- if ( ReflectionHelper.isIterable( type ) || ReflectionHelper.isMap( type ) ) {- Iterator<?> valueIter = Collections.singletonList( value ).iterator();- validateCascadedConstraint(- validationContext,- valueIter,- false,- valueContext,- validationOrder,- Collections.<MetaConstraint<?>>emptySet()- );- if ( shouldFailFast( validationContext ) ) {- return;- }+ // validate cascading on the annotated object+ if ( effectiveCascadingMetaData.isCascading() ) {+ validateCascadedAnnotatedObjectForCurrentGroup( value, validationContext, valueContext, effectiveCascadingMetaData );}- // Second, validate the content of the value- Iterator<?> elementsIter = createIteratorForCascadedValue( type, value, valueContext );- boolean isIndexable = ReflectionHelper.isIndexable( type );-- validateCascadedConstraint(- validationContext,- elementsIter,- isIndexable,- valueContext,- validationOrder,- cascadable.getTypeArgumentsConstraints()- );- if ( shouldFailFast( validationContext ) ) {- return;+ if ( effectiveCascadingMetaData.isContainer() ) {+ ContainerCascadingMetaData containerCascadingMetaData = effectiveCascadingMetaData.as( ContainerCascadingMetaData.class );++ if ( containerCascadingMetaData.hasContainerElementsMarkedForCascading() ) {+ // validate cascading on the container elements+ validateCascadedContainerElementsForCurrentGroup( value, validationContext, valueContext,+ containerCascadingMetaData.getContainerElementTypesCascadingMetaData() );+ }}}}- // reset the path- valueContext.setPropertyPath( originalPath );- valueContext.setCurrentGroup( originalGroup );+ // reset the value context+ valueContext.resetValueState( originalValueState );}}- /**- * Called when processing cascaded constraints. This methods inspects the type of the cascaded constraints and in case- * of a list or array creates an iterator in order to validate each element.- *- * @param type the type of the cascaded field or property.- * @param value the actual value.- * @param valueContext context object containing state about the currently validated instance- *- * @return An iterator over the value of a cascaded property.- */- private Iterator<?> createIteratorForCascadedValue(Type type, Object value, ValueContext<?, ?> valueContext) {- Iterator<?> iter;- if ( ReflectionHelper.isIterable( type ) ) {- iter = ( (Iterable<?>) value ).iterator();- valueContext.markCurrentPropertyAsIterable();- }- else if ( ReflectionHelper.isMap( type ) ) {- Map<?, ?> map = (Map<?, ?>) value;- iter = map.entrySet().iterator();- valueContext.markCurrentPropertyAsIterable();- }- else if ( TypeHelper.isArray( type ) ) {- List<?> arrayList = Arrays.asList( (Object[]) value );- iter = arrayList.iterator();- valueContext.markCurrentPropertyAsIterable();- }- else {- iter = Collections.singletonList( value ).iterator();+ private void validateCascadedAnnotatedObjectForCurrentGroup(Object value, BaseBeanValidationContext<?> validationContext, ValueContext<?, Object> valueContext,+ CascadingMetaData cascadingMetaData) {+ // We need to convert the group before checking if the bean was processed or not+ // as group defines the processed status.+ Class<?> originalGroup = valueContext.getCurrentGroup();+ Class<?> currentGroup = cascadingMetaData.convertGroup( originalGroup );++ if ( validationContext.isBeanAlreadyValidated( value, currentGroup, valueContext.getPropertyPath() ) ||+ shouldFailFast( validationContext ) ) {+ return;}- return iter;++ // expand the group only if was created by group conversion;+ // otherwise we're looping through the right validation order+ // already and need only to pass the current element+ ValidationOrder validationOrder = validationOrderGenerator.getValidationOrder( currentGroup, currentGroup != originalGroup );++ BeanValueContext<?, Object> cascadedValueContext = buildNewLocalExecutionContext( valueContext, value );++ validateInContext( validationContext, cascadedValueContext, validationOrder );}- private void validateCascadedConstraint(ValidationContext<?> context, Iterator<?> iter, boolean isIndexable, ValueContext<?,- Object> valueContext, ValidationOrder validationOrder, Set<MetaConstraint<?>> typeArgumentsConstraint) {- Object value;- Object mapKey;- int i = 0;- while ( iter.hasNext() ) {- value = iter.next();- if ( value instanceof Map.Entry ) {- mapKey = ( (Map.Entry<?, ?>) value ).getKey();- valueContext.setKey( mapKey );- value = ( (Map.Entry<?, ?>) value ).getValue();- }- else if ( isIndexable ) {- valueContext.setIndex( i );+ private void validateCascadedContainerElementsForCurrentGroup(Object value, BaseBeanValidationContext<?> validationContext, ValueContext<?, ?> valueContext,+ List<ContainerCascadingMetaData> containerElementTypesCascadingMetaData) {+ for ( ContainerCascadingMetaData cascadingMetaData : containerElementTypesCascadingMetaData ) {+ if ( !cascadingMetaData.isMarkedForCascadingOnAnnotatedObjectOrContainerElements() ) {+ continue;}- if ( !context.isBeanAlreadyValidated(- value,- valueContext.getCurrentGroup(),- valueContext.getPropertyPath()- ) ) {- // Type arguments- validateTypeArgumentConstraints( context, buildNewLocalExecutionContext( valueContext, value ), value, typeArgumentsConstraint );-- // Cascade validation- validateInContext( buildNewLocalExecutionContext( valueContext, value ), context, validationOrder );- if ( shouldFailFast( context ) ) {- return;- }+ ValueExtractorDescriptor extractor = valueExtractorManager.getMaximallySpecificAndRuntimeContainerElementCompliantValueExtractor(+ cascadingMetaData.getEnclosingType(),+ cascadingMetaData.getTypeParameter(),+ value.getClass(),+ cascadingMetaData.getValueExtractorCandidates()+ );++ if ( extractor == null ) {+ throw LOG.getNoValueExtractorFoundForTypeException( cascadingMetaData.getEnclosingType(), cascadingMetaData.getTypeParameter(), value.getClass() );}- i++;++ CascadingValueReceiver receiver = new CascadingValueReceiver( validationContext, valueContext, cascadingMetaData );+ ValueExtractorHelper.extractValues( extractor, value, receiver );}}- private ValueContext<?, Object> buildNewLocalExecutionContext(ValueContext<?, Object> valueContext, Object value) {- ValueContext<?, Object> newValueContext;- if ( value != null ) {- newValueContext = ValueContext.getLocalExecutionContext(- value,- beanMetaDataManager.getBeanMetaData( value.getClass() ),- valueContext.getPropertyPath()- );- }- else {- newValueContext = ValueContext.getLocalExecutionContext(- valueContext.getCurrentBeanType(),- beanMetaDataManager.getBeanMetaData( valueContext.getCurrentBeanType() ),- valueContext.getPropertyPath()- );+ private class CascadingValueReceiver implements ValueExtractor.ValueReceiver {++ private final BaseBeanValidationContext<?> validationContext;+ private final ValueContext<?, ?> valueContext;+ private final ContainerCascadingMetaData cascadingMetaData;++ public CascadingValueReceiver(BaseBeanValidationContext<?> validationContext, ValueContext<?, ?> valueContext, ContainerCascadingMetaData cascadingMetaData) {+ this.validationContext = validationContext;+ this.valueContext = valueContext;+ this.cascadingMetaData = cascadingMetaData;}- return newValueContext;- }- private void validateTypeArgumentConstraints(ValidationContext<?> context,- ValueContext<?, Object> valueContext,- Object value,- Set<MetaConstraint<?>> typeArgumentsConstraints) {- valueContext.setCurrentValidatedValue( value );- valueContext.appendCollectionElementNode();- for ( MetaConstraint<?> metaConstraint : typeArgumentsConstraints ) {- metaConstraint.validateConstraint( context, valueContext );- if ( shouldFailFast( context ) ) {- return;- }+ @Override+ public void value(String nodeName, Object value) {+ doValidate( value, nodeName );}- }- private <T> Set<ConstraintViolation<T>> validatePropertyInContext(ValidationContext<T> context, PathImpl propertyPath, ValidationOrder validationOrder) {- List<MetaConstraint<?>> metaConstraints = newArrayList();- List<MetaConstraint<?>> typeUseConstraints = newArrayList();- ValueContext<?, Object> valueContext = collectMetaConstraintsForPathWithValue(- context,- propertyPath,- metaConstraints,- typeUseConstraints- );+ @Override+ public void iterableValue(String nodeName, Object value) {+ valueContext.markCurrentPropertyAsIterable();+ doValidate( value, nodeName );+ }- if ( valueContext.getCurrentBean() == null ) {- throw log.getUnableToReachPropertyToValidateException( context.getRootBean(), propertyPath );+ @Override+ public void indexedValue(String nodeName, int index, Object value) {+ valueContext.markCurrentPropertyAsIterableAndSetIndex( index );+ doValidate( value, nodeName );}- if ( metaConstraints.size() == 0 && typeUseConstraints.size() == 0 ) {- return context.getFailingConstraints();+ @Override+ public void keyedValue(String nodeName, Object key, Object value) {+ valueContext.markCurrentPropertyAsIterableAndSetKey( key );+ doValidate( value, nodeName );}- assertDefaultGroupSequenceIsExpandable( valueContext, validationOrder );+ private void doValidate(Object value, String nodeName) {+ // We need to convert the group before checking if the bean was processed or not+ // as group defines the processed status.+ Class<?> originalGroup = valueContext.getCurrentGroup();+ Class<?> currentGroup = cascadingMetaData.convertGroup( originalGroup );- // process first single groups+ if ( value == null ||+ validationContext.isBeanAlreadyValidated( value, currentGroup, valueContext.getPropertyPath() ) ||+ shouldFailFast( validationContext ) ) {+ return;+ }++ // expand the group only if was created by group conversion;+ // otherwise we're looping through the right validation order+ // already and need only to pass the current element+ ValidationOrder validationOrder = validationOrderGenerator.getValidationOrder( currentGroup, currentGroup != originalGroup );++ BeanValueContext<?, Object> cascadedValueContext = buildNewLocalExecutionContext( valueContext, value );++ if ( cascadingMetaData.getDeclaredContainerClass() != null ) {+ cascadedValueContext.setTypeParameter( cascadingMetaData.getDeclaredContainerClass(), cascadingMetaData.getDeclaredTypeParameterIndex() );+ }++ // Cascade validation+ if ( cascadingMetaData.isCascading() ) {+ validateInContext( validationContext, cascadedValueContext, validationOrder );+ }++ // Cascade validation to container elements if we are dealing with a container element+ if ( cascadingMetaData.hasContainerElementsMarkedForCascading() ) {+ ValueContext<?, Object> cascadedTypeArgumentValueContext = buildNewLocalExecutionContext( valueContext, value );+ if ( cascadingMetaData.getTypeParameter() != null ) {+ cascadedValueContext.setTypeParameter( cascadingMetaData.getDeclaredContainerClass(), cascadingMetaData.getDeclaredTypeParameterIndex() );+ }++ if ( nodeName != null ) {+ cascadedTypeArgumentValueContext.appendTypeParameterNode( nodeName );+ }++ validateCascadedContainerElementsInContext( value, validationContext, cascadedTypeArgumentValueContext, cascadingMetaData, validationOrder );+ }+ }+ }++ private void validateCascadedContainerElementsInContext(Object value, BaseBeanValidationContext<?> validationContext, ValueContext<?, ?> valueContext,+ ContainerCascadingMetaData cascadingMetaData, ValidationOrder validationOrder) {Iterator<Group> groupIterator = validationOrder.getGroupIterator();while ( groupIterator.hasNext() ) {Group group = groupIterator.next();valueContext.setCurrentGroup( group.getDefiningClass() );- validatePropertyForCurrentGroup( valueContext, context, metaConstraints, typeUseConstraints );- if ( shouldFailFast( context ) ) {- return context.getFailingConstraints();+ validateCascadedContainerElementsForCurrentGroup( value, validationContext, valueContext,+ cascadingMetaData.getContainerElementTypesCascadingMetaData() );+ if ( shouldFailFast( validationContext ) ) {+ return;}}- // now process sequences, stop after the first erroneous groupIterator<Sequence> sequenceIterator = validationOrder.getSequenceIterator();while ( sequenceIterator.hasNext() ) {Sequence sequence = sequenceIterator.next();-for ( GroupWithInheritance groupOfGroups : sequence ) {- int numberOfConstraintViolations = 0;+ int numberOfViolations = validationContext.getFailingConstraints().size();for ( Group group : groupOfGroups ) {valueContext.setCurrentGroup( group.getDefiningClass() );- numberOfConstraintViolations += validatePropertyForCurrentGroup(- valueContext, context, metaConstraints, typeUseConstraints- );- if ( shouldFailFast( context ) ) {- return context.getFailingConstraints();++ validateCascadedContainerElementsForCurrentGroup( value, validationContext, valueContext,+ cascadingMetaData.getContainerElementTypesCascadingMetaData() );+ if ( shouldFailFast( validationContext ) ) {+ return;}}- if ( numberOfConstraintViolations > 0 ) {+ if ( validationContext.getFailingConstraints().size() > numberOfViolations ) {break;}}}-- return context.getFailingConstraints();}- private <T> void assertDefaultGroupSequenceIsExpandable(ValueContext<T, ?> valueContext, ValidationOrder validationOrder) {- BeanMetaData<T> beanMetaData = beanMetaDataManager.getBeanMetaData( valueContext.getCurrentBeanType() );- if ( beanMetaData.defaultGroupSequenceIsRedefined() ) {- validationOrder.assertDefaultGroupSequenceIsExpandable( beanMetaData.getDefaultGroupSequence( valueContext.getCurrentBean() ) );- }+ private BeanValueContext<?, Object> buildNewLocalExecutionContext(ValueContext<?, ?> valueContext, Object value) {+ BeanValueContext<?, Object> newValueContext;+ Contracts.assertNotNull( value, "value cannot be null" );+ BeanMetaData<?> beanMetaData = beanMetaDataManager.getBeanMetaData( value.getClass() );+ newValueContext = ValueContexts.getLocalExecutionContextForBean(+ validatorScopedContext.getParameterNameProvider(),+ value,+ beanMetaData,+ valueContext.getPropertyPath()+ );+ newValueContext.setCurrentValidatedValue( value );++ return newValueContext;}- private <T> Set<ConstraintViolation<T>> validateValueInContext(ValidationContext<T> context, Object value, PathImpl propertyPath, ValidationOrder validationOrder) {- List<MetaConstraint<?>> metaConstraints = newArrayList();- List<MetaConstraint<?>> typeArgumentConstraints = newArrayList();- ValueContext<?, Object> valueContext = collectMetaConstraintsForPathWithoutValue(- context, propertyPath, metaConstraints, typeArgumentConstraints- );+ private <T> Set<ConstraintViolation<T>> validateValueInContext(BaseBeanValidationContext<T> validationContext, Object value, PathImpl propertyPath,+ ValidationOrder validationOrder) {+ BeanValueContext<?, Object> valueContext = getValueContextForValueValidation( validationContext.getRootBeanClass(), propertyPath );valueContext.setCurrentValidatedValue( value );- if ( metaConstraints.size() == 0 && typeArgumentConstraints.size() == 0 ) {- return context.getFailingConstraints();- }-- BeanMetaData<?> beanMetaData = beanMetaDataManager.getBeanMetaData( valueContext.getCurrentBeanType() );- if ( beanMetaData.defaultGroupSequenceIsRedefined() ) {+ BeanMetaData<?> beanMetaData = valueContext.getCurrentBeanMetaData();+ if ( beanMetaData.isDefaultGroupSequenceRedefined() ) {validationOrder.assertDefaultGroupSequenceIsExpandable( beanMetaData.getDefaultGroupSequence( null ) );}@@ -902,9 +817,9 @@ public class ValidatorImpl implements Validator, ExecutableValidator {while ( groupIterator.hasNext() ) {Group group = groupIterator.next();valueContext.setCurrentGroup( group.getDefiningClass() );- validatePropertyForCurrentGroup( valueContext, context, metaConstraints, typeArgumentConstraints );- if ( shouldFailFast( context ) ) {- return context.getFailingConstraints();+ validateConstraintsForCurrentGroup( validationContext, valueContext );+ if ( shouldFailFast( validationContext ) ) {+ return validationContext.getFailingConstraints();}}@@ -913,204 +828,49 @@ public class ValidatorImpl implements Validator, ExecutableValidator {while ( sequenceIterator.hasNext() ) {Sequence sequence = sequenceIterator.next();for ( GroupWithInheritance groupOfGroups : sequence ) {- int numberOfConstraintViolations = 0;+ int numberOfConstraintViolationsBefore = validationContext.getFailingConstraints().size();for ( Group group : groupOfGroups ) {valueContext.setCurrentGroup( group.getDefiningClass() );- numberOfConstraintViolations += validatePropertyForCurrentGroup(- valueContext, context, metaConstraints, typeArgumentConstraints- );- if ( shouldFailFast( context ) ) {- return context.getFailingConstraints();+ validateConstraintsForCurrentGroup( validationContext, valueContext );+ if ( shouldFailFast( validationContext ) ) {+ return validationContext.getFailingConstraints();}}- if ( numberOfConstraintViolations > 0 ) {+ if ( validationContext.getFailingConstraints().size() > numberOfConstraintViolationsBefore ) {break;}}}- return context.getFailingConstraints();+ return validationContext.getFailingConstraints();}- /**- * Validates the property constraints associated to the current {@code ValueContext} group.- *- * @param valueContext The current validation context.- * @param validationContext The global validation context.- * @param metaConstraints All constraints associated to the property.- * @param typeUseConstraints Type constraints associated to the property- *- * @return The number of constraint violations raised when validating the {@code ValueContext} current group.- */- private int validatePropertyForCurrentGroup(ValueContext<?, Object> valueContext, ValidationContext<?> validationContext, List<MetaConstraint<?>> metaConstraints, List<MetaConstraint<?>> typeUseConstraints) {- // we do not validate the default group, nothing special to do- if ( !valueContext.validatingDefault() ) {- return validatePropertyForNonDefaultGroup(- valueContext,- validationContext,- metaConstraints,- typeUseConstraints- );- }-- // we are validating the default group, we have to consider that a class in the hierarchy could redefine the default group sequence- return validatePropertyForDefaultGroup( valueContext, validationContext, metaConstraints, typeUseConstraints );- }-- /**- * Validates the property constraints for the current {@code ValueContext} group.- * <p>- * The current {@code ValueContext} group is not the default group.- * </p>- *- * @param valueContext The current validation context.- * @param validationContext The global validation context.- * @param metaConstraints All constraints associated to the property.- * @param typeArgumentConstraints All type argument constraints associated to the property- *- * @return The number of constraint violations raised when validating the {@code ValueContext} current group.- */- private int validatePropertyForNonDefaultGroup(ValueContext<?, Object> valueContext, ValidationContext<?> validationContext, List<MetaConstraint<?>> metaConstraints,- List<MetaConstraint<?>> typeArgumentConstraints) {- int numberOfConstraintViolationsBefore = validationContext.getFailingConstraints().size();- for ( MetaConstraint<?> metaConstraint : metaConstraints ) {- validateConstraint( validationContext, valueContext, true, metaConstraint );- if ( shouldFailFast( validationContext ) ) {- return validationContext.getFailingConstraints()- .size() - numberOfConstraintViolationsBefore;- }- }- for ( MetaConstraint<?> metaConstraint : typeArgumentConstraints ) {- validatePropertyTypeConstraint( validationContext, valueContext, true, metaConstraint );- if ( shouldFailFast( validationContext ) ) {- return validationContext.getFailingConstraints()- .size() - numberOfConstraintViolationsBefore;- }- }- return validationContext.getFailingConstraints().size() - numberOfConstraintViolationsBefore;- }-- /**- * Validates the property for the default group.- * <p>- * This method checks that the default group sequence is not redefined in the class hierarchy for a superclass- * hosting constraints for the property to validate.- * </p>- *- * @param valueContext The current validation context.- * @param validationContext The global validation context.- * @param constraintList All constraints associated to the property to check.- *- * @return The number of constraint violations raised when validating the default group.- */- private <U> int validatePropertyForDefaultGroup(ValueContext<U, Object> valueContext,- ValidationContext<?> validationContext,- List<MetaConstraint<?>> constraintList,- List<MetaConstraint<?>> typeUseConstraints) {- final int numberOfConstraintViolationsBefore = validationContext.getFailingConstraints().size();- final BeanMetaData<U> beanMetaData = beanMetaDataManager.getBeanMetaData( valueContext.getCurrentBeanType() );- final Map<Class<?>, Class<?>> validatedInterfaces = newHashMap();-- // evaluating the constraints of a bean per class in hierarchy. this is necessary to detect potential default group re-definitions- for ( Class<? super U> clazz : beanMetaData.getClassHierarchy() ) {- BeanMetaData<? super U> hostingBeanMetaData = beanMetaDataManager.getBeanMetaData( clazz );- boolean defaultGroupSequenceIsRedefined = hostingBeanMetaData.defaultGroupSequenceIsRedefined();-- if ( defaultGroupSequenceIsRedefined ) {- Iterator<Sequence> defaultGroupSequence = hostingBeanMetaData.getDefaultValidationSequence( valueContext.getCurrentBean() );- Set<MetaConstraint<?>> metaConstraints = hostingBeanMetaData.getMetaConstraints();-- while ( defaultGroupSequence.hasNext() ) {- for ( GroupWithInheritance groupOfGroups : defaultGroupSequence.next() ) {- boolean validationSuccessful = true;-- for ( Group groupClass : groupOfGroups ) {- validationSuccessful = validatePropertyForSingleDefaultGroupElement( valueContext, validationContext, constraintList,- typeUseConstraints, validatedInterfaces, clazz, metaConstraints, groupClass );- }-- if ( !validationSuccessful ) {- break;- }- }- }- }- // fast path in case the default group sequence hasn't been redefined- else {- Set<MetaConstraint<?>> metaConstraints = hostingBeanMetaData.getDirectMetaConstraints();-- validatePropertyForSingleDefaultGroupElement( valueContext, validationContext, constraintList,- typeUseConstraints, validatedInterfaces, clazz, metaConstraints, Group.DEFAULT_GROUP );- }-- // all the hierarchy has been validated, stop validation.- if ( defaultGroupSequenceIsRedefined ) {- break;- }- }- return validationContext.getFailingConstraints().size() - numberOfConstraintViolationsBefore;- }-- private <U> boolean validatePropertyForSingleDefaultGroupElement(ValueContext<U, Object> valueContext, ValidationContext<?> validationContext,- List<MetaConstraint<?>> constraintList, List<MetaConstraint<?>> typeUseConstraints,- final Map<Class<?>, Class<?>> validatedInterfaces, Class<? super U> clazz, Set<MetaConstraint<?>> metaConstraints,- Group groupClass) {- valueContext.setCurrentGroup( groupClass.getDefiningClass() );- boolean validationSuccessful = true;-- for ( MetaConstraint<?> metaConstraint : metaConstraints ) {- // HV-466, an interface implemented more than one time in the hierarchy has to be validated only one- // time. An interface can define more than one constraint, we have to check the class we are validating.- final Class<?> declaringClass = metaConstraint.getLocation().getDeclaringClass();- if ( declaringClass.isInterface() ) {- Class<?> validatedForClass = validatedInterfaces.get( declaringClass );- if ( validatedForClass != null && !validatedForClass.equals( clazz ) ) {- continue;- }- validatedInterfaces.put( declaringClass, clazz );- }+ private <T> void validateParametersInContext(ExecutableValidationContext<T> validationContext,+ Object[] parameterValues,+ ValidationOrder validationOrder) {+ BeanMetaData<T> beanMetaData = validationContext.getRootBeanMetaData();- if ( constraintList.contains( metaConstraint ) ) {- boolean tmp = validateConstraint( validationContext, valueContext, true, metaConstraint );+ Optional<ExecutableMetaData> executableMetaDataOptional = validationContext.getExecutableMetaData();- validationSuccessful = validationSuccessful && tmp;- if ( shouldFailFast( validationContext ) ) {- return false;- }- }-- if ( typeUseConstraints.contains( metaConstraint ) ) {- boolean tmp = validatePropertyTypeConstraint(- validationContext,- valueContext,- true,- metaConstraint- );- validationSuccessful = validationSuccessful && tmp;- if ( shouldFailFast( validationContext ) ) {- return false;- }- }+ if ( !executableMetaDataOptional.isPresent() ) {+ // the method is unconstrained+ return;}- return validationSuccessful;- }+ ExecutableMetaData executableMetaData = executableMetaDataOptional.get();- private <T> void validateParametersInContext(ValidationContext<T> validationContext,- Object[] parameterValues,- ValidationOrder validationOrder) {- BeanMetaData<T> beanMetaData = beanMetaDataManager.getBeanMetaData( validationContext.getRootBeanClass() );- ExecutableMetaData executableMetaData = beanMetaData.getMetaDataFor( validationContext.getExecutable() );-- if ( executableMetaData == null ) {- // there is no executable metadata - specified object and method do not match- throw log.getMethodOrConstructorNotDefinedByValidatedTypeException(- beanMetaData.getBeanClass().getName(),- validationContext.getExecutable().getMember()+ if ( parameterValues.length != executableMetaData.getParameterTypes().length ) {+ throw LOG.getInvalidParameterCountForExecutableException(+ ExecutableHelper.getExecutableAsString(+ executableMetaData.getType().toString() + "#" + executableMetaData.getName(),+ executableMetaData.getParameterTypes()+ ),+ executableMetaData.getParameterTypes().length,+ parameterValues.length);}- if ( beanMetaData.defaultGroupSequenceIsRedefined() ) {+ if ( beanMetaData.isDefaultGroupSequenceRedefined() ) {validationOrder.assertDefaultGroupSequenceIsExpandable(beanMetaData.getDefaultGroupSequence(validationContext.getRootBean()@@ -1121,18 +881,18 @@ public class ValidatorImpl implements Validator, ExecutableValidator {// process first single groupsIterator<Group> groupIterator = validationOrder.getGroupIterator();while ( groupIterator.hasNext() ) {- validateParametersForGroup( validationContext, parameterValues, groupIterator.next() );+ validateParametersForGroup( validationContext, executableMetaData, parameterValues, groupIterator.next() );if ( shouldFailFast( validationContext ) ) {return;}}- ValueContext<Object[], Object> cascadingValueContext = ValueContext.getLocalExecutionContext(+ ValueContext<Object[], Object> cascadingValueContext = ValueContexts.getLocalExecutionContextForExecutable(+ validatorScopedContext.getParameterNameProvider(),parameterValues,executableMetaData.getValidatableParametersMetaData(),PathImpl.createPathForExecutable( executableMetaData ));- cascadingValueContext.setUnwrapMode( executableMetaData.unwrapMode() );groupIterator = validationOrder.getGroupIterator();while ( groupIterator.hasNext() ) {@@ -1152,7 +912,7 @@ public class ValidatorImpl implements Validator, ExecutableValidator {int numberOfViolations = validationContext.getFailingConstraints().size();for ( Group group : groupOfGroups ) {- validateParametersForGroup( validationContext, parameterValues, group );+ validateParametersForGroup( validationContext, executableMetaData, parameterValues, group );if ( shouldFailFast( validationContext ) ) {return;}@@ -1172,20 +932,9 @@ public class ValidatorImpl implements Validator, ExecutableValidator {}}- private <T> int validateParametersForGroup(ValidationContext<T> validationContext, Object[] parameterValues, Group group) {- int numberOfViolationsBefore = validationContext.getFailingConstraints().size();-- BeanMetaData<T> beanMetaData = beanMetaDataManager.getBeanMetaData( validationContext.getRootBeanClass() );- ExecutableMetaData executableMetaData = beanMetaData.getMetaDataFor( validationContext.getExecutable() );-- if ( parameterValues.length != executableMetaData.getParameterTypes().length ) {- throw log.getInvalidParameterCountForExecutableException(- ExecutableElement.getExecutableAsString(- executableMetaData.getType().toString() + "#" + executableMetaData.getName(),- executableMetaData.getParameterTypes()- ), parameterValues.length, executableMetaData.getParameterTypes().length- );- }+ private <T> void validateParametersForGroup(ExecutableValidationContext<T> validationContext, ExecutableMetaData executableMetaData, Object[] parameterValues,+ Group group) {+ Contracts.assertNotNull( executableMetaData, "executableMetaData may not be null" );// TODO GM: define behavior with respect to redefined default sequences. Should only the// sequence from the validated bean be honored or also default sequence definitions up in@@ -1193,23 +942,24 @@ public class ValidatorImpl implements Validator, ExecutableValidator {// For now a redefined default sequence will only be considered if specified at the bean// hosting the validated itself, but no other default sequence from parent typesif ( group.isDefaultGroup() ) {- Iterator<Sequence> defaultGroupSequence = beanMetaData.getDefaultValidationSequence( validationContext.getRootBean() );+ Iterator<Sequence> defaultGroupSequence = validationContext.getRootBeanMetaData().getDefaultValidationSequence( validationContext.getRootBean() );while ( defaultGroupSequence.hasNext() ) {Sequence sequence = defaultGroupSequence.next();- for ( GroupWithInheritance expandedGroup : sequence ) {- int numberOfViolationsOfCurrentGroup = 0;+ int numberOfViolations = validationContext.getFailingConstraints().size();+ for ( GroupWithInheritance expandedGroup : sequence ) {for ( Group defaultGroupSequenceElement : expandedGroup ) {- numberOfViolationsOfCurrentGroup += validateParametersForSingleGroup( validationContext, parameterValues, executableMetaData, defaultGroupSequenceElement.getDefiningClass() );+ validateParametersForSingleGroup( validationContext, parameterValues, executableMetaData, defaultGroupSequenceElement.getDefiningClass() );if ( shouldFailFast( validationContext ) ) {- return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;+ return;}}- if ( numberOfViolationsOfCurrentGroup > 0 ) {- return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;+ //stop processing after first group with errors occurred+ if ( validationContext.getFailingConstraints().size() > numberOfViolations ) {+ return;}}}@@ -1217,36 +967,27 @@ public class ValidatorImpl implements Validator, ExecutableValidator {else {validateParametersForSingleGroup( validationContext, parameterValues, executableMetaData, group.getDefiningClass() );}-- return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;}- private <T> int validateParametersForSingleGroup(ValidationContext<T> validationContext, Object[] parameterValues, ExecutableMetaData executableMetaData, Class<?> currentValidatedGroup) {- int numberOfViolationsBefore = validationContext.getFailingConstraints().size();-- ValueContext<T, Object> valueContext = getExecutableValueContext(- validationContext.getRootBean(), executableMetaData, currentValidatedGroup- );- valueContext.appendCrossParameterNode();- valueContext.setCurrentValidatedValue( parameterValues );+ private <T> void validateParametersForSingleGroup(ExecutableValidationContext<T> validationContext, Object[] parameterValues, ExecutableMetaData executableMetaData, Class<?> currentValidatedGroup) {+ if ( !executableMetaData.getCrossParameterConstraints().isEmpty() ) {+ ValueContext<T, Object> valueContext = getExecutableValueContext(+ validationContext.getRootBean(), executableMetaData, executableMetaData.getValidatableParametersMetaData(), currentValidatedGroup+ );- // 1. validate cross-parameter constraints- validateConstraintsForGroup(- validationContext, valueContext, executableMetaData.getCrossParameterConstraints()- );- if ( shouldFailFast( validationContext ) ) {- return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;+ // 1. validate cross-parameter constraints+ validateMetaConstraints( validationContext, valueContext, parameterValues, executableMetaData.getCrossParameterConstraints() );+ if ( shouldFailFast( validationContext ) ) {+ return;+ }}- valueContext = getExecutableValueContext(- validationContext.getRootBean(), executableMetaData, currentValidatedGroup+ ValueContext<T, Object> valueContext = getExecutableValueContext(+ validationContext.getRootBean(), executableMetaData, executableMetaData.getValidatableParametersMetaData(), currentValidatedGroup);- valueContext.setCurrentValidatedValue( parameterValues );// 2. validate parameter constraintsfor ( int i = 0; i < parameterValues.length; i++ ) {- PathImpl originalPath = valueContext.getPropertyPath();-ParameterMetaData parameterMetaData = executableMetaData.getParameterMetaData( i );Object value = parameterValues[i];@@ -1259,73 +1000,50 @@ public class ValidatorImpl implements Validator, ExecutableValidator {TypeHelper.getErasedType( parameterMetaData.getType() ),valueType) ) {- throw log.getParameterTypesDoNotMatchException(- valueType.getName(),- parameterMetaData.getType().toString(),+ throw LOG.getParameterTypesDoNotMatchException(+ valueType,+ parameterMetaData.getType(),i,- validationContext.getExecutable().getMember()+ validationContext.getExecutable());}}- valueContext.appendNode( parameterMetaData );- valueContext.setUnwrapMode( parameterMetaData.unwrapMode() );- valueContext.setCurrentValidatedValue( value );-- validateConstraintsForGroup(- validationContext, valueContext, parameterMetaData- );+ validateMetaConstraints( validationContext, valueContext, parameterValues, parameterMetaData );if ( shouldFailFast( validationContext ) ) {- return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;- }-- if ( !parameterMetaData.isCascading() ) {- validateConstraintsForGroup(- validationContext, valueContext, parameterMetaData.getTypeArgumentsConstraints()- );- if ( shouldFailFast( validationContext ) ) {- return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;- }+ return;}-- valueContext.setPropertyPath( originalPath );}-- return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;}- private <T> ValueContext<T, Object> getExecutableValueContext(T object, ExecutableMetaData executableMetaData, Class<?> group) {+ private <T> ValueContext<T, Object> getExecutableValueContext(T object, ExecutableMetaData executableMetaData, Validatable validatable, Class<?> group) {ValueContext<T, Object> valueContext;- if ( object != null ) {- valueContext = ValueContext.getLocalExecutionContext(- object,- null,- PathImpl.createPathForExecutable( executableMetaData )- );- }- else {- valueContext = ValueContext.getLocalExecutionContext(- (Class<T>) null, //the type is not required in this case (only for cascaded validation)- null,- PathImpl.createPathForExecutable( executableMetaData )- );- }+ valueContext = ValueContexts.getLocalExecutionContextForExecutable(+ validatorScopedContext.getParameterNameProvider(),+ object,+ validatable,+ PathImpl.createPathForExecutable( executableMetaData )+ );valueContext.setCurrentGroup( group );return valueContext;}- private <V, T> void validateReturnValueInContext(ValidationContext<T> context, T bean, V value, ValidationOrder validationOrder) {- BeanMetaData<T> beanMetaData = beanMetaDataManager.getBeanMetaData( context.getRootBeanClass() );- ExecutableMetaData executableMetaData = beanMetaData.getMetaDataFor( context.getExecutable() );+ private <V, T> void validateReturnValueInContext(ExecutableValidationContext<T> validationContext, T bean, V value, ValidationOrder validationOrder) {+ BeanMetaData<T> beanMetaData = validationContext.getRootBeanMetaData();++ Optional<ExecutableMetaData> executableMetaDataOptional = validationContext.getExecutableMetaData();- if ( executableMetaData == null ) {+ if ( !executableMetaDataOptional.isPresent() ) {+ // the method is unconstrainedreturn;}- if ( beanMetaData.defaultGroupSequenceIsRedefined() ) {+ ExecutableMetaData executableMetaData = executableMetaDataOptional.get();++ if ( beanMetaData.isDefaultGroupSequenceRedefined() ) {validationOrder.assertDefaultGroupSequenceIsExpandable( beanMetaData.getDefaultGroupSequence( bean ) );}@@ -1333,16 +1051,19 @@ public class ValidatorImpl implements Validator, ExecutableValidator {// process first single groupswhile ( groupIterator.hasNext() ) {- validateReturnValueForGroup( context, bean, value, groupIterator.next() );- if ( shouldFailFast( context ) ) {+ validateReturnValueForGroup( validationContext, executableMetaData, bean, value, groupIterator.next() );+ if ( shouldFailFast( validationContext ) ) {return;}}ValueContext<V, Object> cascadingValueContext = null;- if ( value != null ) {- cascadingValueContext = ValueContext.getLocalExecutionContext(+ boolean isCascadingRequired = value != null && executableMetaData.isCascading();++ if ( isCascadingRequired ) {+ cascadingValueContext = ValueContexts.getLocalExecutionContextForExecutable(+ validatorScopedContext.getParameterNameProvider(),value,executableMetaData.getReturnValueMetaData(),PathImpl.createPathForExecutable( executableMetaData )@@ -1352,8 +1073,8 @@ public class ValidatorImpl implements Validator, ExecutableValidator {while ( groupIterator.hasNext() ) {Group group = groupIterator.next();cascadingValueContext.setCurrentGroup( group.getDefiningClass() );- validateCascadedConstraints( context, cascadingValueContext );- if ( shouldFailFast( context ) ) {+ validateCascadedConstraints( validationContext, cascadingValueContext );+ if ( shouldFailFast( validationContext ) ) {return;}}@@ -1364,24 +1085,24 @@ public class ValidatorImpl implements Validator, ExecutableValidator {while ( sequenceIterator.hasNext() ) {Sequence sequence = sequenceIterator.next();for ( GroupWithInheritance groupOfGroups : sequence ) {- int numberOfFailingConstraintsBeforeGroup = context.getFailingConstraints().size();+ int numberOfFailingConstraintsBeforeGroup = validationContext.getFailingConstraints().size();for ( Group group : groupOfGroups ) {- validateReturnValueForGroup( context, bean, value, group );- if ( shouldFailFast( context ) ) {+ validateReturnValueForGroup( validationContext, executableMetaData, bean, value, group );+ if ( shouldFailFast( validationContext ) ) {return;}- if ( value != null ) {+ if ( isCascadingRequired ) {cascadingValueContext.setCurrentGroup( group.getDefiningClass() );- validateCascadedConstraints( context, cascadingValueContext );+ validateCascadedConstraints( validationContext, cascadingValueContext );- if ( shouldFailFast( context ) ) {+ if ( shouldFailFast( validationContext ) ) {return;}}}- if ( context.getFailingConstraints().size() > numberOfFailingConstraintsBeforeGroup ) {+ if ( validationContext.getFailingConstraints().size() > numberOfFailingConstraintsBeforeGroup ) {break;}}@@ -1389,16 +1110,9 @@ public class ValidatorImpl implements Validator, ExecutableValidator {}//TODO GM: if possible integrate with validateParameterForGroup()- private <T> int validateReturnValueForGroup(ValidationContext<T> validationContext, T bean, Object value, Group group) {- int numberOfViolationsBefore = validationContext.getFailingConstraints().size();-- BeanMetaData<T> beanMetaData = beanMetaDataManager.getBeanMetaData( validationContext.getRootBeanClass() );- ExecutableMetaData executableMetaData = beanMetaData.getMetaDataFor( validationContext.getExecutable() );-- if ( executableMetaData == null ) {- // nothing to validate- return 0;- }+ private <T> void validateReturnValueForGroup(BaseBeanValidationContext<T> validationContext, ExecutableMetaData executableMetaData, T bean, Object value,+ Group group) {+ Contracts.assertNotNull( executableMetaData, "executableMetaData may not be null" );// TODO GM: define behavior with respect to redefined default sequences. Should only the// sequence from the validated bean be honored or also default sequence definitions up in@@ -1407,24 +1121,24 @@ public class ValidatorImpl implements Validator, ExecutableValidator {// hosting the validated itself, but no other default sequence from parent typesif ( group.isDefaultGroup() ) {- Iterator<Sequence> defaultGroupSequence = beanMetaData.getDefaultValidationSequence( bean );+ Iterator<Sequence> defaultGroupSequence = validationContext.getRootBeanMetaData().getDefaultValidationSequence( bean );while ( defaultGroupSequence.hasNext() ) {Sequence sequence = defaultGroupSequence.next();- for ( GroupWithInheritance expandedGroup : sequence ) {- int numberOfViolationsOfCurrentGroup = 0;+ int numberOfViolations = validationContext.getFailingConstraints().size();+ for ( GroupWithInheritance expandedGroup : sequence ) {for ( Group defaultGroupSequenceElement : expandedGroup ) {- numberOfViolationsOfCurrentGroup += validateReturnValueForSingleGroup( validationContext, executableMetaData, bean, value, defaultGroupSequenceElement.getDefiningClass() );+ validateReturnValueForSingleGroup( validationContext, executableMetaData, bean, value, defaultGroupSequenceElement.getDefiningClass() );if ( shouldFailFast( validationContext ) ) {- return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;+ return;}}//stop processing after first group with errors occurred- if ( numberOfViolationsOfCurrentGroup > 0 ) {- return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;+ if ( validationContext.getFailingConstraints().size() > numberOfViolations ) {+ return;}}}@@ -1432,79 +1146,35 @@ public class ValidatorImpl implements Validator, ExecutableValidator {else {validateReturnValueForSingleGroup( validationContext, executableMetaData, bean, value, group.getDefiningClass() );}-- return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;}- private <T> int validateReturnValueForSingleGroup(ValidationContext<T> validationContext, ExecutableMetaData executableMetaData, T bean, Object value, Class<?> oneGroup) {- int numberOfViolationsBefore = validationContext.getFailingConstraints().size();-+ private <T> void validateReturnValueForSingleGroup(BaseBeanValidationContext<T> validationContext, ExecutableMetaData executableMetaData, T bean, Object value, Class<?> oneGroup) {// validate constraints at return value itselfValueContext<?, Object> valueContext = getExecutableValueContext(executableMetaData.getKind() == ElementKind.CONSTRUCTOR ? value : bean,executableMetaData,+ executableMetaData.getReturnValueMetaData(),oneGroup);- valueContext.setCurrentValidatedValue( value );ReturnValueMetaData returnValueMetaData = executableMetaData.getReturnValueMetaData();- valueContext.appendNode( returnValueMetaData );- valueContext.setUnwrapMode( returnValueMetaData.unwrapMode() );-- int numberOfViolationsOfCurrentGroup =- validateConstraintsForGroup(- validationContext, valueContext, returnValueMetaData- );- if ( shouldFailFast( validationContext ) ) {- return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;- }-- if ( !returnValueMetaData.isCascading() ) {- numberOfViolationsOfCurrentGroup += validateConstraintsForGroup(- validationContext, valueContext, returnValueMetaData.getTypeArgumentsConstraints()- );- if ( shouldFailFast( validationContext ) ) {- return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;- }- }- return numberOfViolationsOfCurrentGroup;- }-- private int validateConstraintsForGroup(ValidationContext<?> validationContext,- ValueContext<?, ?> valueContext,- Iterable<MetaConstraint<?>> constraints) {- int numberOfViolationsBefore = validationContext.getFailingConstraints().size();-- for ( MetaConstraint<?> metaConstraint : constraints ) {- if ( !isValidationRequired( validationContext, valueContext, metaConstraint ) ) {- continue;- }-- metaConstraint.validateConstraint( validationContext, valueContext );- if ( shouldFailFast( validationContext ) ) {- break;- }- }-- return validationContext.getFailingConstraints().size() - numberOfViolationsBefore;+ validateMetaConstraints( validationContext, valueContext, value, returnValueMetaData );}/**- * Collects all {@code MetaConstraint}s which match the given property path relative to the specified root class for a given value.+ * Returns a value context pointing to the given property path relative to the specified root class for a given+ * value.** @param validationContext The validation context.* @param propertyPath The property path for which constraints have to be collected.- * @param metaConstraints A list where {@code MetaConstraint}s which match the given path are saved.- * @param typeArgumentConstraints A list where type arguments {@code MetaConstraint}s which match the given path are saved.*- * @return Returns an instance of {@code ValueContext} which describes the local validation context associated to the given property path.+ * @return Returns an instance of {@code ValueContext} which describes the local validation context associated to+ * the given property path.*/- private <V> ValueContext<?, V> collectMetaConstraintsForPathWithValue(ValidationContext<?> validationContext,- PathImpl propertyPath,- List<MetaConstraint<?>> metaConstraints,- List<MetaConstraint<?>> typeArgumentConstraints) {+ private <V> BeanValueContext<?, V> getValueContextForPropertyValidation(BaseBeanValidationContext<?> validationContext, PathImpl propertyPath) {Class<?> clazz = validationContext.getRootBeanClass();+ BeanMetaData<?> beanMetaData = validationContext.getRootBeanMetaData();Object value = validationContext.getRootBean();PropertyMetaData propertyMetaData = null;@@ -1513,17 +1183,18 @@ public class ValidatorImpl implements Validator, ExecutableValidator {while ( propertyPathIter.hasNext() ) {// cast is ok, since we are dealing with engine internal classesNodeImpl propertyPathNode = (NodeImpl) propertyPathIter.next();- propertyMetaData = getBeanPropertyMetaData( clazz, propertyPathNode );+ propertyMetaData = getBeanPropertyMetaData( beanMetaData, propertyPathNode );// if the property is not the leaf property, we set up the context for the next iterationif ( propertyPathIter.hasNext() ) {if ( !propertyMetaData.isCascading() ) {- throw log.getInvalidPropertyPathException( validationContext.getRootBeanClass().getName(), propertyPath.asString() );+ throw LOG.getInvalidPropertyPathException( validationContext.getRootBeanClass(), propertyPath.asString() );}- value = getBeanPropertyValue( validationContext, value, propertyMetaData );+ // TODO which cascadable???+ value = getCascadableValue( validationContext, value, propertyMetaData.getCascadables().iterator().next() );if ( value == null ) {- throw log.getUnableToReachPropertyToValidateException( validationContext.getRootBean(), propertyPath );+ throw LOG.getUnableToReachPropertyToValidateException( validationContext.getRootBean(), propertyPath );}clazz = value.getClass();@@ -1539,48 +1210,48 @@ public class ValidatorImpl implements Validator, ExecutableValidator {value = ReflectionHelper.getMappedValue( value, propertyPathNode.getKey() );}else {- throw log.getPropertyPathMustProvideIndexOrMapKeyException();+ throw LOG.getPropertyPathMustProvideIndexOrMapKeyException();}if ( value == null ) {- throw log.getUnableToReachPropertyToValidateException( validationContext.getRootBean(), propertyPath );+ throw LOG.getUnableToReachPropertyToValidateException( validationContext.getRootBean(), propertyPath );}clazz = value.getClass();- propertyMetaData = getBeanPropertyMetaData( clazz, propertyPathNode );+ beanMetaData = beanMetaDataManager.getBeanMetaData( clazz );+ propertyMetaData = getBeanPropertyMetaData( beanMetaData, propertyPathNode );+ }+ else {+ beanMetaData = beanMetaDataManager.getBeanMetaData( clazz );}}}if ( propertyMetaData == null ) {// should only happen if the property path is empty, which should never happen- throw log.getInvalidPropertyPathException( clazz.getName(), propertyPath.asString() );+ throw LOG.getInvalidPropertyPathException( clazz, propertyPath.asString() );}- metaConstraints.addAll( propertyMetaData.getConstraints() );- typeArgumentConstraints.addAll( propertyMetaData.getTypeArgumentsConstraints() );+ propertyPath.removeLeafNode();- return ValueContext.getLocalExecutionContext( value, null, propertyPath );+ return ValueContexts.getLocalExecutionContextForBean( validatorScopedContext.getParameterNameProvider(), value, beanMetaData, propertyPath );}/**- * Collects all {@code MetaConstraint}s which match the given property path relative to the specified root class without a value.+ * Returns a value context pointing to the given property path relative to the specified root class without a value.* <p>* We are only able to use the static types as we don't have the value.* </p>*- * @param validationContext The validation context.+ * @param rootBeanClass The class of the root bean.* @param propertyPath The property path for which constraints have to be collected.- * @param metaConstraints A list where {@code MetaConstraint}s which match the given path are saved.- * @param typeArgumentConstraints A list where type arguments {@code MetaConstraint}s which match the given path are saved.- *- * @return Returns an instance of {@code ValueContext} which describes the local validation context associated to the given property path.+ * @return Returns an instance of {@code ValueContext} which describes the local validation context associated to+ * the given property path.*/- private <V> ValueContext<?, V> collectMetaConstraintsForPathWithoutValue(ValidationContext<?> validationContext,- PathImpl propertyPath,- List<MetaConstraint<?>> metaConstraints,- List<MetaConstraint<?>> typeArgumentConstraints) {- Class<?> clazz = validationContext.getRootBeanClass();+ private <V> BeanValueContext<?, V> getValueContextForValueValidation(Class<?> rootBeanClass,+ PathImpl propertyPath) {+ Class<?> clazz = rootBeanClass;+ BeanMetaData<?> beanMetaData = null;PropertyMetaData propertyMetaData = null;Iterator<Path.Node> propertyPathIter = propertyPath.iterator();@@ -1588,7 +1259,8 @@ public class ValidatorImpl implements Validator, ExecutableValidator {while ( propertyPathIter.hasNext() ) {// cast is ok, since we are dealing with engine internal classesNodeImpl propertyPathNode = (NodeImpl) propertyPathIter.next();- propertyMetaData = getBeanPropertyMetaData( clazz, propertyPathNode );+ beanMetaData = beanMetaDataManager.getBeanMetaData( clazz );+ propertyMetaData = getBeanPropertyMetaData( beanMetaData, propertyPathNode );// if the property is not the leaf property, we set up the context for the next iterationif ( propertyPathIter.hasNext() ) {@@ -1598,7 +1270,8 @@ public class ValidatorImpl implements Validator, ExecutableValidator {propertyPathNode = (NodeImpl) propertyPathIter.next();clazz = ReflectionHelper.getClassFromType( ReflectionHelper.getCollectionElementType( propertyMetaData.getType() ) );- propertyMetaData = getBeanPropertyMetaData( clazz, propertyPathNode );+ beanMetaData = beanMetaDataManager.getBeanMetaData( clazz );+ propertyMetaData = getBeanPropertyMetaData( beanMetaData, propertyPathNode );}else {clazz = ReflectionHelper.getClassFromType( propertyMetaData.getType() );@@ -1608,28 +1281,23 @@ public class ValidatorImpl implements Validator, ExecutableValidator {if ( propertyMetaData == null ) {// should only happen if the property path is empty, which should never happen- throw log.getInvalidPropertyPathException( clazz.getName(), propertyPath.asString() );+ throw LOG.getInvalidPropertyPathException( clazz, propertyPath.asString() );}- metaConstraints.addAll( propertyMetaData.getConstraints() );- typeArgumentConstraints.addAll( propertyMetaData.getTypeArgumentsConstraints() );+ propertyPath.removeLeafNode();- return ValueContext.getLocalExecutionContext( clazz, null, propertyPath );+ return ValueContexts.getLocalExecutionContextForValueValidation( validatorScopedContext.getParameterNameProvider(), beanMetaData, propertyPath );}- /**- * Must be called and stored for the duration of the stack call- * A new instance is returned each time- *- * @return The resolver for the duration of a full validation.- */- private TraversableResolver getCachingTraversableResolver() {- return new CachingTraversableResolverForSingleValidation( traversableResolver );- }-- private boolean isValidationRequired(ValidationContext<?> validationContext,+ private boolean isValidationRequired(BaseBeanValidationContext<?> validationContext,ValueContext<?, ?> valueContext,MetaConstraint<?> metaConstraint) {+ // check if this validation context is qualified to validate the current meta constraint.+ // For instance, in the case of validateProperty()/validateValue(), the current meta constraint+ // could be for another property and, in this case, we don't validate it.+ if ( !validationContext.appliesTo( metaConstraint ) ) {+ return false;+ }if ( validationContext.hasMetaConstraintBeenProcessed(valueContext.getCurrentBean(),valueContext.getPropertyPath(),@@ -1645,68 +1313,70 @@ public class ValidatorImpl implements Validator, ExecutableValidator {validationContext,valueContext.getCurrentBean(),valueContext.getPropertyPath(),- metaConstraint.getElementType()+ metaConstraint.getConstraintLocationKind());}- private boolean isReachable(ValidationContext<?> validationContext, Object traversableObject, PathImpl path, ElementType type) {- if ( needToCallTraversableResolver( path, type ) ) {+ private boolean isReachable(BaseBeanValidationContext<?> validationContext, Object traversableObject, PathImpl path,+ ConstraintLocationKind constraintLocationKind) {+ if ( needToCallTraversableResolver( path, constraintLocationKind ) ) {return true;}- Path pathToObject = path.getPathWithoutLeafNode();+ Path pathToObject = PathImpl.createCopyWithoutLeafNode( path );try {return validationContext.getTraversableResolver().isReachable(traversableObject,path.getLeafNode(),validationContext.getRootBeanClass(),pathToObject,- type+ constraintLocationKind.getElementType());}catch (RuntimeException e) {- throw log.getErrorDuringCallOfTraversableResolverIsReachableException( e );+ throw LOG.getErrorDuringCallOfTraversableResolverIsReachableException( e );}}- private boolean needToCallTraversableResolver(PathImpl path, ElementType type) {+ private boolean needToCallTraversableResolver(PathImpl path, ConstraintLocationKind constraintLocationKind) {// as the TraversableResolver interface is designed right now it does not make sense to call it when// there is no traversable object hosting the property to be accessed. For this reason we don't call the resolver// for class level constraints (ElementType.TYPE) or top level method parameters or return values.// see also BV expert group discussion - http://lists.jboss.org/pipermail/beanvalidation-dev/2013-January/000722.html- return isClassLevelConstraint( type )+ return isClassLevelConstraint( constraintLocationKind )|| isCrossParameterValidation( path )|| isParameterValidation( path )|| isReturnValueValidation( path );}- private boolean isCascadeRequired(ValidationContext<?> validationContext, Object traversableObject, PathImpl path, ElementType type) {- if ( needToCallTraversableResolver( path, type ) ) {+ private boolean isCascadeRequired(BaseBeanValidationContext<?> validationContext, Object traversableObject, PathImpl path,+ ConstraintLocationKind constraintLocationKind) {+ if ( needToCallTraversableResolver( path, constraintLocationKind ) ) {return true;}- boolean isReachable = isReachable( validationContext, traversableObject, path, type );+ boolean isReachable = isReachable( validationContext, traversableObject, path, constraintLocationKind );if ( !isReachable ) {return false;}- Path pathToObject = path.getPathWithoutLeafNode();+ Path pathToObject = PathImpl.createCopyWithoutLeafNode( path );try {return validationContext.getTraversableResolver().isCascadable(traversableObject,path.getLeafNode(),validationContext.getRootBeanClass(),pathToObject,- type+ constraintLocationKind.getElementType());}catch (RuntimeException e) {- throw log.getErrorDuringCallOfTraversableResolverIsCascadableException( e );+ throw LOG.getErrorDuringCallOfTraversableResolverIsCascadableException( e );}}- private boolean isClassLevelConstraint(ElementType type) {- return ElementType.TYPE.equals( type );+ private boolean isClassLevelConstraint(ConstraintLocationKind constraintLocationKind) {+ return ConstraintLocationKind.TYPE.equals( constraintLocationKind );}private boolean isCrossParameterValidation(PathImpl path) {@@ -1721,103 +1391,19 @@ public class ValidatorImpl implements Validator, ExecutableValidator {return path.getLeafNode().getKind() == ElementKind.RETURN_VALUE;}- private boolean shouldFailFast(ValidationContext<?> context) {- return context.isFailFastModeEnabled() && !context.getFailingConstraints().isEmpty();+ private boolean shouldFailFast(BaseBeanValidationContext<?> validationContext) {+ return validationContext.isFailFastModeEnabled() && !validationContext.getFailingConstraints().isEmpty();}- private PropertyMetaData getBeanPropertyMetaData( Class<?> beanClass, Path.Node propertyNode ) {+ private PropertyMetaData getBeanPropertyMetaData(BeanMetaData<?> beanMetaData, Path.Node propertyNode) {if ( !ElementKind.PROPERTY.equals( propertyNode.getKind() ) ) {- throw log.getInvalidPropertyPathException( beanClass.getName(), propertyNode.getName() );- }-- BeanMetaData<?> beanMetaData = beanMetaDataManager.getBeanMetaData( beanClass );- PropertyMetaData propertyMetaData = beanMetaData.getMetaDataFor( propertyNode.getName() );-- if ( propertyMetaData == null ) {- throw log.getInvalidPropertyPathException( beanClass.getName(), propertyNode.getName() );- }- return propertyMetaData;- }-- @SuppressWarnings({ "rawtypes", "unchecked" })- private Object getBeanPropertyValue(ValidationContext<?> validationContext, Object object, Cascadable cascadable) {- Object value = cascadable.getValue( object );-- // Value can be wrapped (e.g. Optional<Address>). Try to unwrap it- UnwrapMode unwrapMode = cascadable.unwrapMode();- if ( UnwrapMode.UNWRAP.equals( unwrapMode ) || UnwrapMode.AUTOMATIC.equals( unwrapMode ) ) {- ValidatedValueUnwrapper valueHandler = validationContext.getValidatedValueUnwrapper( cascadable.getCascadableType() );- if ( valueHandler != null ) {- value = valueHandler.handleValidatedValue( value );- }- }-- return value;- }-- private Object getBeanMemberValue(Object object, Member member) {- if ( member == null ) {- return object;- }-- member = getAccessible( member );-- if ( member instanceof Method ) {- return ReflectionHelper.getValue( (Method) member, object );- }- else if ( member instanceof Field ) {- return ReflectionHelper.getValue( (Field) member, object );- }- return null;- }-- /**- * Returns an accessible version of the given member. Will be the given member itself in case it is accessible,- * otherwise a copy which is set accessible. These copies are maintained in the- * {@link ValidatorImpl#accessibleMembers} cache.- */- private Member getAccessible(Member original) {- if ( ( (AccessibleObject) original ).isAccessible() ) {- return original;- }-- Member member = accessibleMembers.get( original );-- if ( member != null ) {- return member;+ throw LOG.getInvalidPropertyPathException( beanMetaData.getBeanClass(), propertyNode.getName() );}- SecurityManager sm = System.getSecurityManager();- if ( sm != null ) {- sm.checkPermission( HibernateValidatorPermission.ACCESS_PRIVATE_MEMBERS );- }-- Class<?> clazz = original.getDeclaringClass();-- if ( original instanceof Field ) {- member = run( GetDeclaredField.action( clazz, original.getName() ) );- }- else {- member = run( GetDeclaredMethod.action( clazz, original.getName() ) );- }-- run( SetAccessibility.action( member ) );-- Member cached = accessibleMembers.putIfAbsent( original, member );- if ( cached != null ) {- member = cached;- }-- return member;+ return beanMetaData.getMetaDataFor( propertyNode.getName() );}- /**- * Runs the given privileged action, using a privileged block if required.- * <p>- * <b>NOTE:</b> This must never be changed into a publicly available method to avoid execution of arbitrary- * privileged actions within HV's protection domain.- */- private <T> T run(PrivilegedAction<T> action) {- return System.getSecurityManager() != null ? AccessController.doPrivileged( action ) : action.run();+ private Object getCascadableValue(BaseBeanValidationContext<?> validationContext, Object object, Cascadable cascadable) {+ return cascadable.getValue( object );}}diff --git a/server-core/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintTree.java b/server-core/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintTree.javaindex 854a560a38..7b5fb1930d 100644--- a/server-core/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintTree.java+++ b/server-core/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintTree.java@@ -7,38 +7,32 @@package org.hibernate.validator.internal.engine.constraintvalidation;import java.lang.annotation.Annotation;-import java.lang.reflect.Member;+import java.lang.invoke.MethodHandles;import java.lang.reflect.Method;import java.lang.reflect.Type;import java.util.ArrayList;import java.util.Collection;-import java.util.Collections;import java.util.List;-import java.util.Set;+import java.util.Optional;++import javax.validation.ConstraintDeclarationException;import javax.validation.ConstraintValidator;-import javax.validation.ConstraintViolation;+import javax.validation.ValidationException;-import org.hibernate.validator.constraints.CompositionType;-import org.hibernate.validator.internal.engine.ValidationContext;-import org.hibernate.validator.internal.engine.ValueContext;-import org.hibernate.validator.internal.engine.valuehandling.UnwrapMode;+import org.hibernate.validator.internal.engine.validationcontext.ValidationContext;+import org.hibernate.validator.internal.engine.valuecontext.ValueContext;import org.hibernate.validator.internal.metadata.core.MetaConstraint;import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl;+import org.hibernate.validator.internal.metadata.location.GetterConstraintLocation;import org.hibernate.validator.internal.util.logging.Log;import org.hibernate.validator.internal.util.logging.LoggerFactory;-import org.hibernate.validator.spi.valuehandling.ValidatedValueUnwrapper;import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.util.ReflectionUtils;import io.onedev.server.util.interpolative.VariableInterpolator;import io.onedev.server.util.validation.InterpolativeValidator;import io.onedev.server.web.editable.annotation.Interpolative;-import static org.hibernate.validator.constraints.CompositionType.ALL_FALSE;-import static org.hibernate.validator.constraints.CompositionType.AND;-import static org.hibernate.validator.constraints.CompositionType.OR;-import static org.hibernate.validator.internal.util.CollectionHelper.newArrayList;-import static org.hibernate.validator.internal.util.CollectionHelper.newHashSet;-/*** Due to constraint composition a single constraint annotation can lead to a whole constraint tree being validated.* This class encapsulates such a tree.@@ -47,182 +41,74 @@ import static org.hibernate.validator.internal.util.CollectionHelper.newHashSet;* @author Federico Mancini* @author Dag Hovland* @author Kevin Pollet <[email protected]> (C) 2012 SERLI+ * @author Guillaume Smet+ * @author Marko Bekhta*/-public class ConstraintTree<A extends Annotation> {-- private static final String TYPE_USE = "TYPE_USE";+public abstract class ConstraintTree<A extends Annotation> {- private static final Log log = LoggerFactory.make();-- private final ConstraintTree<?> parent;- private final List<ConstraintTree<?>> children;+ private static final Log LOG = LoggerFactory.make( MethodHandles.lookup() );/*** The constraint descriptor for the constraint represented by this constraint tree.*/- private final ConstraintDescriptorImpl<A> descriptor;-- public ConstraintTree(ConstraintDescriptorImpl<A> descriptor) {- this( descriptor, null );- }-- private ConstraintTree(ConstraintDescriptorImpl<A> descriptor, ConstraintTree<?> parent) {- this.parent = parent;- this.descriptor = descriptor;-- final Set<ConstraintDescriptorImpl<?>> composingConstraints = descriptor.getComposingConstraintImpls();- children = newArrayList( composingConstraints.size() );+ protected final ConstraintDescriptorImpl<A> descriptor;- for ( ConstraintDescriptorImpl<?> composingDescriptor : composingConstraints ) {- ConstraintTree<?> treeNode = createConstraintTree( composingDescriptor );- children.add( treeNode );- }- }+ private final Type validatedValueType;- private <U extends Annotation> ConstraintTree<U> createConstraintTree(ConstraintDescriptorImpl<U> composingDescriptor) {- return new ConstraintTree<U>( composingDescriptor, this );- }-- public final List<ConstraintTree<?>> getChildren() {- return children;- }+ private volatile ConstraintValidator<A, ?> defaultInitializedConstraintValidator;- public final ConstraintDescriptorImpl<A> getDescriptor() {- return descriptor;- }+ protected ConstraintTree(ConstraintValidatorManager constraintValidatorManager, ConstraintDescriptorImpl<A> descriptor, Type validatedValueType) {+ this.descriptor = descriptor;+ this.validatedValueType = validatedValueType;- public final <T> boolean validateConstraints(ValidationContext<T> executionContext,- ValueContext<?, ?> valueContext) {- Set<ConstraintViolation<T>> constraintViolations = newHashSet();- validateConstraints( executionContext, valueContext, constraintViolations );- if ( !constraintViolations.isEmpty() ) {- executionContext.addConstraintFailures( constraintViolations );- return false;+ if ( constraintValidatorManager.isPredefinedScope() ) {+ this.defaultInitializedConstraintValidator = constraintValidatorManager.getInitializedValidator( validatedValueType,+ descriptor,+ constraintValidatorManager.getDefaultConstraintValidatorFactory(),+ constraintValidatorManager.getDefaultConstraintValidatorInitializationContext() );}- return true;}- private <T, V> void validateConstraints(ValidationContext<T> validationContext,- ValueContext<?, V> valueContext,- Set<ConstraintViolation<T>> constraintViolations) {- CompositionResult compositionResult = validateComposingConstraints(- validationContext, valueContext, constraintViolations- );-- Set<ConstraintViolation<T>> localViolations;-- // After all children are validated the actual ConstraintValidator of the constraint itself is executed- if ( mainConstraintNeedsEvaluation( validationContext, constraintViolations ) ) {-- if ( log.isTraceEnabled() ) {- log.tracef(- "Validating value %s against constraint defined by %s.",- valueContext.getCurrentValidatedValue(),- descriptor- );- }-- // find the right constraint validator- ConstraintValidator<A, V> validator = getInitializedConstraintValidator( validationContext, valueContext );-- // create a constraint validator context- ConstraintValidatorContextImpl constraintValidatorContext = new ConstraintValidatorContextImpl(- validationContext.getParameterNames(),- validationContext.getTimeProvider(),- valueContext.getPropertyPath(),- descriptor- );-- // validate- localViolations = validateSingleConstraint(- validationContext,- valueContext,- constraintValidatorContext,- validator- );-- // We re-evaluate the boolean composition by taking into consideration also the violations- // from the local constraintValidator- if ( localViolations.isEmpty() ) {- compositionResult.setAtLeastOneTrue( true );- }- else {- compositionResult.setAllTrue( false );- }+ public static <U extends Annotation> ConstraintTree<U> of(ConstraintValidatorManager constraintValidatorManager,+ ConstraintDescriptorImpl<U> composingDescriptor, Type validatedValueType) {+ if ( composingDescriptor.getComposingConstraintImpls().isEmpty() ) {+ return new SimpleConstraintTree<>( constraintValidatorManager, composingDescriptor, validatedValueType );}else {- localViolations = Collections.emptySet();- }-- if ( !passesCompositionTypeRequirement( constraintViolations, compositionResult ) ) {- prepareFinalConstraintViolations(- validationContext, valueContext, constraintViolations, localViolations- );+ return new ComposingConstraintTree<>( constraintValidatorManager, composingDescriptor, validatedValueType );}}- private <T, V> ConstraintValidator<A, V> getInitializedConstraintValidator(ValidationContext<T> validationContext,- ValueContext<?, V> valueContext) {- Type validatedValueType = valueContext.getDeclaredTypeOfValidatedElement();- @SuppressWarnings("unchecked")- ValidatedValueUnwrapper<V> validatedValueUnwrapper = (ValidatedValueUnwrapper<V>) validationContext- .getValidatedValueUnwrapper( validatedValueType );-- // AUTOMATIC mode, need to determine which types of constraint validators are available- if ( valueContext.getUnwrapMode().equals( UnwrapMode.AUTOMATIC ) ) {- return getConstraintValidatorInstanceForAutomaticUnwrapping(- validationContext,- valueContext- );- }- // TYPE_USE requires implicitly unwrapping- else if ( valueContext.getUnwrapMode().equals( UnwrapMode.UNWRAP )- || TYPE_USE.equals( valueContext.getElementType().name() ) ) {- return getInitializedValidatorInstanceForWrappedInstance(- validationContext,- valueContext,- validatedValueType,- validatedValueUnwrapper- );-- }- // UnwrapMode.SKIP_UNWRAP- else {- return getConstraintValidatorNoUnwrapping( validationContext, valueContext );+ public final boolean validateConstraints(ValidationContext<?> validationContext, ValueContext<?, ?> valueContext) {+ List<ConstraintValidatorContextImpl> violatedConstraintValidatorContexts = new ArrayList<>( 5 );+ validateConstraints( validationContext, valueContext, violatedConstraintValidatorContexts );+ if ( !violatedConstraintValidatorContexts.isEmpty() ) {+ for ( ConstraintValidatorContextImpl constraintValidatorContext : violatedConstraintValidatorContexts ) {+ for ( ConstraintViolationCreationContext constraintViolationCreationContext : constraintValidatorContext.getConstraintViolationCreationContexts() ) {+ validationContext.addConstraintFailure(+ valueContext, constraintViolationCreationContext, constraintValidatorContext.getConstraintDescriptor()+ );+ }+ }+ return false;}+ return true;}- private <T, V> ConstraintValidator<A, V> getInitializedValidatorInstanceForWrappedInstance(ValidationContext<T> validationContext, ValueContext<?, V> valueContext, Type validatedValueType, ValidatedValueUnwrapper<V> validatedValueUnwrapper) {- // make sure that unwrapper is set- if ( validatedValueUnwrapper == null ) {- throw log.getNoUnwrapperFoundForTypeException(- valueContext.getDeclaredTypeOfValidatedElement()- .toString()- );- }+ protected abstract void validateConstraints(ValidationContext<?> validationContext, ValueContext<?, ?> valueContext, Collection<ConstraintValidatorContextImpl> violatedConstraintValidatorContexts);- valueContext.setValidatedValueHandler( validatedValueUnwrapper );- validatedValueType = validatedValueUnwrapper.getValidatedValueType( validatedValueType );-- ConstraintValidator<A, V> validator = validationContext.getConstraintValidatorManager()- .getInitializedValidator(- validatedValueType,- descriptor,- validationContext.getConstraintValidatorFactory()- );-- if ( validator == null ) {- throwExceptionForNullValidator( validatedValueType, valueContext.getPropertyPath().asString() );- }+ public final ConstraintDescriptorImpl<A> getDescriptor() {+ return descriptor;+ }- return validator;+ public final Type getValidatedValueType() {+ return this.validatedValueType;}- private void throwExceptionForNullValidator(Type validatedValueType, String path) {+ private ValidationException getExceptionForNullValidator(Type validatedValueType, String path) {if ( descriptor.getConstraintType() == ConstraintDescriptorImpl.ConstraintType.CROSS_PARAMETER ) {- throw log.getValidatorForCrossParameterConstraintMustEitherValidateObjectOrObjectArrayException(+ return LOG.getValidatorForCrossParameterConstraintMustEitherValidateObjectOrObjectArrayException(descriptor.getAnnotationType()- .getName());}else {@@ -236,219 +122,64 @@ public class ConstraintTree<A extends Annotation> {className = clazz.getName();}}- throw log.getNoValidatorFoundForTypeException( descriptor.getAnnotationType().getName(), className, path );+ return LOG.getNoValidatorFoundForTypeException( descriptor.getAnnotationType(), className, path );}}- private <T, V> ConstraintValidator<A, V> getConstraintValidatorInstanceForAutomaticUnwrapping(- ValidationContext<T> validationContext,- ValueContext<?, V> valueContext- ) {- Type validatedValueType = valueContext.getDeclaredTypeOfValidatedElement();- @SuppressWarnings("unchecked")- ValidatedValueUnwrapper<V> validatedValueUnwrapper = (ValidatedValueUnwrapper<V>) validationContext- .getValidatedValueUnwrapper( validatedValueType );-- // no unwrapper, get a validator for the validated type- if ( validatedValueUnwrapper == null ) {- return getConstraintValidatorNoUnwrapping( validationContext, valueContext );- }+ protected final ConstraintValidator<A, ?> getInitializedConstraintValidator(ValidationContext<?> validationContext, ValueContext<?, ?> valueContext) {+ ConstraintValidator<A, ?> validator;- // there is an unwrapper - need to find out for which type (wrapper or wrapped value there- // are constraint validators available- ConstraintValidator<A, V> validatorForWrappedValue = validationContext.getConstraintValidatorManager()- .getInitializedValidator(- validatedValueUnwrapper.getValidatedValueType( validatedValueType ),- descriptor,- validationContext.getConstraintValidatorFactory()- );--- ConstraintValidator<A, V> validatorForWrapper = validationContext.getConstraintValidatorManager()- .getInitializedValidator(- valueContext.getDeclaredTypeOfValidatedElement(),- descriptor,- validationContext.getConstraintValidatorFactory()- );-- // validator for wrapper and wrapped value is ambiguous -> exception!- if ( validatorForWrappedValue != null && validatorForWrapper != null ) {- throw log.getConstraintValidatorExistsForWrapperAndWrappedValueException(- valueContext.getPropertyPath().toString(),- descriptor.getAnnotationType().getName(),- validatedValueUnwrapper.getClass().getName()- );- }-- // neither a validator for wrapper not wrapped value -> exception!- if ( validatorForWrappedValue == null && validatorForWrapper == null ) {- throw log.getNoValidatorFoundForTypeException(- descriptor.getAnnotationType().getName(),- validatedValueType.toString(),- valueContext.getPropertyPath().toString()- );- }-- // we have a validator for the wrapped value- // -> make sure the unwrapper is set and return proper validator- if ( validatorForWrappedValue != null ) {- valueContext.setValidatedValueHandler( validatedValueUnwrapper );- return validatorForWrappedValue;+ if ( validationContext.getConstraintValidatorManager().isPredefinedScope() ) {+ validator = defaultInitializedConstraintValidator;}else {- // there is only a validator for the wrapper type- // -> make sure the value handler is unset and return validator for wrapper type- valueContext.setValidatedValueHandler( null );- return validatorForWrapper;- }- }-- private <T, V> ConstraintValidator<A, V> getConstraintValidatorNoUnwrapping(ValidationContext<T> validationContext,- ValueContext<?, V> valueContext) {- // make sure no unwrapper is set- valueContext.setValidatedValueHandler( null );-- Type validatedValueType = valueContext.getDeclaredTypeOfValidatedElement();- ConstraintValidator<A, V> validator = validationContext.getConstraintValidatorManager()- .getInitializedValidator(+ if ( validationContext.getConstraintValidatorFactory() == validationContext.getConstraintValidatorManager().getDefaultConstraintValidatorFactory()+ && validationContext.getConstraintValidatorInitializationContext() == validationContext.getConstraintValidatorManager()+ .getDefaultConstraintValidatorInitializationContext() ) {+ validator = defaultInitializedConstraintValidator;++ if ( validator == null ) {+ synchronized ( this ) {+ validator = defaultInitializedConstraintValidator;+ if ( validator == null ) {+ validator = validationContext.getConstraintValidatorManager().getInitializedValidator(+ validatedValueType,+ descriptor,+ validationContext.getConstraintValidatorManager().getDefaultConstraintValidatorFactory(),+ validationContext.getConstraintValidatorManager().getDefaultConstraintValidatorInitializationContext() );++ defaultInitializedConstraintValidator = validator;+ }+ }+ }+ }+ else {+ // For now, we don't cache the result in the ConstraintTree if we don't use the default constraint validator+ // factory. Creating a lot of CHM for that cache might not be a good idea and we prefer being conservative+ // for now. Note that we have the ConstraintValidatorManager cache that mitigates the situation.+ // If you come up with a use case where it makes sense, please reach out to us.+ validator = validationContext.getConstraintValidatorManager().getInitializedValidator(validatedValueType,descriptor,- validationContext.getConstraintValidatorFactory()+ validationContext.getConstraintValidatorFactory(),+ validationContext.getConstraintValidatorInitializationContext());+ }+ }if ( validator == null ) {- throwExceptionForNullValidator( validatedValueType, valueContext.getPropertyPath().asString() );+ throw getExceptionForNullValidator( validatedValueType, valueContext.getPropertyPath().asString() );}return validator;}- private <T> boolean mainConstraintNeedsEvaluation(ValidationContext<T> executionContext,- Set<ConstraintViolation<T>> constraintViolations) {- // we are dealing with a composing constraint with no validator for the main constraint- if ( !descriptor.getComposingConstraints().isEmpty() && descriptor.getMatchingConstraintValidatorClasses()- .isEmpty() ) {- return false;- }-- // report as single violation and there is already a violation- if ( descriptor.isReportAsSingleViolation() && descriptor.getCompositionType() == AND && !constraintViolations.isEmpty() ) {- return false;- }-- // explicit fail fast mode- if ( executionContext.isFailFastModeEnabled() && !constraintViolations.isEmpty() ) {- return false;- }-- return true;- }-- /**- * Before the final constraint violations can be reported back we need to check whether we have a composing- * constraint whose result should be reported as single violation.- *- * @param executionContext meta data about top level validation- * @param valueContext meta data for currently validated value- * @param constraintViolations used to accumulate constraint violations- * @param localViolations set of constraint violations of top level constraint- */- private <T> void prepareFinalConstraintViolations(ValidationContext<T> executionContext,- ValueContext<?, ?> valueContext,- Set<ConstraintViolation<T>> constraintViolations,- Set<ConstraintViolation<T>> localViolations) {- if ( reportAsSingleViolation() ) {- // We clear the current violations list anyway- constraintViolations.clear();-- // But then we need to distinguish whether the local ConstraintValidator has reported- // violations or not (or if there is no local ConstraintValidator at all).- // If not we create a violation- // using the error message in the annotation declaration at top level.- if ( localViolations.isEmpty() ) {- final String message = (String) getDescriptor().getAttributes().get( "message" );- ConstraintViolationCreationContext constraintViolationCreationContext = new ConstraintViolationCreationContext(- message,- valueContext.getPropertyPath()- );- ConstraintViolation<T> violation = executionContext.createConstraintViolation(- valueContext, constraintViolationCreationContext, descriptor- );- constraintViolations.add( violation );- }- }-- // Now, if there were some violations reported by- // the local ConstraintValidator, they need to be added to constraintViolations.- // Whether we need to report them as a single constraint or just add them to the other violations- // from the composing constraints, has been taken care of in the previous conditional block.- // This takes also care of possible custom error messages created by the constraintValidator,- // as checked in test CustomErrorMessage.java- // If no violations have been reported from the local ConstraintValidator, or no such validator exists,- // then we just add an empty list.- constraintViolations.addAll( localViolations );- }-/**- * Validates all composing constraints recursively.- *- * @param executionContext Meta data about top level validation- * @param valueContext Meta data for currently validated value- * @param constraintViolations Used to accumulate constraint violations- *- * @return Returns an instance of {@code CompositionResult} relevant for boolean composition of constraints+ * @return an {@link Optional#empty()} if there is no violation or a corresponding {@link ConstraintValidatorContextImpl}+ * otherwise.*/- private <T> CompositionResult validateComposingConstraints(ValidationContext<T> executionContext,- ValueContext<?, ?> valueContext,- Set<ConstraintViolation<T>> constraintViolations) {- CompositionResult compositionResult = new CompositionResult( true, false );- List<ConstraintTree<?>> children = getChildren();- for ( ConstraintTree<?> tree : children ) {- Set<ConstraintViolation<T>> tmpViolations = newHashSet();- tree.validateConstraints( executionContext, valueContext, tmpViolations );- constraintViolations.addAll( tmpViolations );-- if ( tmpViolations.isEmpty() ) {- compositionResult.setAtLeastOneTrue( true );- // no need to further validate constraints, because at least one validation passed- if ( descriptor.getCompositionType() == OR ) {- break;- }- }- else {- compositionResult.setAllTrue( false );- if ( descriptor.getCompositionType() == AND- && ( executionContext.isFailFastModeEnabled() || descriptor.isReportAsSingleViolation() ) ) {- break;- }- }- }- return compositionResult;- }-- private boolean passesCompositionTypeRequirement(Set<?> constraintViolations, CompositionResult compositionResult) {- CompositionType compositionType = getDescriptor().getCompositionType();- boolean passedValidation = false;- switch ( compositionType ) {- case OR:- passedValidation = compositionResult.isAtLeastOneTrue();- break;- case AND:- passedValidation = compositionResult.isAllTrue();- break;- case ALL_FALSE:- passedValidation = !compositionResult.isAtLeastOneTrue();- break;- }- assert ( !passedValidation || !( compositionType == AND ) || constraintViolations.isEmpty() );- if ( passedValidation ) {- constraintViolations.clear();- }- return passedValidation;- }-@SuppressWarnings("unchecked")- private <T, V> Set<ConstraintViolation<T>> validateSingleConstraint(ValidationContext<T> executionContext,+ protected final <V> Optional<ConstraintValidatorContextImpl> validateSingleConstraint(ValueContext<?, ?> valueContext,ConstraintValidatorContextImpl constraintValidatorContext,ConstraintValidator<A, V> validator) {@@ -457,9 +188,10 @@ public class ConstraintTree<A extends Annotation> {V validatedValue = (V) valueContext.getCurrentValidatedValue();if (validatedValue != null && !(validator instanceof InterpolativeValidator)) {try {- Member member = MetaConstraint.get().getLocation().getMember();- if (member instanceof Method) {- Method method = (Method) member;+ if (MetaConstraint.get().getLocation() instanceof GetterConstraintLocation) {+ GetterConstraintLocation location = (GetterConstraintLocation) MetaConstraint.get().getLocation();+ Method method = ReflectionUtils.findMethod(location.getDeclaringClass(),+ location.getConstrainable().getName());Interpolative interpolative = method.getAnnotation(Interpolative.class);if (interpolative != null) {String exampleVar = interpolative.exampleVar();@@ -484,26 +216,17 @@ public class ConstraintTree<A extends Annotation> {}}catch (RuntimeException e) {- throw log.getExceptionDuringIsValidCallException( e );+ if ( e instanceof ConstraintDeclarationException ) {+ throw e;+ }+ throw LOG.getExceptionDuringIsValidCallException( e );}if ( !isValid ) {//We do not add these violations yet, since we don't know how they are//going to influence the final boolean evaluation- return executionContext.createConstraintViolations(- valueContext, constraintValidatorContext- );+ return Optional.of( constraintValidatorContext );}- return Collections.emptySet();- }-- /**- * @return {@code} true if the current constraint should be reported as single violation, {@code false otherwise}.- * When using negation, we only report the single top-level violation, as- * it is hard, especially for ALL_FALSE to give meaningful reports- */- private boolean reportAsSingleViolation() {- return getDescriptor().isReportAsSingleViolation()- || getDescriptor().getCompositionType() == ALL_FALSE;+ return Optional.empty();}@Override@@ -511,34 +234,8 @@ public class ConstraintTree<A extends Annotation> {final StringBuilder sb = new StringBuilder();sb.append( "ConstraintTree" );sb.append( "{ descriptor=" ).append( descriptor );- sb.append( ", isRoot=" ).append( parent == null );sb.append( '}' );return sb.toString();}- private static final class CompositionResult {- private boolean allTrue;- private boolean atLeastOneTrue;-- CompositionResult(boolean allTrue, boolean atLeastOneTrue) {- this.allTrue = allTrue;- this.atLeastOneTrue = atLeastOneTrue;- }-- public boolean isAllTrue() {- return allTrue;- }-- public boolean isAtLeastOneTrue() {- return atLeastOneTrue;- }-- public void setAllTrue(boolean allTrue) {- this.allTrue = allTrue;- }-- public void setAtLeastOneTrue(boolean atLeastOneTrue) {- this.atLeastOneTrue = atLeastOneTrue;- }- }}diff --git a/server-core/src/main/java/org/hibernate/validator/internal/metadata/aggregated/MetaDataBuilder.java b/server-core/src/main/java/org/hibernate/validator/internal/metadata/aggregated/MetaDataBuilder.javaindex b3eb2151a2..680a88321b 100644--- a/server-core/src/main/java/org/hibernate/validator/internal/metadata/aggregated/MetaDataBuilder.java+++ b/server-core/src/main/java/org/hibernate/validator/internal/metadata/aggregated/MetaDataBuilder.java@@ -6,23 +6,17 @@*/package org.hibernate.validator.internal.metadata.aggregated;-import static org.hibernate.validator.internal.util.CollectionHelper.newHashMap;import static org.hibernate.validator.internal.util.CollectionHelper.newHashSet;import java.lang.annotation.Annotation;-import java.util.Map;-import java.util.Map.Entry;import java.util.Set;-import org.hibernate.validator.internal.engine.valuehandling.UnwrapMode;-import org.hibernate.validator.internal.metadata.core.ConstraintHelper;+import org.hibernate.validator.internal.engine.ConstraintCreationContext;import org.hibernate.validator.internal.metadata.core.ConstraintOrigin;import org.hibernate.validator.internal.metadata.core.MetaConstraint;+import org.hibernate.validator.internal.metadata.core.MetaConstraints;import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl;import org.hibernate.validator.internal.metadata.raw.ConstrainedElement;-import org.hibernate.validator.internal.util.CollectionHelper;-import org.hibernate.validator.internal.util.logging.Log;-import org.hibernate.validator.internal.util.logging.LoggerFactory;/*** Builds {@link ConstraintMetaData} instances for the@@ -33,19 +27,16 @@ import org.hibernate.validator.internal.util.logging.LoggerFactory;*/public abstract class MetaDataBuilder {- private static final Log log = LoggerFactory.make();-- protected final ConstraintHelper constraintHelper;+ protected final ConstraintCreationContext constraintCreationContext;private final Class<?> beanClass;- private final Set<MetaConstraint<?>> constraints = newHashSet();- private final Map<Class<?>, Class<?>> groupConversions = newHashMap();+ private final Set<MetaConstraint<?>> directConstraints = newHashSet();+ private final Set<MetaConstraint<?>> containerElementsConstraints = newHashSet();private boolean isCascading = false;- private UnwrapMode unwrapMode = UnwrapMode.AUTOMATIC;- protected MetaDataBuilder(Class<?> beanClass, ConstraintHelper constraintHelper) {+ protected MetaDataBuilder(Class<?> beanClass, ConstraintCreationContext constraintCreationContext) {this.beanClass = beanClass;- this.constraintHelper = constraintHelper;+ this.constraintCreationContext = constraintCreationContext;}/**@@ -55,8 +46,8 @@ public abstract class MetaDataBuilder {** @param constrainedElement The element to check.*- * @return <code>true</code> if the given element can be added to this- * builder, <code>false</code> otherwise.+ * @return {@code true} if the given element can be added to this+ * builder, {@code false} otherwise.*/public abstract boolean accepts(ConstrainedElement constrainedElement);@@ -71,19 +62,16 @@ public abstract class MetaDataBuilder {/** Make sure child annotation can override parent annotation with same type*/- for (MetaConstraint<?> constraint: constrainedElement.getConstraints()) {- if (!constraints.stream()+ for (MetaConstraint<?> constraint: adaptConstraints(constrainedElement, constrainedElement.getConstraints())) {+ if (!directConstraints.stream().filter(it->it.getDescriptor().getAnnotationType() == constraint.getDescriptor().getAnnotationType()).findAny().isPresent()) {- constraints.add(constraint);+ directConstraints.add(constraint);}}-// constraints.addAll( constrainedElement.getConstraints() );-- isCascading = isCascading || constrainedElement.isCascading();- unwrapMode = constrainedElement.unwrapMode();-- addGroupConversions( constrainedElement.getGroupConversions() );+// directConstraints.addAll( adaptConstraints( constrainedElement, constrainedElement.getConstraints() ) );+ containerElementsConstraints.addAll( adaptConstraints( constrainedElement, constrainedElement.getTypeArgumentConstraints() ) );+ isCascading = isCascading || constrainedElement.getCascadingMetaDataBuilder().isMarkedForCascadingOnAnnotatedObjectOrContainerElements();}/**@@ -95,29 +83,12 @@ public abstract class MetaDataBuilder {*/public abstract ConstraintMetaData build();- private void addGroupConversions(Map<Class<?>, Class<?>> groupConversions) {- for ( Entry<Class<?>, Class<?>> oneConversion : groupConversions.entrySet() ) {- if ( this.groupConversions.containsKey( oneConversion.getKey() ) ) {- throw log.getMultipleGroupConversionsForSameSourceException(- oneConversion.getKey(),- CollectionHelper.<Class<?>>asSet(- groupConversions.get( oneConversion.getKey() ),- oneConversion.getValue()- )- );- }- else {- this.groupConversions.put( oneConversion.getKey(), oneConversion.getValue() );- }- }+ protected Set<MetaConstraint<?>> getDirectConstraints() {+ return directConstraints;}- protected Map<Class<?>, Class<?>> getGroupConversions() {- return groupConversions;- }-- protected Set<MetaConstraint<?>> getConstraints() {- return constraints;+ public Set<MetaConstraint<?>> getContainerElementConstraints() {+ return containerElementsConstraints;}protected boolean isCascading() {@@ -128,10 +99,6 @@ public abstract class MetaDataBuilder {return beanClass;}- public UnwrapMode unwrapMode() {- return unwrapMode;- }-/*** Adapts the given constraints to the given bean type. In case a constraint* is defined locally at the bean class the original constraint will be@@ -164,20 +131,26 @@ public abstract class MetaDataBuilder {Class<?> constraintClass = constraint.getLocation().getDeclaringClass();- ConstraintDescriptorImpl<A> descriptor = new ConstraintDescriptorImpl<A>(- constraintHelper,- constraint.getLocation().getMember(),- constraint.getDescriptor().getAnnotation(),- constraint.getElementType(),+ ConstraintDescriptorImpl<A> descriptor = new ConstraintDescriptorImpl<>(+ constraintCreationContext.getConstraintHelper(),+ constraint.getLocation().getConstrainable(),+ constraint.getDescriptor().getAnnotationDescriptor(),+ constraint.getConstraintLocationKind(),constraintClass.isInterface() ? constraintClass : null,definedIn,constraint.getDescriptor().getConstraintType());- return new MetaConstraint<A>(- descriptor,- constraint.getLocation()- );+ return MetaConstraints.create( constraintCreationContext.getTypeResolutionHelper(),+ constraintCreationContext.getValueExtractorManager(),+ constraintCreationContext.getConstraintValidatorManager(), descriptor, constraint.getLocation() );+ }++ /**+ * Allows specific sub-classes to customize the retrieved constraints.+ */+ protected Set<MetaConstraint<?>> adaptConstraints(ConstrainedElement constrainedElement, Set<MetaConstraint<?>> constraints) {+ return constraints;}/**@@ -197,4 +170,5 @@ public abstract class MetaDataBuilder {return ConstraintOrigin.DEFINED_IN_HIERARCHY;}}+}diff --git a/server-core/src/main/java/org/hibernate/validator/internal/metadata/core/MetaConstraint.java b/server-core/src/main/java/org/hibernate/validator/internal/metadata/core/MetaConstraint.javaindex be9c786fd4..b3817cdd1f 100644--- a/server-core/src/main/java/org/hibernate/validator/internal/metadata/core/MetaConstraint.java+++ b/server-core/src/main/java/org/hibernate/validator/internal/metadata/core/MetaConstraint.java@@ -7,15 +7,27 @@package org.hibernate.validator.internal.metadata.core;import java.lang.annotation.Annotation;-import java.lang.annotation.ElementType;+import java.lang.reflect.Type;+import java.lang.reflect.TypeVariable;+import java.util.List;+import java.util.NoSuchElementException;import java.util.Set;import java.util.Stack;-import org.hibernate.validator.internal.engine.ValidationContext;-import org.hibernate.validator.internal.engine.ValueContext;+import javax.validation.valueextraction.ValueExtractor;+import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintTree;+import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorManager;+import org.hibernate.validator.internal.engine.validationcontext.ValidationContext;+import org.hibernate.validator.internal.engine.valuecontext.BeanValueContext;+import org.hibernate.validator.internal.engine.valuecontext.ValueContext;+import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorDescriptor;+import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorHelper;import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl;import org.hibernate.validator.internal.metadata.location.ConstraintLocation;+import org.hibernate.validator.internal.metadata.location.ConstraintLocation.ConstraintLocationKind;+import org.hibernate.validator.internal.util.StringHelper;+import org.hibernate.validator.internal.util.stereotypes.Immutable;/*** Instances of this class abstract the constraint type (class, method or field constraint) and give access to@@ -23,6 +35,7 @@ import org.hibernate.validator.internal.metadata.location.ConstraintLocation;** @author Hardy Ferentschik* @author Gunnar Morling+ * @author Guillaume Smet*/public class MetaConstraint<A extends Annotation> {@@ -56,23 +69,47 @@ public class MetaConstraint<A extends Annotation> {private final ConstraintTree<A> constraintTree;/**- * The constraint descriptor.+ * The location at which this constraint is defined.*/- private final ConstraintDescriptorImpl<A> constraintDescriptor;+ private final ConstraintLocation location;/**- * The location at which this constraint is defined.+ * The path used to navigate from the outermost container to the innermost container and extract the value for+ * validation.*/- private final ConstraintLocation location;+ @Immutable+ private final ValueExtractionPathNode valueExtractionPath;++ private final int hashCode;++ /**+ * Indicates if the constraint is defined for one group only: used to optimize already validated constraints+ * tracking.+ */+ private final boolean isDefinedForOneGroupOnly;/*** @param constraintDescriptor The constraint descriptor for this constraint* @param location meta data about constraint placement+ * @param valueExtractionPath the potential {@link ValueExtractor}s used to extract the value to validate+ * @param validatedValueType the type of the validated element*/- public MetaConstraint(ConstraintDescriptorImpl<A> constraintDescriptor, ConstraintLocation location) {- this.constraintTree = new ConstraintTree<A>( constraintDescriptor );- this.constraintDescriptor = constraintDescriptor;+ MetaConstraint(ConstraintValidatorManager constraintValidatorManager, ConstraintDescriptorImpl<A> constraintDescriptor,+ ConstraintLocation location, List<ContainerClassTypeParameterAndExtractor> valueExtractionPath,+ Type validatedValueType) {+ this.constraintTree = ConstraintTree.of( constraintValidatorManager, constraintDescriptor, validatedValueType );this.location = location;+ this.valueExtractionPath = getValueExtractionPath( valueExtractionPath );+ this.hashCode = buildHashCode( constraintDescriptor, location );+ this.isDefinedForOneGroupOnly = constraintDescriptor.getGroups().size() <= 1;+ }++ private static ValueExtractionPathNode getValueExtractionPath(List<ContainerClassTypeParameterAndExtractor> valueExtractionPath) {+ switch ( valueExtractionPath.size() ) {+ case 0: return null;+ case 1: return new SingleValueExtractionPathNode( valueExtractionPath.iterator().next() );+ default: return new LinkedValueExtractionPathNode( null, valueExtractionPath );+ }}/**@@ -80,32 +117,51 @@ public class MetaConstraint<A extends Annotation> {* it is not explicitly specified, but part of the redefined default group list of the hosting bean.*/public final Set<Class<?>> getGroupList() {- return constraintDescriptor.getGroups();+ return constraintTree.getDescriptor().getGroups();+ }++ public final boolean isDefinedForOneGroupOnly() {+ return isDefinedForOneGroupOnly;}public final ConstraintDescriptorImpl<A> getDescriptor() {- return constraintDescriptor;+ return constraintTree.getDescriptor();}- public final ElementType getElementType() {- return constraintDescriptor.getElementType();+ public final ConstraintLocationKind getConstraintLocationKind() {+ return constraintTree.getDescriptor().getConstraintLocationKind();}- public boolean validateConstraint(ValidationContext<?> executionContext, ValueContext<?, ?> valueContext) {+ public boolean validateConstraint(ValidationContext<?> validationContext, ValueContext<?, Object> valueContext) {push(this);try {- valueContext.setElementType( getElementType() );- valueContext.setDeclaredTypeOfValidatedElement( location.getTypeForValidatorResolution() );-- boolean validationResult = constraintTree.validateConstraints( executionContext, valueContext );- executionContext.markConstraintProcessed( valueContext.getCurrentBean(), valueContext.getPropertyPath(), this );-- return validationResult;+ boolean success = true;+ // constraint requiring value extraction to get the value to validate+ if ( valueExtractionPath != null ) {+ Object valueToValidate = valueContext.getCurrentValidatedValue();+ if ( valueToValidate != null ) {+ TypeParameterValueReceiver receiver = new TypeParameterValueReceiver( validationContext, valueContext, valueExtractionPath );+ ValueExtractorHelper.extractValues( valueExtractionPath.getValueExtractorDescriptor(), valueToValidate, receiver );+ success = receiver.isSuccess();+ }+ }+ // regular constraint+ else {+ success = doValidateConstraint( validationContext, valueContext );+ }+ return success;} finally {pop();}}+ private boolean doValidateConstraint(ValidationContext<?> executionContext, ValueContext<?, ?> valueContext) {+ valueContext.setConstraintLocationKind( getConstraintLocationKind() );+ boolean validationResult = constraintTree.validateConstraints( executionContext, valueContext );++ return validationResult;+ }+public ConstraintLocation getLocation() {return location;}@@ -121,30 +177,269 @@ public class MetaConstraint<A extends Annotation> {MetaConstraint<?> that = (MetaConstraint<?>) o;- if ( constraintDescriptor != null ? !constraintDescriptor.equals( that.constraintDescriptor ) : that.constraintDescriptor != null ) {+ if ( !constraintTree.getDescriptor().equals( that.constraintTree.getDescriptor() ) ) {return false;}- if ( location != null ? !location.equals( that.location ) : that.location != null ) {++ if ( !location.equals( that.location ) ) {return false;}return true;}+ private static int buildHashCode(ConstraintDescriptorImpl<?> constraintDescriptor, ConstraintLocation location) {+ final int prime = 31;+ int result = 1;+ result = prime * result + constraintDescriptor.hashCode();+ result = prime * result + location.hashCode();+ return result;+ }+@Overridepublic int hashCode() {- int result = constraintDescriptor != null ? constraintDescriptor.hashCode() : 0;- result = 31 * result + ( location != null ? location.hashCode() : 0 );- return result;+ return hashCode;}@Overridepublic String toString() {final StringBuilder sb = new StringBuilder();sb.append( "MetaConstraint" );- sb.append( "{constraintType=" ).append( constraintDescriptor.getAnnotation().annotationType().getName() );+ sb.append( "{constraintType=" ).append( StringHelper.toShortString( constraintTree.getDescriptor().getAnnotation().annotationType() ) );sb.append( ", location=" ).append( location );+ sb.append( ", valueExtractionPath=" ).append( valueExtractionPath );sb.append( "}" );return sb.toString();}++ private final class TypeParameterValueReceiver implements ValueExtractor.ValueReceiver {++ private final ValidationContext<?> validationContext;+ private final ValueContext<?, Object> valueContext;+ private boolean success = true;+ private ValueExtractionPathNode currentValueExtractionPathNode;++ public TypeParameterValueReceiver(ValidationContext<?> validationContext, ValueContext<?, Object> valueContext, ValueExtractionPathNode currentValueExtractionPathNode) {+ this.validationContext = validationContext;+ this.valueContext = valueContext;+ this.currentValueExtractionPathNode = currentValueExtractionPathNode;+ }++ @Override+ public void value(String nodeName, Object object) {+ doValidate( object, nodeName );+ }++ @Override+ public void iterableValue(String nodeName, Object value) {+ valueContext.markCurrentPropertyAsIterable();+ doValidate( value, nodeName );+ }++ @Override+ public void indexedValue(String nodeName, int index, Object value) {+ valueContext.markCurrentPropertyAsIterableAndSetIndex( index );+ doValidate( value, nodeName );+ }++ @Override+ public void keyedValue(String nodeName, Object key, Object value) {+ valueContext.markCurrentPropertyAsIterableAndSetKey( key );+ doValidate( value, nodeName );+ }++ private void doValidate(Object value, String nodeName) {+ BeanValueContext.ValueState<Object> originalValueState = valueContext.getCurrentValueState();++ Class<?> containerClass = currentValueExtractionPathNode.getContainerClass();+ if ( containerClass != null ) {+ valueContext.setTypeParameter( containerClass, currentValueExtractionPathNode.getTypeParameterIndex() );+ }++ if ( nodeName != null ) {+ valueContext.appendTypeParameterNode( nodeName );+ }++ valueContext.setCurrentValidatedValue( value );++ if ( currentValueExtractionPathNode.hasNext() ) {+ if ( value != null ) {+ currentValueExtractionPathNode = currentValueExtractionPathNode.getNext();++ ValueExtractorDescriptor valueExtractorDescriptor = currentValueExtractionPathNode.getValueExtractorDescriptor();+ ValueExtractorHelper.extractValues( valueExtractorDescriptor, value, this );++ currentValueExtractionPathNode = currentValueExtractionPathNode.getPrevious();+ }+ }+ else {+ success &= doValidateConstraint( validationContext, valueContext );+ }++ // reset the value context to the state before this call+ valueContext.resetValueState( originalValueState );+ }++ public boolean isSuccess() {+ return success;+ }+ }++ static final class ContainerClassTypeParameterAndExtractor {++ private final Class<?> containerClass;+ private final TypeVariable<?> typeParameter;+ private final Integer typeParameterIndex;+ private final ValueExtractorDescriptor valueExtractorDescriptor;++ ContainerClassTypeParameterAndExtractor(Class<?> containerClass, TypeVariable<?> typeParameter, Integer typeParameterIndex, ValueExtractorDescriptor valueExtractorDescriptor) {+ this.containerClass = containerClass;+ this.typeParameter = typeParameter;+ this.typeParameterIndex = typeParameterIndex;+ this.valueExtractorDescriptor = valueExtractorDescriptor;+ }++ @Override+ public String toString() {+ return "ContainerClassTypeParameterAndExtractor [containerClass=" + containerClass ++ ", typeParameter=" + typeParameter ++ ", typeParameterIndex=" + typeParameterIndex ++ ", valueExtractorDescriptor=" + valueExtractorDescriptor + "]";+ }+ }++ private interface ValueExtractionPathNode {+ boolean hasNext();+ ValueExtractionPathNode getPrevious();+ ValueExtractionPathNode getNext();+ Class<?> getContainerClass();+ TypeVariable<?> getTypeParameter();+ Integer getTypeParameterIndex();+ ValueExtractorDescriptor getValueExtractorDescriptor();+ }++ private static final class SingleValueExtractionPathNode implements ValueExtractionPathNode {++ private final Class<?> containerClass;+ private final TypeVariable<?> typeParameter;+ private final Integer typeParameterIndex;+ private final ValueExtractorDescriptor valueExtractorDescriptor;++ public SingleValueExtractionPathNode(ContainerClassTypeParameterAndExtractor typeParameterAndExtractor) {+ this.containerClass = typeParameterAndExtractor.containerClass;+ this.typeParameter = typeParameterAndExtractor.typeParameter;+ this.typeParameterIndex = typeParameterAndExtractor.typeParameterIndex;+ this.valueExtractorDescriptor = typeParameterAndExtractor.valueExtractorDescriptor;+ }++ @Override+ public boolean hasNext() {+ return false;+ }++ @Override+ public ValueExtractionPathNode getPrevious() {+ throw new NoSuchElementException();+ }++ @Override+ public ValueExtractionPathNode getNext() {+ throw new NoSuchElementException();+ }++ @Override+ public Class<?> getContainerClass() {+ return containerClass;+ }++ @Override+ public TypeVariable<?> getTypeParameter() {+ return typeParameter;+ }++ @Override+ public Integer getTypeParameterIndex() {+ return typeParameterIndex;+ }++ @Override+ public ValueExtractorDescriptor getValueExtractorDescriptor() {+ return valueExtractorDescriptor;+ }++ @Override+ public String toString() {+ return "SingleValueExtractionPathNode [containerClass=" + containerClass ++ ", typeParameter=" + typeParameter ++ ", valueExtractorDescriptor=" + valueExtractorDescriptor + "]";+ }+ }++ private static final class LinkedValueExtractionPathNode implements ValueExtractionPathNode {++ private final ValueExtractionPathNode previous;+ private final ValueExtractionPathNode next;+ private final Class<?> containerClass;+ private final TypeVariable<?> typeParameter;+ private final Integer typeParameterIndex;+ private final ValueExtractorDescriptor valueExtractorDescriptor;++ private LinkedValueExtractionPathNode( ValueExtractionPathNode previous, List<ContainerClassTypeParameterAndExtractor> elements) {+ ContainerClassTypeParameterAndExtractor first = elements.get( 0 );+ this.containerClass = first.containerClass;+ this.typeParameter = first.typeParameter;+ this.typeParameterIndex = first.typeParameterIndex;+ this.valueExtractorDescriptor = first.valueExtractorDescriptor;+ this.previous = previous;++ if ( elements.size() == 1 ) {+ this.next = null;+ }+ else {+ this.next = new LinkedValueExtractionPathNode( this, elements.subList( 1, elements.size() ) );+ }+ }++ @Override+ public boolean hasNext() {+ return next != null;+ }++ @Override+ public ValueExtractionPathNode getPrevious() {+ return previous;+ }++ @Override+ public ValueExtractionPathNode getNext() {+ return next;+ }++ @Override+ public Class<?> getContainerClass() {+ return containerClass;+ }++ @Override+ public TypeVariable<?> getTypeParameter() {+ return typeParameter;+ }++ @Override+ public Integer getTypeParameterIndex() {+ return typeParameterIndex;+ }++ @Override+ public ValueExtractorDescriptor getValueExtractorDescriptor() {+ return valueExtractorDescriptor;+ }++ @Override+ public String toString() {+ return "LinkedValueExtractionPathNode [containerClass=" + containerClass ++ ", typeParameter=" + typeParameter ++ ", valueExtractorDescriptor=" + valueExtractorDescriptor + "]";+ }+ }}diff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex 965a4c2e29..a0f2830779 100644--- a/server-plugin/pom.xml+++ b/server-plugin/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xmlindex 7572be98ac..3bb7bdb5a5 100644--- a/server-plugin/server-plugin-archetype/pom.xml+++ b/server-plugin/server-plugin-archetype/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><build><resources>diff --git a/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml b/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xmlindex 6e5f8840cd..076bb0c03f 100644--- a/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml+++ b/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml@@ -33,7 +33,7 @@<plugin><groupId>io.onedev</groupId><artifactId>plugin-maven</artifactId>- <version>2.2.0</version>+ <version>2.3.0</version><executions><execution><?m2e execute onConfiguration,onIncremental?>diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xmlindex 1c8b7197d8..cf12c73280 100644--- a/server-plugin/server-plugin-authenticator-ldap/pom.xml+++ b/server-plugin/server-plugin-authenticator-ldap/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>diff --git a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/ActiveDirectoryAuthenticator.java b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/ActiveDirectoryAuthenticator.javaindex a4aa91bfcd..46ec04a93a 100644--- a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/ActiveDirectoryAuthenticator.java+++ b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/ActiveDirectoryAuthenticator.java@@ -1,6 +1,6 @@package io.onedev.server.plugin.authenticator.ldap;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/GetGroupsUsingAttribute.java b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/GetGroupsUsingAttribute.javaindex 64ae2062d4..c8a9cedcc9 100644--- a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/GetGroupsUsingAttribute.java+++ b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/GetGroupsUsingAttribute.java@@ -1,6 +1,6 @@package io.onedev.server.plugin.authenticator.ldap;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.javaindex 196802bdc8..297f6cf5fb 100644--- a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java+++ b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java@@ -26,7 +26,7 @@ import javax.validation.constraints.NotNull;import org.apache.shiro.authc.AccountException;import org.apache.shiro.authc.UnknownAccountException;import org.apache.shiro.authc.UsernamePasswordToken;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/SearchGroupsUsingFilter.java b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/SearchGroupsUsingFilter.javaindex 5b6ffce87b..0fcfb8f161 100644--- a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/SearchGroupsUsingFilter.java+++ b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/SearchGroupsUsingFilter.java@@ -1,6 +1,6 @@package io.onedev.server.plugin.authenticator.ldap;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xmlindex 40d9a91a4b..0f7611bbd5 100644--- a/server-plugin/server-plugin-buildspec-gradle/pom.xml+++ b/server-plugin/server-plugin-buildspec-gradle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.gradle.GradleModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xmlindex 3086cac8ff..624f42e2f0 100644--- a/server-plugin/server-plugin-buildspec-maven/pom.xml+++ b/server-plugin/server-plugin-buildspec-maven/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.maven.MavenModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xmlindex c687b75767..27415e9675 100644--- a/server-plugin/server-plugin-buildspec-node/pom.xml+++ b/server-plugin/server-plugin-buildspec-node/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xmlindex a68126f5eb..f836a5c2bf 100644--- a/server-plugin/server-plugin-executor-kubernetes/pom.xml+++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.javaindex c055352864..46519457d6 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java@@ -34,7 +34,7 @@ import org.apache.commons.codec.binary.Hex;import org.apache.commons.lang.SerializationUtils;import org.apache.commons.lang3.SystemUtils;import org.apache.commons.text.WordUtils;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.yaml.snakeyaml.Yaml;diff --git a/server-plugin/server-plugin-executor-remotedocker/pom.xml b/server-plugin/server-plugin-executor-remotedocker/pom.xmlindex 11d7a54917..39d9897ecf 100644--- a/server-plugin/server-plugin-executor-remotedocker/pom.xml+++ b/server-plugin/server-plugin-executor-remotedocker/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-remoteshell/pom.xml b/server-plugin/server-plugin-executor-remoteshell/pom.xmlindex 83a05483be..c50494553f 100644--- a/server-plugin/server-plugin-executor-remoteshell/pom.xml+++ b/server-plugin/server-plugin-executor-remoteshell/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-serverdocker/pom.xml b/server-plugin/server-plugin-executor-serverdocker/pom.xmlindex a1bd344eea..424b10eb99 100644--- a/server-plugin/server-plugin-executor-serverdocker/pom.xml+++ b/server-plugin/server-plugin-executor-serverdocker/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.serverdocker.ServerDockerModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.javaindex 1a0f554b18..6d329c7932 100644--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java@@ -26,7 +26,7 @@ import javax.annotation.Nullable;import javax.validation.ConstraintValidatorContext;import org.apache.commons.lang3.SystemUtils;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import com.google.common.base.Joiner;import com.google.common.base.Preconditions;diff --git a/server-plugin/server-plugin-executor-servershell/pom.xml b/server-plugin/server-plugin-executor-servershell/pom.xmlindex 4803277caf..661c532f6d 100644--- a/server-plugin/server-plugin-executor-servershell/pom.xml+++ b/server-plugin/server-plugin-executor-servershell/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.servershell.ServerShellModule</moduleClass>diff --git a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml b/server-plugin/server-plugin-import-bitbucketcloud/pom.xmlindex e7a41a8e19..5c3f7b26cb 100644--- a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml+++ b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.bitbucketcloud.BitbucketPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.java b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.javaindex ae908f1587..8e05b0fec9 100644--- a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.java+++ b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.java@@ -19,7 +19,7 @@ import javax.ws.rs.core.Response;import org.apache.http.client.utils.URIBuilder;import org.glassfish.jersey.client.ClientProperties;import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportWorkspace.java b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportWorkspace.javaindex d841d12dd7..d2325bd851 100644--- a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportWorkspace.java+++ b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportWorkspace.java@@ -3,7 +3,7 @@ package io.onedev.server.plugin.imports.bitbucketcloud;import java.io.Serializable;import java.util.Map;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.ComponentContext;import io.onedev.server.web.editable.BeanEditor;diff --git a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ProjectMapping.java b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ProjectMapping.javaindex 7ae4180696..332fb1f408 100644--- a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ProjectMapping.java+++ b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ProjectMapping.java@@ -2,7 +2,7 @@ package io.onedev.server.plugin.imports.bitbucketcloud;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.validation.annotation.ProjectPath;import io.onedev.server.util.validation.annotation.UrlPath;diff --git a/server-plugin/server-plugin-import-gitea/pom.xml b/server-plugin/server-plugin-import-gitea/pom.xmlindex 218369a344..3f228a81a5 100644--- a/server-plugin/server-plugin-import-gitea/pom.xml+++ b/server-plugin/server-plugin-import-gitea/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.gitea.GiteaPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportRepository.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportRepository.javaindex 2e7d46ae71..547b4ff760 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportRepository.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportRepository.java@@ -2,7 +2,7 @@ package io.onedev.server.plugin.imports.gitea;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.javaindex 2f03df2a4e..92e8ffd887 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java@@ -29,7 +29,7 @@ import javax.ws.rs.core.Response;import org.apache.http.client.utils.URIBuilder;import org.glassfish.jersey.client.ClientProperties;import org.glassfish.jersey.client.oauth2.OAuth2ClientSupport;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.joda.time.format.ISODateTimeFormat;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportOption.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportOption.javaindex 3da5685bdf..d956bfeb87 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportOption.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportOption.java@@ -5,7 +5,7 @@ import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueLabelMapping.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueLabelMapping.javaindex e7cbbcf5e6..960db3445a 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueLabelMapping.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueLabelMapping.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectMapping.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectMapping.javaindex 743d399e7b..e3a73a6cd9 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectMapping.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectMapping.java@@ -2,7 +2,7 @@ package io.onedev.server.plugin.imports.gitea;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.validation.annotation.ProjectPath;import io.onedev.server.util.validation.annotation.UrlPath;diff --git a/server-plugin/server-plugin-import-github/pom.xml b/server-plugin/server-plugin-import-github/pom.xmlindex f1509168d8..bcd4f55a17 100644--- a/server-plugin/server-plugin-import-github/pom.xml+++ b/server-plugin/server-plugin-import-github/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.github.GitHubPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepository.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepository.javaindex 7bf699b352..bd869b987c 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepository.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepository.java@@ -2,7 +2,7 @@ package io.onedev.server.plugin.imports.github;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.javaindex 76b86768f1..b3fcb7646e 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java@@ -26,7 +26,7 @@ import javax.ws.rs.core.Response;import org.apache.http.client.utils.URIBuilder;import org.glassfish.jersey.client.ClientProperties;import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.joda.time.format.ISODateTimeFormat;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportOption.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportOption.javaindex d7b9e0a0fe..cf2d2c3165 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportOption.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportOption.java@@ -5,7 +5,7 @@ import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueLabelMapping.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueLabelMapping.javaindex 15c07c9bb9..e8648f73be 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueLabelMapping.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueLabelMapping.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectMapping.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectMapping.javaindex 1974eba064..e95641a66a 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectMapping.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectMapping.java@@ -2,7 +2,7 @@ package io.onedev.server.plugin.imports.github;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.validation.annotation.ProjectPath;import io.onedev.server.util.validation.annotation.UrlPath;diff --git a/server-plugin/server-plugin-import-gitlab/pom.xml b/server-plugin/server-plugin-import-gitlab/pom.xmlindex 8826d3dd60..9164420b45 100644--- a/server-plugin/server-plugin-import-gitlab/pom.xml+++ b/server-plugin/server-plugin-import-gitlab/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportProject.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportProject.javaindex 958e370660..3840dc67e5 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportProject.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportProject.java@@ -2,7 +2,7 @@ package io.onedev.server.plugin.imports.gitlab;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.javaindex 5e278b14c2..d4432d91b6 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java@@ -30,7 +30,7 @@ import javax.ws.rs.core.Response;import org.apache.http.client.utils.URIBuilder;import org.glassfish.jersey.client.ClientProperties;import org.glassfish.jersey.client.oauth2.OAuth2ClientSupport;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.joda.time.format.ISODateTimeFormat;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportOption.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportOption.javaindex 61a6473ffb..3d1488838e 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportOption.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportOption.java@@ -5,7 +5,7 @@ import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueLabelMapping.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueLabelMapping.javaindex 902818511e..ed428b3386 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueLabelMapping.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueLabelMapping.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectMapping.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectMapping.javaindex 5321511e6a..77c9905c05 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectMapping.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectMapping.java@@ -2,7 +2,7 @@ package io.onedev.server.plugin.imports.gitlab;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.validation.annotation.ProjectPath;import io.onedev.server.util.validation.annotation.UrlPath;diff --git a/server-plugin/server-plugin-import-jiracloud/pom.xml b/server-plugin/server-plugin-import-jiracloud/pom.xmlindex c3cbf9d16e..19089a20ad 100644--- a/server-plugin/server-plugin-import-jiracloud/pom.xml+++ b/server-plugin/server-plugin-import-jiracloud/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportOption.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportOption.javaindex 6b53f778d6..4862b25219 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportOption.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportOption.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportProject.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportProject.javaindex 29f08275fd..563cdb1f16 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportProject.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportProject.java@@ -3,7 +3,7 @@ package io.onedev.server.plugin.imports.jiracloud;import java.io.Serializable;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.ComponentContext;import io.onedev.server.web.editable.BeanEditor;diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.javaindex c8f1c4a8e6..edc03cc13d 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java@@ -34,8 +34,8 @@ import javax.ws.rs.core.Response;import org.apache.http.client.utils.URIBuilder;import org.glassfish.jersey.client.ClientProperties;import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;-import org.hibernate.validator.constraints.Email;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.Email;+import javax.validation.constraints.NotEmpty;import org.joda.time.format.ISODateTimeFormat;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssuePriorityMapping.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssuePriorityMapping.javaindex 755c90915e..3e50bc9299 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssuePriorityMapping.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssuePriorityMapping.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueStatusMapping.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueStatusMapping.javaindex b4ccb40cff..b7e00a5198 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueStatusMapping.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueStatusMapping.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.List;import java.util.stream.Collectors;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueTypeMapping.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueTypeMapping.javaindex c5280bbb31..1d7475deae 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueTypeMapping.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueTypeMapping.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ProjectMapping.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ProjectMapping.javaindex 767137baad..20220de15f 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ProjectMapping.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ProjectMapping.java@@ -2,7 +2,7 @@ package io.onedev.server.plugin.imports.jiracloud;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.validation.annotation.ProjectPath;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-plugin/server-plugin-import-url/pom.xml b/server-plugin/server-plugin-import-url/pom.xmlindex 4e4312abcb..e91256a5af 100644--- a/server-plugin/server-plugin-import-url/pom.xml+++ b/server-plugin/server-plugin-import-url/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.url.UrlPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java b/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.javaindex a0f0d55847..a066cee905 100644--- a/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java+++ b/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java@@ -7,7 +7,7 @@ import javax.validation.ConstraintValidatorContext;import org.apache.http.client.utils.URIBuilder;import org.apache.shiro.authz.UnauthorizedException;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import com.google.common.base.Preconditions;diff --git a/server-plugin/server-plugin-import-youtrack/pom.xml b/server-plugin/server-plugin-import-youtrack/pom.xmlindex cf316f296d..220f7ce69a 100644--- a/server-plugin/server-plugin-import-youtrack/pom.xml+++ b/server-plugin/server-plugin-import-youtrack/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportProject.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportProject.javaindex f4cf37f4b7..a3ec194aad 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportProject.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportProject.java@@ -3,7 +3,7 @@ package io.onedev.server.plugin.imports.youtrack;import java.io.Serializable;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.ComponentContext;import io.onedev.server.web.editable.BeanEditor;diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.javaindex 1fe86b0701..17a90d2b8d 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java@@ -30,7 +30,7 @@ import javax.ws.rs.core.Response;import org.apache.http.client.utils.URIBuilder;import org.apache.wicket.MetaDataKey;import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.unbescape.html.HtmlEscape;diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueFieldMapping.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueFieldMapping.javaindex d6330c4e9f..62c1d9c9b9 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueFieldMapping.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueFieldMapping.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueLinkMapping.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueLinkMapping.javaindex e9837edfe0..ebcb95dd67 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueLinkMapping.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueLinkMapping.java@@ -5,7 +5,7 @@ import java.util.ArrayList;import java.util.Comparator;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueStateMapping.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueStateMapping.javaindex 745b54a384..5b5df4f078 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueStateMapping.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueStateMapping.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueTagMapping.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueTagMapping.javaindex a85b4bd59a..c15e786c80 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueTagMapping.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueTagMapping.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ProjectMapping.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ProjectMapping.javaindex c77c00b07e..e66b1a1e49 100644--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ProjectMapping.java+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ProjectMapping.java@@ -3,7 +3,7 @@ package io.onedev.server.plugin.imports.youtrack;import java.io.Serializable;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.validation.annotation.ProjectPath;diff --git a/server-plugin/server-plugin-notification-discord/pom.xml b/server-plugin/server-plugin-notification-discord/pom.xmlindex e70b04e913..ffc84c9430 100644--- a/server-plugin/server-plugin-notification-discord/pom.xml+++ b/server-plugin/server-plugin-notification-discord/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.notification.discord.DiscordModule</moduleClass>diff --git a/server-plugin/server-plugin-notification-slack/pom.xml b/server-plugin/server-plugin-notification-slack/pom.xmlindex 9649b98971..d4d76fe363 100644--- a/server-plugin/server-plugin-notification-slack/pom.xml+++ b/server-plugin/server-plugin-notification-slack/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.notification.slack.SlackModule</moduleClass>diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xmlindex 652471f7e1..e223983c81 100644--- a/server-plugin/server-plugin-report-checkstyle/pom.xml+++ b/server-plugin/server-plugin-report-checkstyle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.javaindex 912bef9b87..3444dde85c 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java@@ -11,7 +11,7 @@ import org.dom4j.Document;import org.dom4j.DocumentException;import org.dom4j.Element;import org.dom4j.io.SAXReader;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.unbescape.html.HtmlEscape;import io.onedev.commons.codeassist.InputSuggestion;diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishESLintReportStep.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishESLintReportStep.javaindex dfc6829fd9..3692022553 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishESLintReportStep.java+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishESLintReportStep.java@@ -1,6 +1,6 @@package io.onedev.server.plugin.report.checkstyle;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.buildspec.step.StepGroup;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xmlindex ae97aa2039..f16f0e5cb7 100644--- a/server-plugin/server-plugin-report-clover/pom.xml+++ b/server-plugin/server-plugin-report-clover/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishCloverReportStep.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishCloverReportStep.javaindex 12819d63fe..48f01b9c83 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishCloverReportStep.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishCloverReportStep.java@@ -13,7 +13,7 @@ import org.dom4j.Document;import org.dom4j.DocumentException;import org.dom4j.Element;import org.dom4j.io.SAXReader;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.FileUtils;diff --git a/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishJestCoverageReportStep.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishJestCoverageReportStep.javaindex 1419612ebc..e2f4e8d84f 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishJestCoverageReportStep.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishJestCoverageReportStep.java@@ -1,6 +1,6 @@package io.onedev.server.plugin.report.clover;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.server.buildspec.step.StepGroup;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-plugin/server-plugin-report-coverage/pom.xml b/server-plugin/server-plugin-report-coverage/pom.xmlindex 34404ff839..367dd1ecb9 100644--- a/server-plugin/server-plugin-report-coverage/pom.xml+++ b/server-plugin/server-plugin-report-coverage/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.report.coverage.CoverageReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-cpd/pom.xml b/server-plugin/server-plugin-report-cpd/pom.xmlindex d3a975b6d8..11ee3fb0c4 100644--- a/server-plugin/server-plugin-report-cpd/pom.xml+++ b/server-plugin/server-plugin-report-cpd/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java b/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.javaindex e9a3aecc87..10507f12f9 100644--- a/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java+++ b/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java@@ -15,7 +15,7 @@ import org.dom4j.Document;import org.dom4j.DocumentException;import org.dom4j.Element;import org.dom4j.io.SAXReader;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.unbescape.html.HtmlEscape;import com.google.common.base.Splitter;diff --git a/server-plugin/server-plugin-report-jacoco/pom.xml b/server-plugin/server-plugin-report-jacoco/pom.xmlindex 62635c3104..7e6be70f9a 100644--- a/server-plugin/server-plugin-report-jacoco/pom.xml+++ b/server-plugin/server-plugin-report-jacoco/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-jacoco/src/main/java/io/onedev/server/plugin/report/jacoco/PublishJacocoReportStep.java b/server-plugin/server-plugin-report-jacoco/src/main/java/io/onedev/server/plugin/report/jacoco/PublishJacocoReportStep.javaindex b552dabe6c..8132a1a4ac 100644--- a/server-plugin/server-plugin-report-jacoco/src/main/java/io/onedev/server/plugin/report/jacoco/PublishJacocoReportStep.java+++ b/server-plugin/server-plugin-report-jacoco/src/main/java/io/onedev/server/plugin/report/jacoco/PublishJacocoReportStep.java@@ -13,7 +13,7 @@ import org.dom4j.Document;import org.dom4j.DocumentException;import org.dom4j.Element;import org.dom4j.io.SAXReader;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.FileUtils;diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xmlindex 327bf504e0..2e807acb2e 100644--- a/server-plugin/server-plugin-report-jest/pom.xml+++ b/server-plugin/server-plugin-report-jest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/PublishJestReportStep.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/PublishJestReportStep.javaindex 15ac419752..174eb06772 100644--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/PublishJestReportStep.java+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/PublishJestReportStep.java@@ -4,7 +4,7 @@ import java.io.File;import java.util.ArrayList;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import com.fasterxml.jackson.databind.ObjectMapper;import com.google.common.collect.Lists;diff --git a/server-plugin/server-plugin-report-junit/pom.xml b/server-plugin/server-plugin-report-junit/pom.xmlindex 20217b43b2..d87f416946 100644--- a/server-plugin/server-plugin-report-junit/pom.xml+++ b/server-plugin/server-plugin-report-junit/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/PublishJUnitReportStep.java b/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/PublishJUnitReportStep.javaindex fcc6f07a56..7fa60bace3 100644--- a/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/PublishJUnitReportStep.java+++ b/server-plugin/server-plugin-report-junit/src/main/java/io/onedev/server/plugin/report/junit/PublishJUnitReportStep.java@@ -9,7 +9,7 @@ import java.util.List;import org.dom4j.DocumentException;import org.dom4j.io.SAXReader;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import com.google.common.collect.Lists;diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xmlindex 1c8f9a6952..0694000f7a 100644--- a/server-plugin/server-plugin-report-markdown/pom.xml+++ b/server-plugin/server-plugin-report-markdown/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.report.markdown.MarkdownReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.javaindex dba41b0ba7..51355cd847 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java@@ -6,7 +6,7 @@ import java.util.List;import java.util.Map;import java.util.concurrent.Callable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.FileUtils;diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.javaindex 373eed4578..3276e656fa 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java@@ -6,7 +6,7 @@ import java.util.List;import java.util.Map;import java.util.concurrent.Callable;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.FileUtils;diff --git a/server-plugin/server-plugin-report-pmd/pom.xml b/server-plugin/server-plugin-report-pmd/pom.xmlindex e91863486e..9a6a2f7224 100644--- a/server-plugin/server-plugin-report-pmd/pom.xml+++ b/server-plugin/server-plugin-report-pmd/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-pmd/src/main/java/io/onedev/server/plugin/report/pmd/PublishPMDReportStep.java b/server-plugin/server-plugin-report-pmd/src/main/java/io/onedev/server/plugin/report/pmd/PublishPMDReportStep.javaindex 29d4559d73..9971932a62 100644--- a/server-plugin/server-plugin-report-pmd/src/main/java/io/onedev/server/plugin/report/pmd/PublishPMDReportStep.java+++ b/server-plugin/server-plugin-report-pmd/src/main/java/io/onedev/server/plugin/report/pmd/PublishPMDReportStep.java@@ -11,7 +11,7 @@ import org.dom4j.Document;import org.dom4j.DocumentException;import org.dom4j.Element;import org.dom4j.io.SAXReader;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.unbescape.html.HtmlEscape;import io.onedev.commons.codeassist.InputSuggestion;diff --git a/server-plugin/server-plugin-report-problem/pom.xml b/server-plugin/server-plugin-report-problem/pom.xmlindex 81da4f23d2..8b4935f858 100644--- a/server-plugin/server-plugin-report-problem/pom.xml+++ b/server-plugin/server-plugin-report-problem/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.report.problem.ProblemReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-spotbugs/pom.xml b/server-plugin/server-plugin-report-spotbugs/pom.xmlindex 438ac15a5d..aa39a078d7 100644--- a/server-plugin/server-plugin-report-spotbugs/pom.xml+++ b/server-plugin/server-plugin-report-spotbugs/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-spotbugs/src/main/java/io/onedev/server/plugin/report/spotbugs/PublishSpotBugsReportStep.java b/server-plugin/server-plugin-report-spotbugs/src/main/java/io/onedev/server/plugin/report/spotbugs/PublishSpotBugsReportStep.javaindex b189d2d3e5..de89d1c2ae 100644--- a/server-plugin/server-plugin-report-spotbugs/src/main/java/io/onedev/server/plugin/report/spotbugs/PublishSpotBugsReportStep.java+++ b/server-plugin/server-plugin-report-spotbugs/src/main/java/io/onedev/server/plugin/report/spotbugs/PublishSpotBugsReportStep.java@@ -16,7 +16,7 @@ import org.dom4j.Document;import org.dom4j.DocumentException;import org.dom4j.Element;import org.dom4j.io.SAXReader;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.unbescape.html.HtmlEscape;import io.onedev.commons.codeassist.InputSuggestion;diff --git a/server-plugin/server-plugin-report-unittest/pom.xml b/server-plugin/server-plugin-report-unittest/pom.xmlindex 8d6f8828e8..4a3b2ccb0c 100644--- a/server-plugin/server-plugin-report-unittest/pom.xml+++ b/server-plugin/server-plugin-report-unittest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.report.unittest.UnitTestReportModule</moduleClass>diff --git a/server-plugin/server-plugin-sso-discord/pom.xml b/server-plugin/server-plugin-sso-discord/pom.xmlindex b70b4d69c8..5028ff9a38 100644--- a/server-plugin/server-plugin-sso-discord/pom.xml+++ b/server-plugin/server-plugin-sso-discord/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.sso.discord.DiscordModule</moduleClass>diff --git a/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.javaindex 9cc39010e1..2a3f903b60 100644--- a/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java+++ b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/DiscordConnector.java@@ -14,7 +14,7 @@ import org.apache.wicket.request.flow.RedirectToUrlException;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.PackageResourceReference;import org.apache.wicket.request.resource.ResourceReference;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.json.JSONObject;import org.json.JSONException;diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xmlindex e9ae059d8d..7858e2fd7f 100644--- a/server-plugin/server-plugin-sso-openid/pom.xml+++ b/server-plugin/server-plugin-sso-openid/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><properties><moduleClass>io.onedev.server.plugin.sso.openid.OpenIdModule</moduleClass>diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.javaindex cae74b0755..329937c467 100644--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java@@ -13,7 +13,7 @@ import org.apache.shiro.authc.AuthenticationException;import org.apache.wicket.Session;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.flow.RedirectToUrlException;-import org.hibernate.validator.constraints.NotEmpty;+import javax.validation.constraints.NotEmpty;import org.joda.time.DateTime;import org.slf4j.Logger;import org.slf4j.LoggerFactory;diff --git a/server-product/docker/Dockerfile.agent b/server-product/docker/Dockerfile.agentindex 08a5b2f8fc..e61a9c936f 100644--- a/server-product/docker/Dockerfile.agent+++ b/server-product/docker/Dockerfile.agent@@ -2,7 +2,7 @@FROM ubuntu:18.04COPY agent /agentCOPY docker /usr/local/bin/-RUN apt-get update && apt-get install -y locales curl git git-lfs openjdk-8-jre-headless && rm -rf /var/lib/apt/lists/*+RUN apt-get update && apt-get install -y locales curl git git-lfs openjdk-11-jre-headless && rm -rf /var/lib/apt/lists/*RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \locale-genENV LANG en_US.UTF-8diff --git a/server-product/docker/Dockerfile.server b/server-product/docker/Dockerfile.serverindex 525e71da70..88fdd26948 100644--- a/server-product/docker/Dockerfile.server+++ b/server-product/docker/Dockerfile.server@@ -4,7 +4,7 @@ COPY app /appCOPY entrypoint.sh idle.sh /root/bin/COPY kubectl /usr/local/bin/COPY docker /usr/local/bin/-RUN apt-get update && apt-get install -y locales iproute2 curl git git-lfs openjdk-8-jre-headless && rm -rf /var/lib/apt/lists/*+RUN apt-get update && apt-get install -y locales iproute2 curl git git-lfs openjdk-11-jre-headless && rm -rf /var/lib/apt/lists/*RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \locale-genENV LANG en_US.UTF-8diff --git a/server-product/docker/entrypoint.sh b/server-product/docker/entrypoint.shindex 4254deb6bc..ea40a9b759 100755--- a/server-product/docker/entrypoint.sh+++ b/server-product/docker/entrypoint.sh@@ -11,19 +11,21 @@ _sigterm() {trap _sigterm SIGTERMtrap _sigterm SIGINT-JVM_OPTIONS=-XX:MaxRAMPercentage=50.0+MOD_OPTIONS="--add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED"++MEM_OPTIONS=-XX:MaxRAMPercentage=50.0if [[ $JAVA_TOOL_OPTIONS == *"-XX:MaxRAMPercentage"* ]] || [[ $JAVA_TOOL_OPTIONS == *"-Xmx"* ]]; then- unset JVM_OPTIONS+ unset MEM_OPTIONSficd /app/bin-java -cp "../boot/*" ${JVM_OPTIONS} io.onedev.commons.bootstrap.Bootstrap upgrade /opt/onedev &+java -cp "../boot/*" ${MEM_OPTIONS} ${MOD_OPTIONS} io.onedev.commons.bootstrap.Bootstrap upgrade /opt/onedev &child=$!wait "$child"touch /opt/onedev/IN_DOCKERcd /opt/onedev/bin-java -cp "../boot/*" ${JVM_OPTIONS} io.onedev.commons.bootstrap.Bootstrap &+java -cp "../boot/*" ${MEM_OPTIONS} ${MOD_OPTIONS} io.onedev.commons.bootstrap.Bootstrap &child=$!wait "$child"diff --git a/server-product/jsw/wrapper.conf b/server-product/jsw/wrapper.confindex 9175a10925..c01a840b19 100644--- a/server-product/jsw/wrapper.conf+++ b/server-product/jsw/wrapper.conf@@ -40,11 +40,13 @@ wrapper.single_invocation=TRUE#********************************************************************# Wrapper Java Properties. OneDev requires at least Java version 8#********************************************************************-# Specify Java 8 executable to be used. You may simply specify it as "java"-# if the one in system path is appropriate, or specify the full path to-# desired java executable+# Specify Java 11 or higher executable to be used. You may simply specify it+# as "java" if the one in system path is appropriate, or specify the full path+to desired java executablewrapper.java.command=java+wrapper.java.version.min=11+# Tell the Wrapper to log the full generated Java command line.#wrapper.java.command.loglevel=INFO@@ -71,7 +73,7 @@ wrapper.java.additional.auto_bits=TRUE# Java Additional Parameterswrapper.java.additional.1=-Djava.awt.headless=true-wrapper.java.additional.10=-XX:+IgnoreUnrecognizedVMOptions+wrapper.java.additional.10=--add-opens=java.base/sun.nio.ch=ALL-UNNAMEDwrapper.java.additional.11=--add-opens=java.base/java.lang=ALL-UNNAMEDwrapper.java.additional.12=--add-opens=java.base/java.lang.reflect=ALL-UNNAMEDwrapper.java.additional.13=--add-opens=java.base/java.lang.invoke=ALL-UNNAMEDdiff --git a/server-product/pom.xml b/server-product/pom.xmlindex 823096dfef..1946cf9e1e 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>7.6.0</version>+ <version>7.7.0</version></parent><dependencies><dependency>diff --git a/server-product/system/incompatibilities/incompatibilities.md b/server-product/system/incompatibilities/incompatibilities.mdindex 6de153234b..7fa7162145 100644--- a/server-product/system/incompatibilities/incompatibilities.md+++ b/server-product/system/incompatibilities/incompatibilities.md@@ -1,3 +1,12 @@+# 7.7.0++OneDev server and agent now requires Java 11 or higher. Follow below steps to upgrade agent manually:++1. If agent is running as bare metal mode with Java 8, re-download agent package from server and run it+with Java 11 or higher following the instructions+1. If agent is running as bare metal mode with Java 11 or higher, it will be updated automatically+1. If agent is running in container mode, re-pull the image and start the container+# 7.4.0### RESTful api