The Unified and Autonomous Development Platform
Install intepolator interceptor to job to evaluate variables at the time using them
Robin Shen312ca0af3c52
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.javaindex eae0a3f679..abd57c5ce1 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java@@ -20,6 +20,7 @@ import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.ExecutionException;import java.util.concurrent.ExecutorService;import java.util.concurrent.TimeoutException;+import java.util.concurrent.atomic.AtomicInteger;import java.util.concurrent.atomic.AtomicReference;import java.util.concurrent.locks.Lock;import java.util.function.Consumer;@@ -28,10 +29,7 @@ import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;import javax.servlet.http.HttpServletRequest;-import javax.validation.ConstraintViolation;-import javax.validation.Validator;-import org.apache.commons.lang3.SerializationUtils;import org.apache.commons.lang3.StringUtils;import org.apache.shiro.authc.credential.PasswordService;import org.apache.shiro.subject.Subject;@@ -99,8 +97,6 @@ import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.script.identity.JobIdentity;import io.onedev.server.util.script.identity.ScriptIdentity;-import io.onedev.server.util.validation.Interpolated;-import io.onedev.server.web.editable.Path;@Singletonpublic class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizationSource {@@ -319,24 +315,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizprivate JobExecution execute(Build build) {ScriptIdentity.push(new JobIdentity(build.getProject(), build.getCommitId()));+ Build.push(build);try {String jobToken = UUID.randomUUID().toString();Collection<String> jobSecretsToMask = Sets.newHashSet(jobToken);- Job job = SerializationUtils.clone(build.getJob());- build.interpolate(job);-- // make sure interpolated result passes validation- Interpolated.push(true);- try {- for (ConstraintViolation<?> violation: OneDev.getInstance(Validator.class).validate(job)) {- String errorMessage = String.format("Error validating job (property: %s, message: %s)",- new Path(violation.getPropertyPath()).toString(), violation.getMessage());- throw new OneException(errorMessage);- }- } finally {- Interpolated.pop();- }+ Job job = (Job) VariableInterpolator.installInterceptor(build.getJob());JobExecutor executor = getJobExecutor(build);if (executor != null) {@@ -359,71 +343,91 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizSet<String> includeFiles = new HashSet<>();Set<String> excludeFiles = new HashSet<>();List<SubmoduleCredential> submoduleCredentials = new ArrayList<>();+ AtomicInteger maxRetries = new AtomicInteger(0);+ AtomicInteger retryDelay = new AtomicInteger(0);sessionManager.run(new Runnable() {@Overridepublic void run() {Build build = buildManager.load(buildId);- jobLogger.log("Retrieving dependency artifacts...");- for (BuildDependence dependence: build.getDependencies()) {- if (dependence.getArtifacts() != null) {- build.retrieveArtifacts(dependence.getDependency(),- dependence.getArtifacts(), serverWorkspace);+ Build.push(build);+ try {+ jobLogger.log("Retrieving dependency artifacts...");+ for (BuildDependence dependence: build.getDependencies()) {+ if (dependence.getArtifacts() != null) {+ build.retrieveArtifacts(dependence.getDependency(),+ dependence.getArtifacts(), serverWorkspace);+ }}- }- if (job.getArtifacts() != null) {- PatternSet patternSet = PatternSet.parse(job.getArtifacts());- includeFiles.addAll(patternSet.getIncludes());- excludeFiles.addAll(patternSet.getExcludes());- }- for (JobReport report: job.getReports()) {- PatternSet patternSet = PatternSet.parse(report.getFilePatterns());- includeFiles.addAll(patternSet.getIncludes());- excludeFiles.addAll(patternSet.getExcludes());- }-- if (job.isRetrieveSource()) {- for (SubmoduleCredential submoduleCredential: job.getSubmoduleCredentials()) {- SubmoduleCredential resolvedSubmoduleCredential = new SubmoduleCredential();- resolvedSubmoduleCredential.setUrl(submoduleCredential.getUrl());- resolvedSubmoduleCredential.setUserName(submoduleCredential.getUserName());- resolvedSubmoduleCredential.setPasswordSecret(- build.getSecretValue(submoduleCredential.getPasswordSecret()));- submoduleCredentials.add(resolvedSubmoduleCredential);+ if (job.getArtifacts() != null) {+ PatternSet patternSet = PatternSet.parse(job.getArtifacts());+ includeFiles.addAll(patternSet.getIncludes());+ excludeFiles.addAll(patternSet.getExcludes());+ }+ for (JobReport report: job.getReports()) {+ PatternSet patternSet = PatternSet.parse(report.getFilePatterns());+ includeFiles.addAll(patternSet.getIncludes());+ excludeFiles.addAll(patternSet.getExcludes());+ }++ if (job.isRetrieveSource()) {+ for (SubmoduleCredential submoduleCredential: job.getSubmoduleCredentials()) {+ SubmoduleCredential resolvedSubmoduleCredential = new SubmoduleCredential();+ resolvedSubmoduleCredential.setUrl(submoduleCredential.getUrl());+ resolvedSubmoduleCredential.setUserName(submoduleCredential.getUserName());+ resolvedSubmoduleCredential.setPasswordSecret(+ build.getSecretValue(submoduleCredential.getPasswordSecret()));+ submoduleCredentials.add(resolvedSubmoduleCredential);+ }}+ maxRetries.set(job.getMaxRetries());+ } finally {+ Build.pop();}-}});- int retried = 0;+ AtomicInteger retried = new AtomicInteger(0);while (true) {- JobContext jobContext = new JobContext(projectName, buildNumber, projectGitDir, job.getImage(),- serverWorkspace, job.getCommands(), job.isRetrieveSource(), job.getCloneDepth(),- submoduleCredentials, job.getCpuRequirement(), job.getMemoryRequirement(),- commitId, job.getCaches(), new PatternSet(includeFiles, excludeFiles),- executor.getCacheTTL(), retried, job.getServices(), jobLogger) {+ JobContext jobContext = sessionManager.call(new Callable<JobContext> () {@Override- public void notifyJobRunning() {- transactionManager.run(new Runnable() {+ public JobContext call() throws Exception {+ Build build = buildManager.load(buildId);+ Build.push(build);+ try {+ return new JobContext(projectName, buildNumber, projectGitDir, job.getImage(),+ serverWorkspace, job.getCommands(), job.isRetrieveSource(), job.getCloneDepth(),+ submoduleCredentials, job.getCpuRequirement(), job.getMemoryRequirement(),+ commitId, job.getCaches(), new PatternSet(includeFiles, excludeFiles),+ executor.getCacheTTL(), retried.get(), job.getServices(), jobLogger) {++ @Override+ public void notifyJobRunning() {+ transactionManager.run(new Runnable() {- @Override- public void run() {- Build build = buildManager.load(buildId);- build.setStatus(Build.Status.RUNNING);- build.setRunningDate(new Date());- buildManager.save(build);- listenerRegistry.post(new BuildRunning(build));- }-- });+ @Override+ public void run() {+ Build build = buildManager.load(buildId);+ build.setStatus(Build.Status.RUNNING);+ build.setRunningDate(new Date());+ buildManager.save(build);+ listenerRegistry.post(new BuildRunning(build));+ }++ });+ }++ };+ } finally {+ Build.pop();+ }}-- };++ });jobContexts.put(jobToken, jobContext);@@ -434,7 +438,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizif (ExceptionUtils.find(e, InterruptedException.class) != null) {throw e;} else {- if (retried++ < job.getMaxRetries() && transactionManager.call(new Callable<Boolean>() {+ if (retried.getAndIncrement() < maxRetries.get() && transactionManager.call(new Callable<Boolean>() {@Overridepublic Boolean call() {@@ -467,7 +471,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz});try {- Thread.sleep(job.getRetryDelay() * (long)(Math.pow(2, retried)) * 1000L);+ Thread.sleep(retryDelay.get() * (long)(Math.pow(2, retried.get())) * 1000L);} catch (InterruptedException e2) {throw e2;}@@ -503,14 +507,19 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Overridepublic void run() {Build build = buildManager.load(buildId);- if (job.getArtifacts() != null) {- jobLogger.log("Publishing job artifacts...");- build.publishArtifacts(serverWorkspace, job.getArtifacts());+ Build.push(build);+ try {+ if (job.getArtifacts() != null) {+ jobLogger.log("Publishing job artifacts...");+ build.publishArtifacts(serverWorkspace, job.getArtifacts());+ }++ jobLogger.log("Processing job reports...");+ for (JobReport report: job.getReports())+ report.process(build, serverWorkspace, jobLogger);+ } finally {+ Build.pop();}-- jobLogger.log("Processing job reports...");- for (JobReport report: job.getReports())- report.process(build, serverWorkspace, jobLogger);}});@@ -529,6 +538,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizthrow new OneException("No applicable job executor");}} finally {+ Build.pop();ScriptIdentity.pop();}}@@ -584,7 +594,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizLong projectId = event.getProject().getId();// run asynchrously as session may get closed due to exception- OneDev.getInstance(TransactionManager.class).runAfterCommit(new Runnable() {+ transactionManager.runAfterCommit(new Runnable() {@Overridepublic void run() {@@ -824,11 +834,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Overridepublic void run() {Build build = OneDev.getInstance(BuildManager.class).load(buildId);- Build.push(build);ScriptIdentity.push(new JobIdentity(build.getProject(), build.getCommitId()));+ Build.push(build);try {- for (PostBuildAction action: build.getJob().getPostBuildActions()) {- if (ActionCondition.parse(build.getJob(), action.getCondition()).matches(build))+ Job job = (Job) VariableInterpolator.installInterceptor(build.getJob());+ for (PostBuildAction action: job.getPostBuildActions()) {+ if (ActionCondition.parse(job, action.getCondition()).matches(build))action.execute(build);}} catch (Throwable e) {@@ -836,8 +847,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizbuild.getProject().getName(), build.getCommitHash(), build.getJobName());logger.error(message, e);} finally {- ScriptIdentity.pop();Build.pop();+ ScriptIdentity.pop();}}});@@ -945,4 +956,4 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}}-}+}\ No newline at end of filediff --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 529fec6691..e37fe83676 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@@ -15,6 +15,7 @@ import java.util.Set;import javax.validation.ConstraintValidatorContext;import javax.validation.Valid;+import javax.validation.constraints.Min;import javax.validation.constraints.Size;import org.apache.wicket.Component;@@ -303,6 +304,7 @@ public class Job implements Serializable, Validatable {}@Editable(order=9410, group="Retry Upon Failure", description="Maximum of retries before giving up")+ @Min(value=1, message="This value should not be less than 1")public int getMaxRetries() {return maxRetries;}@@ -314,6 +316,7 @@ public class Job implements Serializable, Validatable {@Editable(order=9420, group="Retry Upon Failure", description="Delay for the first retry in seconds. "+ "Delay of subsequent retries will be calculated using an exponential back-off "+ "based on this delay")+ @Min(value=1, message="This value should not be less than 1")public int getRetryDelay() {return retryDelay;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.javaindex 66fe372005..205dfed512 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java@@ -38,6 +38,14 @@ public enum JobVariable {return String.valueOf(build.getNumber());}+ },+ BUILD_VERSION {++ @Override+ public String getValue(Build build) {+ return build.getVersion();+ }+},ON_BRANCHES {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java b/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.javaindex b9d0a31caa..241f26a61b 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java@@ -1,5 +1,9 @@package io.onedev.server.buildspec.job;+import java.io.Serializable;+import java.lang.reflect.Field;+import java.lang.reflect.InvocationTargetException;+import java.lang.reflect.Method;import java.util.ArrayList;import java.util.HashMap;import java.util.List;@@ -11,8 +15,13 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneException;import io.onedev.server.buildspec.job.paramspec.ParamSpec;import io.onedev.server.model.Build;+import io.onedev.server.util.BeanUtils;import io.onedev.server.util.GroovyUtils;import io.onedev.server.util.Input;+import io.onedev.server.web.editable.annotation.Editable;+import net.sf.cglib.proxy.Enhancer;+import net.sf.cglib.proxy.MethodInterceptor;+import net.sf.cglib.proxy.MethodProxy;public class VariableInterpolator implements Function<String, String> {@@ -79,4 +88,76 @@ public class VariableInterpolator implements Function<String, String> {}}+ public static Object installInterceptor(Object object) {+ Enhancer enhancer = new Enhancer();+ enhancer.setSuperclass(object.getClass());+ enhancer.setCallback(new InterpolatorInterceptor());++ Object enhanced = enhancer.create();++ for (Field field: BeanUtils.findFields(object.getClass())) {+ field.setAccessible(true);+ try {+ field.set(enhanced, field.get(object));+ } catch (IllegalArgumentException | IllegalAccessException e) {+ throw new RuntimeException(e);+ }+ }++ for (Method getter: BeanUtils.findGetters(object.getClass())) {+ if (getter.getAnnotation(Editable.class) != null) {+ Method setter = BeanUtils.findSetter(getter);+ if (setter != null) {+ try {+ Object propertyValue = getter.invoke(enhanced);+ if (propertyValue != null) {+ if (propertyValue.getClass().getAnnotation(Editable.class) != null) {+ setter.invoke(enhanced, installInterceptor(propertyValue));+ } else if (propertyValue instanceof List) {+ List<Object> enhancedList = new ArrayList<>();+ for (Object element: (List<?>)propertyValue) {+ if (element.getClass().getAnnotation(Editable.class) != null)+ enhancedList.add(installInterceptor(element));+ else+ enhancedList.add(element);+ }+ setter.invoke(enhanced, enhancedList);+ }+ }+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {+ throw new RuntimeException(e);+ }+ }+ }+ }++ return enhanced;+ }++ private static class InterpolatorInterceptor implements MethodInterceptor, Serializable {++ private static final long serialVersionUID = 1L;++ @SuppressWarnings("unchecked")+ public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {+ if (BeanUtils.isGetter(method)+ && method.getAnnotation(Editable.class) != null+ && method.getAnnotation(io.onedev.server.web.editable.annotation.Interpolative.class) != null) {+ Serializable propertyValue = (Serializable) methodProxy.invokeSuper(proxy, args);+ Build build = Build.get();+ if (build == null) {+ throw new OneException("No build context in interpolator interceptor");+ } else if (propertyValue instanceof String) {+ return build.interpolate((String) propertyValue);+ } else if (propertyValue instanceof List) {+ List<String> interpolatedList = new ArrayList<>();+ for (String element: (List<String>) propertyValue)+ interpolatedList.add(build.interpolate(element));+ return interpolatedList;+ }+ }+ return methodProxy.invokeSuper(proxy, args);+ }+ }+}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 e36b92b50e..f66c87bde4 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@@ -95,7 +95,7 @@ public class CreateIssueAction extends PostBuildAction {Issue issue = new Issue();issue.setUUID(UUID.randomUUID().toString());issue.setProject(build.getProject());- issue.setTitle(build.interpolate(getIssueTitle()));+ issue.setTitle(getIssueTitle());issue.setSubmitter(SecurityUtils.getUser());issue.setSubmitDate(new Date());SettingManager settingManager = OneDev.getInstance(SettingManager.class);diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.javaindex 8721015cc6..f31c945bec 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.java@@ -61,6 +61,7 @@ public class CreateTagAction extends PostBuildAction {public void execute(Build build) {PersonIdent tagIdent = OneDev.getInstance(UserManager.class).getSystem().asPerson();Project project = build.getProject();+ String tagName = getTagName();Ref tagRef = project.getTagRef(tagName);TagProtection protection = project.getTagProtection(tagName, build);if (tagRef != null) {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 c9115115d0..296f23845a 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@@ -89,7 +89,7 @@ public class RunJobAction extends PostBuildAction {@Overridepublic void run(Map<String, List<String>> paramMap) {OneDev.getInstance(JobManager.class).submit(build.getProject(),- build.getCommitId(), jobName, paramMap);+ build.getCommitId(), getJobName(), paramMap);}}.run();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 b5f4511b09..baab4547dc 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@@ -29,7 +29,7 @@ public class SendNotificationAction extends PostBuildAction {@Overridepublic void execute(Build build) {io.onedev.server.buildspec.job.action.notificationreceiver.NotificationReceiver parsedReceiver =- io.onedev.server.buildspec.job.action.notificationreceiver.NotificationReceiver.parse(receivers, build);+ io.onedev.server.buildspec.job.action.notificationreceiver.NotificationReceiver.parse(getReceivers(), build);OneDev.getInstance(BuildNotificationManager.class).notify(build, parsedReceiver.getEmails());}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 3cb096febc..a3d2d32978 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@@ -3,8 +3,6 @@ package io.onedev.server.model;import java.io.File;import java.io.IOException;import java.io.Serializable;-import java.lang.reflect.InvocationTargetException;-import java.lang.reflect.Method;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;@@ -59,7 +57,6 @@ import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.support.JobSecret;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.storage.StorageManager;-import io.onedev.server.util.BeanUtils;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.Input;import io.onedev.server.util.IssueUtils;@@ -71,7 +68,6 @@ import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.util.BuildAware;import io.onedev.server.web.util.WicketUtils;@@ -684,41 +680,6 @@ public class Build extends AbstractEntity implements Referenceable {return null;}- @SuppressWarnings("unchecked")- public void interpolate(Serializable bean) {- Build.push(this);- try {- for (Method getter: BeanUtils.findGetters(bean.getClass())) {- Method setter = BeanUtils.findSetter(getter);- if (setter != null && getter.getAnnotation(Editable.class) != null) {- Serializable value = (Serializable) getter.invoke(bean);- if (value != null) {- if (getter.getAnnotation(io.onedev.server.web.editable.annotation.Interpolative.class) != null) {- if (value instanceof String) {- setter.invoke(bean, interpolate((String) getter.invoke(bean)));- } else if (value instanceof List) {- List<String> list = (List<String>) value;- for (int i=0; i<list.size(); i++)- list.set(i, interpolate(list.get(i)));- }- } else if (value instanceof Collection) {- for (Serializable element: (Collection<Serializable>) value) {- if (element.getClass().getAnnotation(Editable.class) != null)- interpolate(element);- }- } else if (value.getClass().getAnnotation(Editable.class) != null) {- interpolate(value);- }- }- }- }- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {- throw new RuntimeException(e);- } finally {- Build.pop();- }- }-public ProjectScopedNumber getFQN() {return new ProjectScopedNumber(getProject(), getNumber());}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 0ff0c5f3fa..268f2718e7 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@@ -326,7 +326,7 @@ public class DefaultPersistManager implements PersistManager {* @return*/private boolean hasForeignKeyDependency(Class<?> entityType1, Class<?> entityType2) {- for (Field field: BeanUtils.getFields(entityType1)) {+ for (Field field: BeanUtils.findFields(entityType1)) {if (field.getAnnotation(ManyToOne.class) != null) {if (field.getType() == entityType2)return true;diff --git a/server-core/src/main/java/io/onedev/server/util/BeanUtils.java b/server-core/src/main/java/io/onedev/server/util/BeanUtils.javaindex b60acb76be..45b4cc4f9a 100644--- a/server-core/src/main/java/io/onedev/server/util/BeanUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/BeanUtils.java@@ -4,11 +4,9 @@ import java.lang.reflect.Field;import java.lang.reflect.Method;import java.lang.reflect.Modifier;import java.util.ArrayList;-import java.util.HashSet;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import java.util.Set;import com.google.common.base.Preconditions;@@ -36,21 +34,21 @@ public class BeanUtils {* If there are fields with the same name in super-class and sub-class,* fields in the sub-class with be returned only.*/- public static List<Field> getFields(Class<?> clazz) {- List<Field> fields = new ArrayList<Field>();- Set<String> existingNames = new HashSet<String>();+ public static List<Field> findFields(Class<?> clazz) {+ Map<String, Field> fields = new LinkedHashMap<>();Class<?> current = clazz;while (current != null) {for (Field field: current.getDeclaredFields()) {- if (!Modifier.isStatic(field.getModifiers()) && !existingNames.contains(field.getName())) {- fields.add(field);- existingNames.add(field.getName());+ if (!field.isSynthetic()+ && !Modifier.isStatic(field.getModifiers())+ && !fields.containsKey(field.getName())) {+ fields.put(field.getName(), field);}}current = current.getSuperclass();}- return fields;+ return new ArrayList<Field>(fields.values());}/**@@ -108,7 +106,7 @@ public class BeanUtils {* to sub classes coming first*/public static List<Method> findGetters(Class<?> clazz) {- Map<String, Method> getters = new LinkedHashMap<String, Method>();+ Map<String, Method> getters = new LinkedHashMap<>();Class<?> current = clazz;while (current != null) {diff --git a/server-core/src/main/java/io/onedev/server/util/validation/ParamNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/ParamNameValidator.javaindex 90553c89fb..a9224b7284 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/ParamNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/ParamNameValidator.java@@ -1,5 +1,7 @@package io.onedev.server.util.validation;+import java.util.regex.Pattern;+import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;@@ -8,6 +10,8 @@ import io.onedev.server.util.validation.annotation.ParamName;public class ParamNameValidator implements ConstraintValidator<ParamName, String> {+ private static final Pattern PATTERN = Pattern.compile("\\w([\\w-\\.]*\\w)?");+private String message;@Override@@ -21,7 +25,14 @@ public class ParamNameValidator implements ConstraintValidator<ParamName, Stringreturn true;String message = this.message;- if (BuildQueryConstants.ALL_FIELDS.contains(value)) {+ if (!PATTERN.matcher(value).matches()) {+ if (message.length() == 0) {+ message = "Should start and end with alphanumeric or underscore. "+ + "Only alphanumeric, underscore, dash, and dot are allowed in the middle.";+ }+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ } else if (BuildQueryConstants.ALL_FIELDS.contains(value)) {constraintContext.disableDefaultConstraintViolation();if (message.length() == 0)message = "'" + value + "' is reserved";