Skip to content

The Unified and Autonomous Development Platform

fix: Regression since 16.0.3: TOD issue create/change-state fails without Wicket application (OD-2852)

Robin Shen926ffaa8412e
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
index 969e9692ee..a52c75d07a 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
@@ -21,7 +21,6 @@ import javax.validation.ValidationException;
import javax.validation.Validator;
import org.apache.commons.lang3.SerializationUtils;
-import org.apache.wicket.Component;
import org.jspecify.annotations.Nullable;
import org.yaml.snakeyaml.DumperOptions.FlowStyle;
import org.yaml.snakeyaml.nodes.MappingNode;
@@ -57,7 +56,7 @@ import io.onedev.server.data.migration.XmlBuildSpecMigrator;
import io.onedev.server.job.JobAuthorizationContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.build.JobProperty;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.validation.Validatable;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.util.SuggestionUtils;
@@ -551,8 +550,7 @@ public class BuildSpec implements Serializable, Validatable {
@Nullable
public static BuildSpec get() {
- Component component = ComponentContext.get().getComponent();
- BuildSpecAware buildSpecAware = WicketUtils.findInnermost(component, BuildSpecAware.class);
+ BuildSpecAware buildSpecAware = HierarchicalContext.get().findData(BuildSpecAware.class);
if (buildSpecAware != null)
return buildSpecAware.getBuildSpec();
else
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.java
index 3a8987f837..3c3009c24b 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
@@ -17,14 +17,13 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.Valid;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
-import org.apache.wicket.Component;
import org.eclipse.jgit.lib.ObjectId;
+import org.jspecify.annotations.Nullable;
import io.onedev.commons.codeassist.InputCompletion;
import io.onedev.commons.codeassist.InputStatus;
@@ -52,8 +51,8 @@ import io.onedev.server.job.match.JobMatchContext;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
import io.onedev.server.service.SettingService;
-import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.validation.Validatable;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
@@ -250,8 +249,7 @@ public class Job implements NamedElement, Validatable {
@SuppressWarnings("unused")
private static List<String> getServiceChoices() {
List<String> choices = new ArrayList<>();
- Component component = ComponentContext.get().getComponent();
- BuildSpecAware buildSpecAware = WicketUtils.findInnermost(component, BuildSpecAware.class);
+ BuildSpecAware buildSpecAware = HierarchicalContext.get().findData(BuildSpecAware.class);
if (buildSpecAware != null) {
BuildSpec buildSpec = buildSpecAware.getBuildSpec();
if (buildSpec != null) {
@@ -442,15 +440,15 @@ public class Job implements NamedElement, Validatable {
public static List<String> getChoices() {
List<String> choices = new ArrayList<>();
- Component component = ComponentContext.get().getComponent();
- BuildSpecAware buildSpecAware = WicketUtils.findInnermost(component, BuildSpecAware.class);
+ var hierarchicalContext = HierarchicalContext.get();
+ BuildSpecAware buildSpecAware = hierarchicalContext.findData(BuildSpecAware.class);
if (buildSpecAware != null) {
BuildSpec buildSpec = buildSpecAware.getBuildSpec();
if (buildSpec != null) {
choices.addAll(buildSpec.getJobMap().values().stream()
.map(it->it.getName()).collect(Collectors.toList()));
}
- JobAware jobAware = WicketUtils.findInnermost(component, JobAware.class);
+ JobAware jobAware = hierarchicalContext.findData(JobAware.class);
if (jobAware != null) {
Job job = jobAware.getJob();
if (job != null)
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.java
index f319165f5b..443ee4346b 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
@@ -20,8 +20,8 @@ import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.param.instance.ParamInstances;
import io.onedev.server.buildspec.param.instance.ParamMap;
import io.onedev.server.buildspec.param.spec.ParamSpec;
-import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.web.editable.BeanEditor;
@Editable
@@ -87,8 +87,8 @@ public class JobDependency implements Serializable {
@SuppressWarnings({ "unused", "unchecked" })
private static boolean isExcludeParamMapsVisible() {
- var componentContext = ComponentContext.get();
- if (componentContext != null && componentContext.getComponent().findParent(BeanEditor.class) != null) {
+ var hierarchicalContext = HierarchicalContext.get();
+ if (hierarchicalContext != null && hierarchicalContext.findData(BeanEditor.class) != null) {
return !getParamSpecs().isEmpty();
} else {
var excludeParamMaps = (List<ParamMap>) EditContext.get().getInputValue("excludeParamMaps");
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.java
index 2bb9a604a7..29af86ad53 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
@@ -10,8 +10,6 @@ import javax.validation.Valid;
import javax.validation.ValidationException;
import javax.validation.constraints.NotEmpty;
-import org.apache.wicket.Component;
-
import io.onedev.server.OneDev;
import io.onedev.server.annotation.ChoiceProvider;
import io.onedev.server.annotation.Editable;
@@ -29,11 +27,10 @@ import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.job.JobService;
import io.onedev.server.model.Build;
import io.onedev.server.service.UserService;
-import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.web.editable.BeanEditor;
-import io.onedev.server.web.util.WicketUtils;
@Editable(name="Run job", order=100)
public class RunJobAction extends PostBuildAction {
@@ -87,8 +84,8 @@ public class RunJobAction extends PostBuildAction {
@SuppressWarnings({ "unused", "unchecked" })
private static boolean isExcludeParamMapsVisible() {
- var componentContext = ComponentContext.get();
- if (componentContext != null && componentContext.getComponent().findParent(BeanEditor.class) != null) {
+ var hierarchicalContext = HierarchicalContext.get();
+ if (hierarchicalContext != null && hierarchicalContext.findData(BeanEditor.class) != null) {
return !getParamSpecs().isEmpty();
} else {
var excludeParamMaps = (List<ParamMap>) EditContext.get().getInputValue("excludeParamMaps");
@@ -99,8 +96,7 @@ public class RunJobAction extends PostBuildAction {
public static List<ParamSpec> getParamSpecs() {
String jobName = (String) EditContext.get().getInputValue("jobName");
if (jobName != null) {
- Component component = ComponentContext.get().getComponent();
- BuildSpecAware buildSpecAware = WicketUtils.findInnermost(component, BuildSpecAware.class);
+ BuildSpecAware buildSpecAware = HierarchicalContext.get().findData(BuildSpecAware.class);
if (buildSpecAware != null) {
BuildSpec buildSpec = buildSpecAware.getBuildSpec();
if (buildSpec != null) {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
index 97ec93dc17..6fc82df429 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
@@ -1,7 +1,23 @@
package io.onedev.server.buildspec.job.trigger;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Function;
+
+import javax.validation.Valid;
+
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.jspecify.annotations.Nullable;
+
import io.onedev.commons.codeassist.InputSuggestion;
-import io.onedev.server.annotation.*;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.OmitName;
+import io.onedev.server.annotation.ParamSpecProvider;
+import io.onedev.server.annotation.Patterns;
+import io.onedev.server.annotation.ShowCondition;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobAware;
import io.onedev.server.buildspec.job.TriggerMatch;
@@ -9,23 +25,11 @@ import io.onedev.server.buildspec.param.instance.ParamInstances;
import io.onedev.server.buildspec.param.instance.ParamMap;
import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.event.project.ProjectEvent;
-import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.EditContext;
-import io.onedev.commons.utils.match.Matcher;
-import io.onedev.commons.utils.match.PathMatcher;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.util.SuggestionUtils;
-import io.onedev.server.web.util.WicketUtils;
-import org.apache.wicket.Component;
-import org.eclipse.jgit.revwalk.RevCommit;
-
-import org.jspecify.annotations.Nullable;
-import javax.validation.Valid;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Function;
@Editable
public abstract class JobTrigger implements Serializable {
@@ -87,8 +91,8 @@ public abstract class JobTrigger implements Serializable {
@SuppressWarnings({ "unused", "unchecked" })
private static boolean isExcludeParamMapsVisible() {
- var componentContext = ComponentContext.get();
- if (componentContext != null && componentContext.getComponent().findParent(BeanEditor.class) != null) {
+ var hierarchicalContext = HierarchicalContext.get();
+ if (hierarchicalContext != null && hierarchicalContext.findData(BeanEditor.class) != null) {
return !getParamSpecs().isEmpty();
} else {
var excludeParamMaps = (List<ParamMap>) EditContext.get().getInputValue("excludeParamMaps");
@@ -97,8 +101,7 @@ public abstract class JobTrigger implements Serializable {
}
public static List<ParamSpec> getParamSpecs() {
- Component component = ComponentContext.get().getComponent();
- JobAware jobAware = WicketUtils.findInnermost(component, JobAware.class);
+ JobAware jobAware = HierarchicalContext.get().findData(JobAware.class);
if (jobAware != null) {
Job job = jobAware.getJob();
if (job != null)
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ParamMap.java b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ParamMap.java
index 0c2ae41fdf..f13e8f49cd 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ParamMap.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/instance/ParamMap.java
@@ -1,5 +1,13 @@
package io.onedev.server.buildspec.param.instance;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.Valid;
+
+import org.apache.wicket.Component;
+
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.OmitName;
import io.onedev.server.annotation.ParamSpecProvider;
@@ -9,17 +17,12 @@ import io.onedev.server.buildspec.job.action.RunJobAction;
import io.onedev.server.buildspec.job.trigger.JobTrigger;
import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.buildspec.step.UseTemplateStep;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.HierarchicalContext;
+import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.buildspec.job.jobdependency.JobDependencyEditPanel;
import io.onedev.server.web.editable.buildspec.job.postbuildaction.PostBuildActionEditPanel;
import io.onedev.server.web.editable.buildspec.job.trigger.JobTriggerEditPanel;
import io.onedev.server.web.util.WicketUtils;
-import org.apache.wicket.Component;
-
-import javax.validation.Valid;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
@Editable
public class ParamMap implements Serializable {
@@ -43,12 +46,12 @@ public class ParamMap implements Serializable {
@SuppressWarnings("unused")
private static List<ParamSpec> getParamSpecs() {
- Component component = ComponentContext.get().getComponent();
- if (WicketUtils.findInnermost(component, JobTriggerEditPanel.class) != null)
+ Component component = HierarchicalContext.get().findData(BeanEditor.class);
+ if (WicketUtils.findSelfOrParent(component, JobTriggerEditPanel.class) != null)
return JobTrigger.getParamSpecs();
- else if (WicketUtils.findInnermost(component, PostBuildActionEditPanel.class) != null)
+ else if (WicketUtils.findSelfOrParent(component, PostBuildActionEditPanel.class) != null)
return RunJobAction.getParamSpecs();
- else if (WicketUtils.findInnermost(component, JobDependencyEditPanel.class) != null)
+ else if (WicketUtils.findSelfOrParent(component, JobDependencyEditPanel.class) != null)
return JobDependency.getParamSpecs();
else
return UseTemplateStep.getParamSpecs();
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.java
index bd880e51af..d8cad06db8 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
@@ -2,20 +2,18 @@ package io.onedev.server.buildspec.param.spec;
import java.util.List;
-import org.jspecify.annotations.Nullable;
import javax.validation.Valid;
-
-import io.onedev.server.annotation.Multiline;
-import org.apache.wicket.Component;
import javax.validation.constraints.NotEmpty;
+import org.jspecify.annotations.Nullable;
+
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.Multiline;
+import io.onedev.server.annotation.ParamName;
import io.onedev.server.buildspec.ParamSpecAware;
import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.buildspecmodel.inputspec.showcondition.ShowCondition;
-import io.onedev.server.util.ComponentContext;
-import io.onedev.server.annotation.ParamName;
-import io.onedev.server.annotation.Editable;
-import io.onedev.server.web.util.WicketUtils;
+import io.onedev.server.util.HierarchicalContext;
@Editable
public abstract class ParamSpec extends InputSpec {
@@ -89,8 +87,8 @@ public abstract class ParamSpec extends InputSpec {
@Nullable
public static List<ParamSpec> list() {
- Component component = ComponentContext.get().getComponent();
- ParamSpecAware paramSpecAware = WicketUtils.findInnermost(component, ParamSpecAware.class);
+ var hierarchicalContext = HierarchicalContext.get();
+ ParamSpecAware paramSpecAware = hierarchicalContext.findData(ParamSpecAware.class);
if (paramSpecAware != null)
return paramSpecAware.getParamSpecs();
else
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.java
index 6f6a793e49..4ae07f57ba 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
@@ -1,8 +1,23 @@
package io.onedev.server.buildspec.step;
+import static io.onedev.server.buildspec.param.ParamUtils.resolveParams;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.k8shelper.Action;
-import io.onedev.server.annotation.*;
+import io.onedev.server.annotation.ChoiceProvider;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.OmitName;
+import io.onedev.server.annotation.ParamSpecProvider;
+import io.onedev.server.annotation.ShowCondition;
+import io.onedev.server.annotation.VariableOption;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.param.ParamCombination;
import io.onedev.server.buildspec.param.ParamUtils;
@@ -11,21 +26,12 @@ import io.onedev.server.buildspec.param.instance.ParamMap;
import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.model.Build;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
-import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.interpolative.JobVariableInterpolator;
import io.onedev.server.web.editable.BeanEditor;
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static io.onedev.server.buildspec.param.ParamUtils.resolveParams;
-
@Editable(order=10000, name="Use Step Template", description="Run specified step template")
public class UseTemplateStep extends CompositeStep {
@@ -81,8 +87,8 @@ public class UseTemplateStep extends CompositeStep {
@SuppressWarnings({ "unused", "unchecked" })
private static boolean isExcludeParamMapsVisible() {
- var componentContext = ComponentContext.get();
- if (componentContext != null && componentContext.getComponent().findParent(BeanEditor.class) != null) {
+ var hierarchicalContext = HierarchicalContext.get();
+ if (hierarchicalContext != null && hierarchicalContext.findData(BeanEditor.class) != null) {
return !getParamSpecs().isEmpty();
} else {
var excludeParamMaps = (List<ParamMap>) EditContext.get().getInputValue("excludeParamMaps");
diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputContext.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputContext.java
index 9dff2482e7..6a5adf8434 100755
--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputContext.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputContext.java
@@ -4,8 +4,7 @@ import java.util.List;
import org.jspecify.annotations.Nullable;
-import io.onedev.server.util.ComponentContext;
-import io.onedev.server.web.util.WicketUtils;
+import io.onedev.server.util.HierarchicalContext;
public interface InputContext {
@@ -16,9 +15,9 @@ public interface InputContext {
@Nullable
public static InputContext get() {
- ComponentContext componentContext = ComponentContext.get();
- if (componentContext != null)
- return WicketUtils.findInnermost(componentContext.getComponent(), InputContext.class);
+ var hierarchicalContext = HierarchicalContext.get();
+ if (hierarchicalContext != null)
+ return hierarchicalContext.findData(InputContext.class);
else
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputSpec.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputSpec.java
index e055ea314e..2f4be06678 100644
--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputSpec.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputSpec.java
@@ -169,15 +169,15 @@ public abstract class InputSpec implements Serializable {
}
private void wrapWithChildContext(StringBuffer buffer, int index, String statement) {
- buffer.append(" ComponentContext context = ComponentContext.get();\n");
+ buffer.append(" HierarchicalContext context = HierarchicalContext.get();\n");
buffer.append(" if (context != null) {\n");
- buffer.append(" ComponentContext childContext = context.getChildContext(\"input" + index + "\");\n");
+ buffer.append(" HierarchicalContext childContext = context.getChildContext(\"input" + index + "\");\n");
buffer.append(" if (childContext != null) {\n");
- buffer.append(" ComponentContext.push(childContext);\n");
+ buffer.append(" HierarchicalContext.push(childContext);\n");
buffer.append(" try {\n");
buffer.append(" " + statement + "\n");
buffer.append(" } finally {\n");
- buffer.append(" ComponentContext.pop();\n");
+ buffer.append(" HierarchicalContext.pop();\n");
buffer.append(" }\n");
buffer.append(" } else {\n");
buffer.append(" " + statement + "\n");
diff --git a/server-core/src/main/java/io/onedev/server/job/JobAuthorizationContext.java b/server-core/src/main/java/io/onedev/server/job/JobAuthorizationContext.java
index 6e65471cd0..bde0770749 100644
--- a/server-core/src/main/java/io/onedev/server/job/JobAuthorizationContext.java
+++ b/server-core/src/main/java/io/onedev/server/job/JobAuthorizationContext.java
@@ -20,8 +20,7 @@ import io.onedev.server.model.support.administration.GroovyScript;
import io.onedev.server.model.support.build.JobSecret;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.service.AccessTokenService;
-import io.onedev.server.util.ComponentContext;
-import io.onedev.server.web.util.WicketUtils;
+import io.onedev.server.util.HierarchicalContext;
public class JobAuthorizationContext {
@@ -125,11 +124,10 @@ public class JobAuthorizationContext {
if (!stack.get().isEmpty()) {
return stack.get().peek();
} else {
- ComponentContext componentContext = ComponentContext.get();
- if (componentContext != null) {
- JobAuthorizationContextAware jobAuthorizationContextAware = WicketUtils.findInnermost(
- componentContext.getComponent(),
- JobAuthorizationContextAware.class);
+ var hierarchicalContext = HierarchicalContext.get();
+ if (hierarchicalContext != null) {
+ JobAuthorizationContextAware jobAuthorizationContextAware = hierarchicalContext.findData(
+ JobAuthorizationContextAware.class);
if (jobAuthorizationContextAware != null)
return jobAuthorizationContextAware.getJobAuthorizationContext();
}
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.java
index 7d6b299e44..05eefad920 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
@@ -96,7 +96,7 @@ import io.onedev.server.search.entity.SortField;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.service.AccessTokenService;
import io.onedev.server.service.BuildService;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.artifact.ArtifactInfo;
import io.onedev.server.util.artifact.DirectoryInfo;
import io.onedev.server.util.criteria.Criteria;
@@ -105,7 +105,6 @@ import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.util.BuildAware;
import io.onedev.server.web.util.TextUtils;
-import io.onedev.server.web.util.WicketUtils;
@Entity
@Table(
@@ -1090,9 +1089,9 @@ public class Build extends ProjectBelonging
if (!stack.get().isEmpty()) {
return stack.get().peek();
} else {
- ComponentContext componentContext = ComponentContext.get();
- if (componentContext != null) {
- BuildAware buildAware = WicketUtils.findInnermost(componentContext.getComponent(), BuildAware.class);
+ var hierarchicalContext = HierarchicalContext.get();
+ if (hierarchicalContext != null) {
+ BuildAware buildAware = hierarchicalContext.findData(BuildAware.class);
if (buildAware != null)
return buildAware.getBuild();
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index 5afb093b5c..b5727f38aa 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -24,7 +24,6 @@ import static java.util.Comparator.comparingInt;
import static java.util.stream.Collectors.toList;
import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
@@ -96,7 +95,7 @@ import io.onedev.server.service.PullRequestService;
import io.onedev.server.service.SettingService;
import io.onedev.server.service.UrlService;
import io.onedev.server.service.UserService;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.facade.IssueFacade;
import io.onedev.server.web.asset.emoji.Emojis;
@@ -104,7 +103,6 @@ import io.onedev.server.web.component.iteration.burndown.BurndownIndicators;
import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.util.IssueAware;
-import io.onedev.server.web.util.WicketUtils;
import io.onedev.server.xodus.CommitInfoService;
import io.onedev.server.xodus.PullRequestInfoService;
import io.onedev.server.xodus.VisitInfoService;
@@ -1096,16 +1094,15 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
public void addMissingFields(Collection<String> fieldNames) {
Project.push(getProject());
try {
- var fieldBean = FieldUtils.getFieldBeanClass().getConstructor().newInstance();
+ Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass();
+ var fieldBean = getFieldBean(fieldBeanClass, true);
+
var existingFieldNames = getFieldNames();
var fieldValues = FieldUtils.getFieldValues(fieldBean, fieldNames);
for (var entry: fieldValues.entrySet()) {
if (!existingFieldNames.contains(entry.getKey()))
setFieldValue(entry.getKey(), entry.getValue());
}
- } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
- | InvocationTargetException | NoSuchMethodException | SecurityException e) {
- throw new RuntimeException(e);
} finally {
Project.pop();
}
@@ -1375,9 +1372,9 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
if (!stack.get().isEmpty()) {
return stack.get().peek();
} else {
- ComponentContext componentContext = ComponentContext.get();
- if (componentContext != null) {
- IssueAware issueAware = WicketUtils.findInnermost(componentContext.getComponent(), IssueAware.class);
+ var hierarchicalContext = HierarchicalContext.get();
+ if (hierarchicalContext != null) {
+ IssueAware issueAware = hierarchicalContext.findData(IssueAware.class);
if (issueAware != null)
return issueAware.getIssue();
}
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.java
index 74f7ba72c2..a186c49053 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
@@ -54,6 +54,7 @@ import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.LastCommitsOfChildren;
import org.eclipse.jgit.revwalk.RevCommit;
+import org.hibernate.ObjectNotFoundException;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.annotations.DynamicUpdate;
@@ -136,7 +137,7 @@ import io.onedev.server.service.PullRequestQueryPersonalizationService;
import io.onedev.server.service.SettingService;
import io.onedev.server.service.UrlService;
import io.onedev.server.service.UserService;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.StatusInfo;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.util.facade.ProjectFacade;
@@ -1730,9 +1731,9 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
} else if (Build.get() != null) {
return Build.get().getProject();
} else {
- ComponentContext componentContext = ComponentContext.get();
- if (componentContext != null) {
- ProjectAware projectAware = WicketUtils.findInnermost(componentContext.getComponent(), ProjectAware.class);
+ var hierarchicalContext = HierarchicalContext.get();
+ if (hierarchicalContext != null) {
+ ProjectAware projectAware = hierarchicalContext.findData(ProjectAware.class);
if (projectAware != null)
return projectAware.getProject();
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index 819f742869..d8bedcbef8 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -8,7 +8,6 @@ import static io.onedev.server.model.PullRequest.PROP_CLOSE_WEEK;
import static io.onedev.server.model.PullRequest.PROP_COMMENT_COUNT;
import static io.onedev.server.model.PullRequest.PROP_CONFUSED_COUNT;
import static io.onedev.server.model.PullRequest.PROP_EYES_COUNT;
-import static io.onedev.server.model.PullRequest.PROP_TICK_COUNT;
import static io.onedev.server.model.PullRequest.PROP_HEART_COUNT;
import static io.onedev.server.model.PullRequest.PROP_SMILE_COUNT;
import static io.onedev.server.model.PullRequest.PROP_STATUS;
@@ -19,6 +18,7 @@ import static io.onedev.server.model.PullRequest.PROP_SUBMIT_WEEK;
import static io.onedev.server.model.PullRequest.PROP_TADA_COUNT;
import static io.onedev.server.model.PullRequest.PROP_THUMBS_DOWN_COUNT;
import static io.onedev.server.model.PullRequest.PROP_THUMBS_UP_COUNT;
+import static io.onedev.server.model.PullRequest.PROP_TICK_COUNT;
import static io.onedev.server.model.PullRequest.PROP_TITLE;
import static io.onedev.server.model.PullRequest.PROP_UUID;
import static io.onedev.server.model.support.TimeGroups.PROP_DAY;
@@ -98,12 +98,11 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.service.PullRequestService;
import io.onedev.server.service.UserService;
import io.onedev.server.util.BranchSemantic;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.util.PullRequestAware;
import io.onedev.server.web.util.TextUtils;
-import io.onedev.server.web.util.WicketUtils;
import io.onedev.server.xodus.VisitInfoService;
@Entity
@@ -1164,10 +1163,9 @@ public class PullRequest extends ProjectBelonging
if (!stack.get().isEmpty()) {
return stack.get().peek();
} else {
- ComponentContext componentContext = ComponentContext.get();
- if (componentContext != null) {
- PullRequestAware pullRequestAware = WicketUtils.findInnermost(
- componentContext.getComponent(), PullRequestAware.class);
+ var hierarchicalContext = HierarchicalContext.get();
+ if (hierarchicalContext != null) {
+ PullRequestAware pullRequestAware = hierarchicalContext.findData(PullRequestAware.class);
if (pullRequestAware != null)
return pullRequestAware.getPullRequest();
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java
index 1c54d0d6a9..1d60ef026e 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java
@@ -12,8 +12,6 @@ import javax.validation.ValidationException;
import org.apache.shiro.authz.UnauthorizedException;
import org.apache.shiro.subject.Subject;
-import org.apache.wicket.Component;
-import org.apache.wicket.MarkupContainer;
import org.apache.wicket.MetaDataKey;
import org.apache.wicket.request.cycle.RequestCycle;
import org.jspecify.annotations.Nullable;
@@ -35,8 +33,9 @@ import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.model.support.issue.field.spec.SecretField;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.service.SettingService;
-import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.Hierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.PropertyDescriptor;
@@ -108,7 +107,7 @@ public class FieldUtils {
}
public static Map<String, Object> getFieldValues(Serializable fieldBean, Collection<String> fieldNames) {
- ComponentContext.push(newBeanComponentContext(new BeanDescriptor(fieldBean.getClass()), fieldBean));
+ HierarchicalContext.push(newHierarchicalContext(new BeanDescriptor(fieldBean.getClass()), fieldBean));
try {
Map<String, Object> fieldValues = new HashMap<>();
BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBean.getClass());
@@ -121,7 +120,7 @@ public class FieldUtils {
return fieldValues;
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
@@ -203,61 +202,75 @@ public class FieldUtils {
public static boolean isFieldVisible(BeanDescriptor beanDescriptor, Serializable fieldBean, String fieldName) {
String propertyName = getPropertyName(beanDescriptor, fieldName);
PropertyDescriptor propertyDescriptor = new PropertyDescriptor(fieldBean.getClass(), propertyName);
- return propertyDescriptor.isPropertyVisible(newPropertyComponentContexts(beanDescriptor, fieldBean), beanDescriptor);
+ return propertyDescriptor.isPropertyVisible(newPropertyHierarchicalContexts(beanDescriptor, fieldBean), beanDescriptor);
}
- public static Map<String, ComponentContext> newPropertyComponentContexts(BeanDescriptor beanDescriptor, Serializable fieldBean) {
- Map<String, ComponentContext> componentContexts = new HashMap<>();
+ public static Map<String, HierarchicalContext> newPropertyHierarchicalContexts(BeanDescriptor beanDescriptor, Serializable fieldBean) {
+ Map<String, HierarchicalContext> hierarchicalContexts = new HashMap<>();
- ComponentContext componentContext = new ComponentContext(newContextComponent(beanDescriptor, fieldBean));
+ HierarchicalContext hierarchicalContext = new HierarchicalContext(newContextHierarchical(beanDescriptor, fieldBean));
for (List<PropertyDescriptor> group: beanDescriptor.getProperties().values()) {
for (PropertyDescriptor property: group)
- componentContexts.put(property.getPropertyName(), componentContext);
+ hierarchicalContexts.put(property.getPropertyName(), hierarchicalContext);
}
- return componentContexts;
+ return hierarchicalContexts;
}
- private static Component newContextComponent(BeanDescriptor beanDescriptor, Serializable fieldBean) {
- class FakeComponent extends MarkupContainer implements InputContext, EditContext {
-
- private static final long serialVersionUID = 1L;
-
- public FakeComponent() {
- super("component");
- }
-
+ private static Hierarchical newContextHierarchical(BeanDescriptor beanDescriptor, Serializable fieldBean) {
+ class BeanHierarchical implements Hierarchical {
+
@Override
- public Object getInputValue(String name) {
- return beanDescriptor.getProperty(name).getPropertyValue(fieldBean);
+ public Hierarchical getParent() {
+ return null;
}
@Override
- public List<String> getInputNames() {
- return getIssueSetting().getFieldNames();
- }
+ public <T> T getData(Class<T> clazz) {
+ if (clazz == InputContext.class) {
+ return clazz.cast(new InputContext() {
- private GlobalIssueSetting getIssueSetting() {
- return OneDev.getInstance(SettingService.class).getIssueSetting();
- }
+ private GlobalIssueSetting getIssueSetting() {
+ return OneDev.getInstance(SettingService.class).getIssueSetting();
+ }
+
+ @Override
+ public List<String> getInputNames() {
+ return getIssueSetting().getFieldNames();
+ }
+
+ @Override
+ public InputSpec getInputSpec(String inputName) {
+ return getIssueSetting().getFieldSpec(inputName);
+ }
- @Override
- public InputSpec getInputSpec(String inputName) {
- return getIssueSetting().getFieldSpec(inputName);
+ });
+ } else if (clazz == EditContext.class) {
+ return clazz.cast(new EditContext() {
+
+ @Override
+ public Object getInputValue(String name) {
+ return beanDescriptor.getProperty(name).getPropertyValue(fieldBean);
+ }
+
+ });
+ } else {
+ return null;
+ }
}
}
- return new FakeComponent();
+ return new BeanHierarchical();
}
- public static ComponentContext newBeanComponentContext(BeanDescriptor beanDescriptor, Serializable fieldBean) {
- return new ComponentContext(newContextComponent(beanDescriptor, fieldBean)) {
+ public static HierarchicalContext newHierarchicalContext(BeanDescriptor beanDescriptor, Serializable fieldBean) {
+ return new HierarchicalContext(newContextHierarchical(beanDescriptor, fieldBean)) {
private static final long serialVersionUID = 1L;
@Override
- public ComponentContext getChildContext(String childName) {
- return new ComponentContext(newContextComponent(beanDescriptor, fieldBean));
+ public HierarchicalContext getChildContext(String childName) {
+ return new HierarchicalContext(newContextHierarchical(beanDescriptor, fieldBean));
}
};
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.java
index 5a67bcd456..8135c1bb5e 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,8 +9,6 @@ import java.util.Set;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
-import org.apache.wicket.MarkupContainer;
-
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.OneDev;
@@ -25,11 +23,12 @@ import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.Spec
import io.onedev.server.buildspecmodel.inputspec.showcondition.ShowCondition;
import io.onedev.server.buildspecmodel.inputspec.showcondition.ValueIsNotAnyOf;
import io.onedev.server.buildspecmodel.inputspec.showcondition.ValueIsOneOf;
-import io.onedev.server.service.SettingService;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.service.SettingService;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.Hierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.usage.Usage;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
@@ -266,37 +265,51 @@ public abstract class FieldSpec extends InputSpec {
if (getShowCondition() != null)
dependencies.add(getShowCondition().getInputName());
- class PropertyComponent extends MarkupContainer implements InputContext, EditContext {
-
- private static final long serialVersionUID = 1L;
-
- public PropertyComponent() {
- super("component");
- }
+ class PropertyHierarchical implements Hierarchical {
@Override
- public List<String> getInputNames() {
- return getIssueSetting().getFieldNames();
+ public Hierarchical getParent() {
+ return null;
}
@Override
- public InputSpec getInputSpec(String inputName) {
- return getIssueSetting().getFieldSpec(inputName);
- }
+ public <T> T getData(Class<T> clazz) {
+ if (clazz == InputContext.class) {
+ return clazz.cast(new InputContext() {
+
+ @Override
+ public List<String> getInputNames() {
+ return getIssueSetting().getFieldNames();
+ }
+
+ @Override
+ public InputSpec getInputSpec(String inputName) {
+ return getIssueSetting().getFieldSpec(inputName);
+ }
+
+ });
+ } else if (clazz == EditContext.class) {
+ return clazz.cast(new EditContext() {
- @Override
- public Object getInputValue(String name) {
- dependencies.add(name);
- return null;
+ @Override
+ public Object getInputValue(String name) {
+ dependencies.add(name);
+ return null;
+ }
+
+ });
+ } else {
+ return null;
+ }
}
}
- ComponentContext.push(new ComponentContext(new PropertyComponent()));
+ HierarchicalContext.push(new HierarchicalContext(new PropertyHierarchical()));
try {
runScripts();
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
return dependencies;
diff --git a/server-core/src/main/java/io/onedev/server/util/ComponentContext.java b/server-core/src/main/java/io/onedev/server/util/ComponentContext.java
deleted file mode 100644
index 3e83f7a7f6..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/ComponentContext.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package io.onedev.server.util;
-
-import java.io.Serializable;
-import java.util.Stack;
-
-import org.jspecify.annotations.Nullable;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.Page;
-
-import io.onedev.server.web.util.WicketUtils;
-
-public class ComponentContext implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private static ThreadLocal<Stack<ComponentContext>> stack = new ThreadLocal<Stack<ComponentContext>>() {
-
- @Override
- protected Stack<ComponentContext> initialValue() {
- return new Stack<ComponentContext>();
- }
-
- };
-
- private Component component;
-
- public ComponentContext(Component component) {
- this.component = component;
- }
-
- public static void push(ComponentContext context) {
- stack.get().push(context);
- }
-
- public static void pop() {
- stack.get().pop();
- }
-
- @Nullable
- public static ComponentContext get() {
- if (!stack.get().isEmpty()) {
- return stack.get().peek();
- } else {
- Page page = WicketUtils.getPage();
- return page!=null? new ComponentContext(page): null;
- }
- }
-
- public Component getComponent() {
- return component;
- }
-
- public ComponentContext getChildContext(String childName) {
- return null;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/ComponentHierarchical.java b/server-core/src/main/java/io/onedev/server/util/ComponentHierarchical.java
new file mode 100644
index 0000000000..fdd39b26ab
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/ComponentHierarchical.java
@@ -0,0 +1,33 @@
+package io.onedev.server.util;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
+
+public class ComponentHierarchical implements Hierarchical {
+
+ private static final long serialVersionUID = 1L;
+
+ private Component component;
+
+ public ComponentHierarchical(Component component) {
+ this.component = component;
+ }
+
+ @Override
+ public Hierarchical getParent() {
+ MarkupContainer parent = component.getParent();
+ if (parent != null) {
+ return new ComponentHierarchical(parent);
+ }
+ return null;
+ }
+
+ @Override
+ public <T> T getData(Class<T> clazz) {
+ if (clazz.isInstance(component)) {
+ return clazz.cast(component);
+ }
+ return null;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/EditContext.java b/server-core/src/main/java/io/onedev/server/util/EditContext.java
index c2ca3f22ed..cf0a649d4a 100644
--- a/server-core/src/main/java/io/onedev/server/util/EditContext.java
+++ b/server-core/src/main/java/io/onedev/server/util/EditContext.java
@@ -7,8 +7,6 @@ import java.util.Stack;
import org.jspecify.annotations.Nullable;
-import io.onedev.server.web.util.WicketUtils;
-
public interface EditContext {
static ThreadLocal<Stack<EditContext>> stack = ThreadLocal.withInitial(Stack::new);
@@ -44,9 +42,9 @@ public interface EditContext {
return list;
}
- ComponentContext componentContext = ComponentContext.get();
- if (componentContext != null)
- return WicketUtils.findParents(componentContext.getComponent(), EditContext.class);
+ HierarchicalContext hierarchicalContext = HierarchicalContext.get();
+ if (hierarchicalContext != null)
+ return hierarchicalContext.findAllData(EditContext.class);
else
return new ArrayList<>();
}
diff --git a/server-core/src/main/java/io/onedev/server/util/Hierarchical.java b/server-core/src/main/java/io/onedev/server/util/Hierarchical.java
new file mode 100644
index 0000000000..974ff3d407
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/Hierarchical.java
@@ -0,0 +1,15 @@
+package io.onedev.server.util;
+
+import java.io.Serializable;
+
+import org.jspecify.annotations.Nullable;
+
+public interface Hierarchical extends Serializable {
+
+ @Nullable
+ Hierarchical getParent();
+
+ @Nullable
+ <T> T getData(Class<T> clazz);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/HierarchicalContext.java b/server-core/src/main/java/io/onedev/server/util/HierarchicalContext.java
new file mode 100644
index 0000000000..5d9aeff11b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/HierarchicalContext.java
@@ -0,0 +1,76 @@
+package io.onedev.server.util;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Stack;
+
+import org.apache.wicket.Page;
+import org.jspecify.annotations.Nullable;
+
+import io.onedev.server.web.util.WicketUtils;
+
+public class HierarchicalContext implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private static ThreadLocal<Stack<HierarchicalContext>> stack = new ThreadLocal<Stack<HierarchicalContext>>() {
+
+ @Override
+ protected Stack<HierarchicalContext> initialValue() {
+ return new Stack<HierarchicalContext>();
+ }
+
+ };
+
+ private Hierarchical hierarchical;
+
+ public HierarchicalContext(Hierarchical hierarchical) {
+ this.hierarchical = hierarchical;
+ }
+
+ public static void push(HierarchicalContext context) {
+ stack.get().push(context);
+ }
+
+ public static void pop() {
+ stack.get().pop();
+ }
+
+ @Nullable
+ public static HierarchicalContext get() {
+ if (!stack.get().isEmpty()) {
+ return stack.get().peek();
+ } else {
+ Page page = WicketUtils.getPage();
+ return page!=null? new HierarchicalContext(new ComponentHierarchical(page)): null;
+ }
+ }
+
+ public Hierarchical getHierarchical() {
+ return hierarchical;
+ }
+
+ public HierarchicalContext getChildContext(String childName) {
+ return null;
+ }
+
+ @Nullable
+ public <T> T findData(Class<T> clazz) {
+ var parents = findAllData(clazz);
+ return parents.isEmpty()? null: parents.get(0);
+ }
+
+ public <T> List<T> findAllData(Class<T> clazz) {
+ List<T> allData = new ArrayList<>();
+ Hierarchical hierarchical = this.hierarchical;
+ while (hierarchical != null) {
+ var data = hierarchical.getData(clazz);
+ if (data != null)
+ allData.add(data);
+ hierarchical = hierarchical.getParent();
+ }
+ return allData;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommit.java b/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommit.java
index 18fdba4a2b..398afdf652 100644
--- a/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommit.java
+++ b/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommit.java
@@ -1,20 +1,20 @@
package io.onedev.server.util;
-import io.onedev.server.OneDev;
-import io.onedev.server.service.ProjectService;
-import io.onedev.server.git.GitUtils;
-import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.util.WicketUtils;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Stack;
+
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
-
import org.jspecify.annotations.Nullable;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Stack;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.model.Project;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.ProjectService;
public class ProjectScopedCommit implements Serializable {
@@ -102,9 +102,9 @@ public class ProjectScopedCommit implements Serializable {
if (!stack.get().isEmpty()) {
return stack.get().peek();
} else {
- ComponentContext componentContext = ComponentContext.get();
- if (componentContext != null) {
- ProjectScopedCommitAware commitAware = WicketUtils.findInnermost(componentContext.getComponent(), ProjectScopedCommitAware.class);
+ HierarchicalContext hierarchicalContext = HierarchicalContext.get();
+ if (hierarchicalContext != null) {
+ ProjectScopedCommitAware commitAware = hierarchicalContext.findData(ProjectScopedCommitAware.class);
if (commitAware != null)
return commitAware.getProjectScopedCommit();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
index 2d07b124cb..edcc6bd104 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
@@ -9,7 +9,6 @@ import static io.onedev.server.model.Issue.NAME_CONFUSED_COUNT;
import static io.onedev.server.model.Issue.NAME_DESCRIPTION;
import static io.onedev.server.model.Issue.NAME_ESTIMATED_TIME;
import static io.onedev.server.model.Issue.NAME_EYES_COUNT;
-import static io.onedev.server.model.Issue.NAME_TICK_COUNT;
import static io.onedev.server.model.Issue.NAME_HEART_COUNT;
import static io.onedev.server.model.Issue.NAME_LAST_ACTIVITY_DATE;
import static io.onedev.server.model.Issue.NAME_PROGRESS;
@@ -21,6 +20,7 @@ import static io.onedev.server.model.Issue.NAME_SUBMIT_DATE;
import static io.onedev.server.model.Issue.NAME_TADA_COUNT;
import static io.onedev.server.model.Issue.NAME_THUMBS_DOWN_COUNT;
import static io.onedev.server.model.Issue.NAME_THUMBS_UP_COUNT;
+import static io.onedev.server.model.Issue.NAME_TICK_COUNT;
import static io.onedev.server.model.Issue.NAME_TITLE;
import static io.onedev.server.model.Issue.NAME_VOTE_COUNT;
import static io.onedev.server.model.Issue.QUERY_FIELDS;
@@ -101,11 +101,12 @@ import io.onedev.server.search.entity.project.ProjectQuery;
import io.onedev.server.service.GroupService;
import io.onedev.server.service.LinkSpecService;
import io.onedev.server.service.SettingService;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ComponentHierarchical;
import io.onedev.server.util.DateUtils;
-import io.onedev.server.web.behavior.inputassist.NaturalLanguageTranslator;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
+import io.onedev.server.web.behavior.inputassist.NaturalLanguageTranslator;
import io.onedev.server.web.util.SuggestionUtils;
import io.onedev.server.web.util.WicketUtils;
@@ -285,13 +286,13 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
.collect(Collectors.toList());
return SuggestionUtils.suggest(candidates, matchWith);
} else if (fieldSpec instanceof ChoiceField) {
- ComponentContext.push(new ComponentContext(getComponent()));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(getComponent())));
try {
List<String> candidates = new ArrayList<>(((ChoiceField)fieldSpec)
.getChoiceProvider().getChoices(true).keySet());
return SuggestionUtils.suggest(candidates, matchWith);
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
} else if (fieldName.equals(NAME_NUMBER)) {
return SuggestionUtils.suggestNumber(matchWith, _T("find by number"), false);
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java
index a3559ab958..e1f20bb0fd 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java
@@ -36,7 +36,8 @@ import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.LinearRange;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.exception.ExceptionUtils;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.RangeUtils;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.floating.AlignPlacement;
@@ -164,7 +165,7 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {
if (inputCaret != -1) {
InputStatus inputStatus = new InputStatus(inputContent, inputCaret);
List<InputCompletion> suggestions = new ArrayList<>();
- ComponentContext.push(new ComponentContext(getComponent()));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(getComponent())));
try {
for (InputCompletion suggestion: getSuggestions(new InputStatus(inputContent, inputCaret))) {
suggestions.add(suggestion);
@@ -172,7 +173,7 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {
break;
}
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
if (!suggestions.isEmpty()) {
boolean hasOtherSuggestions = false;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
index eeeca91932..2756893d8d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
@@ -9,8 +9,6 @@ import java.util.Map;
import javax.inject.Inject;
-import org.jspecify.annotations.Nullable;
-
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -28,6 +26,7 @@ import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.ObjectId;
+import org.jspecify.annotations.Nullable;
import org.unbescape.html.HtmlEscape;
import io.onedev.server.buildspecmodel.inputspec.Input;
@@ -35,13 +34,6 @@ import io.onedev.server.buildspecmodel.inputspec.InputContext;
import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.buildspecmodel.inputspec.SecretInput;
import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.ChoiceProvider;
-import io.onedev.server.service.BuildService;
-import io.onedev.server.service.IssueChangeService;
-import io.onedev.server.service.IssueService;
-import io.onedev.server.service.IterationService;
-import io.onedev.server.service.PullRequestService;
-import io.onedev.server.service.SettingService;
-import io.onedev.server.service.UserService;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
@@ -55,10 +47,18 @@ import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.model.support.issue.field.spec.TextField;
import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.BuildService;
+import io.onedev.server.service.IssueChangeService;
+import io.onedev.server.service.IssueService;
+import io.onedev.server.service.IterationService;
+import io.onedev.server.service.PullRequestService;
+import io.onedev.server.service.SettingService;
+import io.onedev.server.service.UserService;
import io.onedev.server.util.ColorUtils;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ComponentHierarchical;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;
import io.onedev.server.web.ajaxlistener.DisableGlobalAjaxIndicatorListener;
import io.onedev.server.web.component.MultilineLabel;
@@ -350,7 +350,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext, Pro
if (fieldSpec != null && fieldSpec instanceof ChoiceField) {
ChoiceProvider choiceProvider = ((ChoiceField)fieldSpec).getChoiceProvider();
- ComponentContext.push(new ComponentContext(this));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(this)));
try {
String backgroundColor = choiceProvider.getChoices(false).get(value);
if (backgroundColor == null)
@@ -362,7 +362,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext, Pro
label.add(AttributeAppender.append("style", style));
label.add(AttributeAppender.append("class", "badge"));
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
valueContainer.add(label);
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.java
index 3fbe4c824f..b017545dd7 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
@@ -14,11 +14,12 @@ import io.onedev.server.annotation.ChoiceProvider;
import io.onedev.server.annotation.DependsOn;
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.OmitName;
-import io.onedev.server.service.SettingService;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.service.SettingService;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.web.component.issue.workflowreconcile.WorkflowReconcilePanel.UndefinedFieldValueContainer;
@Editable
@@ -58,15 +59,14 @@ public class UndefinedFieldValueResolution implements Serializable {
@SuppressWarnings("unused")
private static List<String> getValueChoices() {
- UndefinedFieldValueContainer container = ComponentContext.get().getComponent()
- .findParent(UndefinedFieldValueContainer.class);
+ UndefinedFieldValueContainer container = HierarchicalContext.get().findData(UndefinedFieldValueContainer.class);
GlobalIssueSetting issueSetting = OneDev.getInstance(SettingService.class).getIssueSetting();
FieldSpec fieldSpec = Preconditions.checkNotNull(issueSetting.getFieldSpec(container.getFieldName()));
- ComponentContext.push(new ComponentContext(container));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(container)));
try {
return new ArrayList<>(((ChoiceField)fieldSpec).getChoiceProvider().getChoices(true).keySet());
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
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.java
index 7a139d252d..4f40b6553b 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,8 +1,29 @@
package io.onedev.server.web.component.job;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.html.basic.Label;
+import org.eclipse.jgit.lib.ObjectId;
+import org.jspecify.annotations.Nullable;
+
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
+
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.param.ParamUtils;
@@ -15,27 +36,12 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.web.component.modal.message.MessageModal;
import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;
import io.onedev.server.xodus.CommitInfoService;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.markup.html.basic.Label;
-import org.eclipse.jgit.lib.ObjectId;
-
-import org.jspecify.annotations.Nullable;
-
-import static io.onedev.server.web.translation.Translation._T;
-
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
public abstract class RunJobLink extends AjaxLink<Void> implements JobAuthorizationContextAware {
@@ -66,7 +72,7 @@ public abstract class RunJobLink extends AjaxLink<Void> implements JobAuthorizat
@Override
public void onClick(AjaxRequestTarget target) {
- ComponentContext.push(new ComponentContext(this));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(this)));
try {
BuildSpec buildSpec = Preconditions.checkNotNull(getProject().getBuildSpec(commitId));
@@ -165,7 +171,7 @@ public abstract class RunJobLink extends AjaxLink<Void> implements JobAuthorizat
};
}
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/polymorphiceditor/PolymorphicEditor.java b/server-core/src/main/java/io/onedev/server/web/component/polymorphiceditor/PolymorphicEditor.java
index cf68e36db0..763a068812 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/polymorphiceditor/PolymorphicEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/polymorphiceditor/PolymorphicEditor.java
@@ -8,8 +8,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.jspecify.annotations.Nullable;
-
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
@@ -23,13 +21,15 @@ import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.util.convert.ConversionException;
+import org.jspecify.annotations.Nullable;
import com.google.common.base.Preconditions;
import io.onedev.commons.loader.AppLoader;
import io.onedev.commons.loader.ImplementationRegistry;
import io.onedev.server.annotation.ImplementationProvider;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.Path;
import io.onedev.server.util.PathNode;
import io.onedev.server.util.ReflectionUtils;
@@ -136,7 +136,7 @@ public class PolymorphicEditor extends ValueEditor<Serializable> {
@Override
protected String getNullValidDisplayValue() {
- ComponentContext.push(new ComponentContext(PolymorphicEditor.this));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(PolymorphicEditor.this)));
try {
String placeholder = getNullValidPlaceholder();
if (placeholder != null)
@@ -144,7 +144,7 @@ public class PolymorphicEditor extends ValueEditor<Serializable> {
else
return super.getNullValidDisplayValue();
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/Settings.java b/server-core/src/main/java/io/onedev/server/web/component/select2/Settings.java
index fda7dff371..ab9e85737c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/select2/Settings.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/Settings.java
@@ -12,19 +12,21 @@
*/
package io.onedev.server.web.component.select2;
-import io.onedev.server.annotation.OmitName;
-import io.onedev.server.util.ComponentContext;
-import io.onedev.server.web.component.select2.json.Json;
-import io.onedev.server.web.editable.EditableUtils;
-import io.onedev.server.web.editable.PropertyDescriptor;
-import org.json.JSONException;
-import org.json.JSONStringer;
-
import static io.onedev.server.web.translation.Translation._T;
import java.io.Serializable;
import java.lang.reflect.Method;
+import org.json.JSONException;
+import org.json.JSONStringer;
+
+import io.onedev.server.annotation.OmitName;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
+import io.onedev.server.web.component.select2.json.Json;
+import io.onedev.server.web.editable.EditableUtils;
+import io.onedev.server.web.editable.PropertyDescriptor;
+
/**
* Select2 settings. Refer to the Select2 documentation for what these options
* mean.
@@ -413,7 +415,7 @@ public final class Settings implements Serializable {
}
public void configurePlaceholder(PropertyDescriptor propertyDescriptor) {
- ComponentContext.push(new ComponentContext(select2));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(select2)));
try {
Method propertyGetter = propertyDescriptor.getPropertyGetter();
String placeholder = EditableUtils.getPlaceholder(propertyGetter);
@@ -428,7 +430,7 @@ public final class Settings implements Serializable {
setPlaceholder(_T(propertyDescriptor.getDisplayName()));
}
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenAuthorizationBean.java b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenAuthorizationBean.java
index dfa1bfb09a..47045383a1 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenAuthorizationBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenAuthorizationBean.java
@@ -15,9 +15,8 @@ import io.onedev.server.annotation.RoleChoice;
import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ManageProject;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.web.util.UserAware;
-import io.onedev.server.web.util.WicketUtils;
@Editable
public class AccessTokenAuthorizationBean implements Serializable {
@@ -41,7 +40,7 @@ public class AccessTokenAuthorizationBean implements Serializable {
@SuppressWarnings("unused")
private static List<Project> getManageableProjects() {
- var user = WicketUtils.findInnermost(ComponentContext.get().getComponent(), UserAware.class).getUser();
+ var user = HierarchicalContext.get().findData(UserAware.class).getUser();
var projects = new ArrayList<>(SecurityUtils.getAuthorizedProjects(user.asSubject(), new ManageProject()));
projects.sort(comparing(Project::getPath));
return projects;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
index f501a9c384..d99ad00d83 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
@@ -36,8 +36,9 @@ import io.onedev.commons.loader.AppLoader;
import io.onedev.server.annotation.OmitName;
import io.onedev.server.annotation.Shallow;
import io.onedev.server.annotation.SubscriptionRequired;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ComponentHierarchical;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.Path;
import io.onedev.server.util.PathNode;
import io.onedev.server.util.PathNode.Named;
@@ -52,7 +53,7 @@ public class BeanEditor extends ValueEditor<Serializable> {
private RepeatingView groupsView;
- private final Map<String, ComponentContext> componentContexts = new HashMap<>();
+ private final Map<String, HierarchicalContext> hierarchicalContexts = new HashMap<>();
public BeanEditor(String id, BeanDescriptor descriptor, IModel<Serializable> model) {
super(id, model);
@@ -116,8 +117,8 @@ public class BeanEditor extends ValueEditor<Serializable> {
PropertyContainer newPropertyContainer =
newPropertyContainer(propertyContainer.getId(), propertyContext);
propertyContainer.replaceWith(newPropertyContainer);
- componentContexts.put(propertyContext.getPropertyName(),
- new ComponentContext(newPropertyContainer));
+ hierarchicalContexts.put(propertyContext.getPropertyName(),
+ new HierarchicalContext(new ComponentHierarchical(newPropertyContainer)));
propertyUpdating.getHandler().add(newPropertyContainer);
String script = String.format("$('#%s').addClass('no-autofocus');",
newPropertyContainer.getMarkupId());
@@ -168,13 +169,13 @@ public class BeanEditor extends ValueEditor<Serializable> {
Serializable propertyValue;
- ComponentContext context = new ComponentContext(this);
+ HierarchicalContext context = new HierarchicalContext(new ComponentHierarchical(this));
- ComponentContext.push(context);
+ HierarchicalContext.push(context);
try {
propertyValue = (Serializable) property.getDescriptor().getPropertyValue(getModelObject());
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
PropertyEditor<Serializable> propertyEditor = property.renderForEdit("value", Model.of(propertyValue));
add(propertyEditor);
@@ -232,7 +233,7 @@ public class BeanEditor extends ValueEditor<Serializable> {
protected void onConfigure() {
super.onConfigure();
setVisible(!property.isPropertyExcluded()
- && property.isPropertyVisible(componentContexts, descriptor));
+ && property.isPropertyVisible(hierarchicalContexts, descriptor));
}
};
@@ -282,7 +283,7 @@ public class BeanEditor extends ValueEditor<Serializable> {
for (PropertyContext<Serializable> property: entry.getValue()) {
PropertyContainer propertyContainer = newPropertyContainer(propertiesView.newChildId(), property);
propertiesView.add(propertyContainer);
- componentContexts.put(property.getPropertyName(), new ComponentContext(propertyContainer));
+ hierarchicalContexts.put(property.getPropertyName(), new HierarchicalContext(new ComponentHierarchical(propertyContainer)));
}
if (entry.getKey().length() == 0) {
@@ -293,13 +294,13 @@ public class BeanEditor extends ValueEditor<Serializable> {
}
add(validatable -> {
- ComponentContext.push(newComponentContext());
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(this)));
try {
Validator validator = AppLoader.getInstance(Validator.class, Shallow.class);
for (var violation : validator.validate(validatable.getValue()))
error(new Path(violation.getPropertyPath()), violation.getMessage());
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
});
@@ -349,18 +350,18 @@ public class BeanEditor extends ValueEditor<Serializable> {
return bean;
}
- public ComponentContext newComponentContext() {
- return new ComponentContext(this) {
+ public HierarchicalContext newHierarchicalContext() {
+ return new HierarchicalContext(new ComponentHierarchical(this)) {
@Override
- public ComponentContext getChildContext(String childName) {
+ public HierarchicalContext getChildContext(String childName) {
for (Component groupContainer: groupsView) {
RepeatingView propertiesView = (RepeatingView) groupContainer.get("properties");
for (Component item: propertiesView) {
@SuppressWarnings("unchecked")
PropertyContext<Serializable> propertyContext = (PropertyContext<Serializable>) item.getDefaultModelObject();
if (propertyContext.getPropertyName().equals(childName))
- return new ComponentContext(item);
+ return new HierarchicalContext(new ComponentHierarchical(item));
}
}
return null;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.java
index 4d7b0d0890..e6561a8cb4 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.java
@@ -22,9 +22,10 @@ import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import io.onedev.server.util.EditContext;
-import io.onedev.server.util.ComponentContext;
import io.onedev.server.annotation.OmitName;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.EditContext;
+import io.onedev.server.util.HierarchicalContext;
public class BeanViewer extends Panel {
@@ -47,7 +48,7 @@ public class BeanViewer extends Panel {
protected void onInitialize() {
super.onInitialize();
- Map<String, ComponentContext> componentContexts = new HashMap<>();
+ Map<String, HierarchicalContext> hierarchicalContexts = new HashMap<>();
RepeatingView groupsView = new RepeatingView("groups");
for (Map.Entry<String, List<PropertyContext<Serializable>>> entry: properties.entrySet()) {
WebMarkupContainer groupContainer = new WebMarkupContainer(groupsView.newChildId());
@@ -85,12 +86,12 @@ public class BeanViewer extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(property.isPropertyVisible(componentContexts, descriptor) && !property.isPropertyExcluded());
+ setVisible(property.isPropertyVisible(hierarchicalContexts, descriptor) && !property.isPropertyExcluded());
}
};
propertiesView.add(propertyContainer);
- componentContexts.put(property.getPropertyName(), new ComponentContext(propertyContainer));
+ hierarchicalContexts.put(property.getPropertyName(), new HierarchicalContext(new ComponentHierarchical(propertyContainer)));
Method propertyGetter = property.getPropertyGetter();
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/EmptyValueLabel.java b/server-core/src/main/java/io/onedev/server/web/editable/EmptyValueLabel.java
index 056338d992..df0fadbfa8 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/EmptyValueLabel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/EmptyValueLabel.java
@@ -8,7 +8,8 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.LoadableDetachableModel;
import org.unbescape.html.HtmlEscape;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
public abstract class EmptyValueLabel extends Label {
@@ -19,7 +20,7 @@ public abstract class EmptyValueLabel extends Label {
@Override
protected String load() {
- ComponentContext.push(new ComponentContext(EmptyValueLabel.this));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(EmptyValueLabel.this)));
try {
String placeholder = EditableUtils.getPlaceholder(getElement());
if (placeholder != null && EditableUtils.isDisplayPlaceholderAsValue(getElement()))
@@ -27,7 +28,7 @@ public abstract class EmptyValueLabel extends Label {
else
return "<i>" + _T("Unspecified") + "</i>";
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyContext.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyContext.java
index 071b580868..065b752197 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyContext.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyContext.java
@@ -1,18 +1,20 @@
package io.onedev.server.web.editable;
-import com.google.common.collect.Lists;
-import io.onedev.commons.loader.AppLoader;
-import io.onedev.server.util.ComponentContext;
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Map;
+
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.hibernate.proxy.HibernateProxyHelper;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Map;
+import com.google.common.collect.Lists;
+
+import io.onedev.commons.loader.AppLoader;
+import io.onedev.server.util.HierarchicalContext;
public abstract class PropertyContext<T> implements Serializable {
@@ -144,8 +146,8 @@ public abstract class PropertyContext<T> implements Serializable {
return descriptor.isPropertyRequired();
}
- public boolean isPropertyVisible(Map<String, ComponentContext> componentContexts, BeanDescriptor beanDescriptor) {
- return descriptor.isPropertyVisible(componentContexts, beanDescriptor);
+ public boolean isPropertyVisible(Map<String, HierarchicalContext> hierarchicalContexts, BeanDescriptor beanDescriptor) {
+ return descriptor.isPropertyVisible(hierarchicalContexts, beanDescriptor);
}
}
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.java
index c6717d31e7..6b2c68e9a0 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
@@ -8,11 +8,12 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.jspecify.annotations.Nullable;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
+import org.jspecify.annotations.Nullable;
+
import com.google.common.collect.Sets;
import io.onedev.commons.utils.ExplicitException;
@@ -20,9 +21,9 @@ import io.onedev.server.annotation.DependsOn;
import io.onedev.server.annotation.ShowCondition;
import io.onedev.server.annotation.SubscriptionRequired;
import io.onedev.server.util.BeanUtils;
-import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.DependsOnUtils;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.ReflectionUtils;
public class PropertyDescriptor implements Serializable {
@@ -144,22 +145,22 @@ public class PropertyDescriptor implements Serializable {
return null;
}
- public boolean isPropertyVisible(Map<String, ComponentContext> componentContexts, BeanDescriptor beanDescriptor) {
- return isPropertyVisible(componentContexts, beanDescriptor, Sets.newHashSet());
+ public boolean isPropertyVisible(Map<String, HierarchicalContext> hierarchicalContexts, BeanDescriptor beanDescriptor) {
+ return isPropertyVisible(hierarchicalContexts, beanDescriptor, Sets.newHashSet());
}
public boolean isSubscriptionRequired() {
return getPropertyGetter().getAnnotation(SubscriptionRequired.class) != null;
}
- private boolean isPropertyVisible(Map<String, ComponentContext> componentContexts, BeanDescriptor beanDescriptor, Set<String> checkedPropertyNames) {
+ private boolean isPropertyVisible(Map<String, HierarchicalContext> hierarchicalContexts, BeanDescriptor beanDescriptor, Set<String> checkedPropertyNames) {
if (!checkedPropertyNames.add(getPropertyName()))
return false;
Set<String> prevDependencyPropertyNames = new HashSet<>(getDependencyPropertyNames());
- var componentContext = componentContexts.get(getPropertyName());
- if (componentContext != null)
- ComponentContext.push(componentContext);
+ var hierarchicalContext = hierarchicalContexts.get(getPropertyName());
+ if (hierarchicalContext != null)
+ HierarchicalContext.push(hierarchicalContext);
try {
/*
* Sometimes, the dependency may include properties introduced while evaluating available choices
@@ -183,14 +184,14 @@ public class PropertyDescriptor implements Serializable {
getDependencyPropertyNames().remove(getPropertyName());
for (String dependencyPropertyName: getDependencyPropertyNames()) {
Set<String> copyOfCheckedPropertyNames = new HashSet<>(checkedPropertyNames);
- if (!beanDescriptor.getProperty(dependencyPropertyName).isPropertyVisible(componentContexts, beanDescriptor, copyOfCheckedPropertyNames))
+ if (!beanDescriptor.getProperty(dependencyPropertyName).isPropertyVisible(hierarchicalContexts, beanDescriptor, copyOfCheckedPropertyNames))
return false;
}
return true;
} finally {
getDependencyPropertyNames().addAll(prevDependencyPropertyNames);
- if (componentContext != null)
- ComponentContext.pop();
+ if (hierarchicalContext != null)
+ HierarchicalContext.pop();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
index 18dd63a0cb..dffa3bdbc2 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
@@ -23,7 +23,8 @@ import org.jspecify.annotations.Nullable;
import io.onedev.commons.loader.AppLoader;
import io.onedev.server.annotation.OmitName;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.web.util.WicketUtils;
public abstract class PropertyEditor<T> extends ValueEditor<T> {
@@ -41,7 +42,7 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {
super.onInitialize();
add((INullAcceptingValidator<T>) validatable -> {
- ComponentContext.push(new ComponentContext(PropertyEditor.this));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(PropertyEditor.this)));
try {
Validator validator = AppLoader.getInstance(Validator.class);
Set<?> violations = validator.validateValue(
@@ -51,7 +52,7 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {
error(_T(violation.getMessage()));
}
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
});
@@ -125,7 +126,7 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {
@Override
protected String load() {
- ComponentContext.push(new ComponentContext(PropertyEditor.this));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(PropertyEditor.this)));
try {
Method getter = descriptor.getPropertyGetter();
@@ -137,7 +138,7 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {
else
return "";
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/blobchoice/BlobChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/blobchoice/BlobChoiceEditor.java
index 3d39c49f4a..90113385c0 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/blobchoice/BlobChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/blobchoice/BlobChoiceEditor.java
@@ -5,17 +5,18 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.util.convert.ConversionException;
+import io.onedev.commons.utils.match.PathMatcher;
+import io.onedev.server.annotation.BlobChoice;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.BlobIdentFilter;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.ReflectionUtils;
-import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.component.blob.BlobPicker;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.annotation.BlobChoice;
public class BlobChoiceEditor extends PropertyEditor<String> {
@@ -23,13 +24,13 @@ public class BlobChoiceEditor extends PropertyEditor<String> {
@Override
protected ProjectScopedCommit load() {
- ComponentContext.push(new ComponentContext(BlobChoiceEditor.this));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(BlobChoiceEditor.this)));
try {
BlobChoice blobChoice = descriptor.getPropertyGetter().getAnnotation(BlobChoice.class);
return (ProjectScopedCommit) ReflectionUtils.invokeStaticMethod(
descriptor.getBeanClass(), blobChoice.commitProvider());
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
@@ -39,12 +40,12 @@ public class BlobChoiceEditor extends PropertyEditor<String> {
@Override
protected PatternSet load() {
- ComponentContext.push(new ComponentContext(BlobChoiceEditor.this));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(BlobChoiceEditor.this)));
try {
BlobChoice blobChoice = descriptor.getPropertyGetter().getAnnotation(BlobChoice.class);
return PatternSet.parse(blobChoice.patterns());
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMapEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMapEditPanel.java
index 8461c607c4..238be0d911 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMapEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMapEditPanel.java
@@ -1,21 +1,15 @@
package io.onedev.server.web.editable.buildspec.param.instance;
-import com.google.common.collect.Lists;
-import io.onedev.commons.codeassist.InputSuggestion;
-import io.onedev.server.annotation.ParamSpecProvider;
-import io.onedev.server.annotation.Password;
-import io.onedev.server.annotation.VariableOption;
-import io.onedev.server.buildspec.BuildSpec;
-import io.onedev.server.buildspec.param.ParamUtils;
-import io.onedev.server.buildspec.param.instance.*;
-import io.onedev.server.buildspec.param.spec.ParamSpec;
-import io.onedev.server.buildspec.param.spec.SecretParam;
-import io.onedev.server.util.ComponentContext;
-import io.onedev.server.util.ReflectionUtils;
-import io.onedev.server.web.behavior.InterpolativeAssistBehavior;
-import io.onedev.server.web.editable.*;
-import io.onedev.server.web.editable.buildspec.job.trigger.JobTriggerEditPanel;
-import io.onedev.server.web.editable.string.StringPropertyEditor;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
@@ -32,11 +26,33 @@ import org.apache.wicket.util.convert.ConversionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
+import com.google.common.collect.Lists;
-import static com.google.common.base.Preconditions.checkNotNull;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.server.annotation.ParamSpecProvider;
+import io.onedev.server.annotation.Password;
+import io.onedev.server.annotation.VariableOption;
+import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.param.ParamUtils;
+import io.onedev.server.buildspec.param.instance.IgnoreValue;
+import io.onedev.server.buildspec.param.instance.ParamInstance;
+import io.onedev.server.buildspec.param.instance.PassthroughValue;
+import io.onedev.server.buildspec.param.instance.ScriptingValue;
+import io.onedev.server.buildspec.param.instance.SpecifiedValue;
+import io.onedev.server.buildspec.param.instance.ValueProvider;
+import io.onedev.server.buildspec.param.spec.ParamSpec;
+import io.onedev.server.buildspec.param.spec.SecretParam;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
+import io.onedev.server.util.ReflectionUtils;
+import io.onedev.server.web.behavior.InterpolativeAssistBehavior;
+import io.onedev.server.web.editable.BeanDescriptor;
+import io.onedev.server.web.editable.JobSecretEditBean;
+import io.onedev.server.web.editable.PropertyContext;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.buildspec.job.trigger.JobTriggerEditPanel;
+import io.onedev.server.web.editable.string.StringPropertyEditor;
class ParamMapEditPanel extends PropertyEditor<List<Serializable>> {
@@ -79,7 +95,7 @@ class ParamMapEditPanel extends PropertyEditor<List<Serializable>> {
@SuppressWarnings("unchecked")
private Map<String, ParamSpec> getParamSpecs() {
if (paramSpecs == null) {
- ComponentContext.push(new ComponentContext(this));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(this)));
paramSpecs = new LinkedHashMap<>();
try {
for (ParamSpec paramSpec: (List<ParamSpec>) ReflectionUtils.invokeStaticMethod(
@@ -87,7 +103,7 @@ class ParamMapEditPanel extends PropertyEditor<List<Serializable>> {
paramSpecs.put(paramSpec.getName(), paramSpec);
}
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
return paramSpecs;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMatrixEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMatrixEditPanel.java
index 98782b2645..8794bf3d35 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMatrixEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/instance/ParamMatrixEditPanel.java
@@ -1,22 +1,17 @@
package io.onedev.server.web.editable.buildspec.param.instance;
-import com.google.common.collect.Lists;
-import io.onedev.commons.codeassist.InputSuggestion;
-import io.onedev.server.annotation.ParamSpecProvider;
-import io.onedev.server.annotation.Password;
-import io.onedev.server.annotation.VariableOption;
-import io.onedev.server.buildspec.BuildSpec;
-import io.onedev.server.buildspec.job.Job;
-import io.onedev.server.buildspec.param.ParamUtils;
-import io.onedev.server.buildspec.param.instance.*;
-import io.onedev.server.buildspec.param.spec.ParamSpec;
-import io.onedev.server.buildspec.param.spec.SecretParam;
-import io.onedev.server.util.ComponentContext;
-import io.onedev.server.util.ReflectionUtils;
-import io.onedev.server.web.behavior.InterpolativeAssistBehavior;
-import io.onedev.server.web.editable.*;
-import io.onedev.server.web.editable.buildspec.job.trigger.JobTriggerEditPanel;
-import io.onedev.server.web.editable.string.StringPropertyEditor;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.validation.ValidationException;
+
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
@@ -35,12 +30,34 @@ import org.apache.wicket.util.convert.ConversionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.validation.ValidationException;
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
+import com.google.common.collect.Lists;
-import static com.google.common.base.Preconditions.checkNotNull;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.server.annotation.ParamSpecProvider;
+import io.onedev.server.annotation.Password;
+import io.onedev.server.annotation.VariableOption;
+import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.param.ParamUtils;
+import io.onedev.server.buildspec.param.instance.IgnoreValues;
+import io.onedev.server.buildspec.param.instance.ParamInstances;
+import io.onedev.server.buildspec.param.instance.PassthroughValues;
+import io.onedev.server.buildspec.param.instance.ScriptingValues;
+import io.onedev.server.buildspec.param.instance.SpecifiedValues;
+import io.onedev.server.buildspec.param.instance.ValuesProvider;
+import io.onedev.server.buildspec.param.spec.ParamSpec;
+import io.onedev.server.buildspec.param.spec.SecretParam;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
+import io.onedev.server.util.ReflectionUtils;
+import io.onedev.server.web.behavior.InterpolativeAssistBehavior;
+import io.onedev.server.web.editable.BeanDescriptor;
+import io.onedev.server.web.editable.JobSecretEditBean;
+import io.onedev.server.web.editable.PropertyContext;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.buildspec.job.trigger.JobTriggerEditPanel;
+import io.onedev.server.web.editable.string.StringPropertyEditor;
class ParamMatrixEditPanel extends PropertyEditor<List<Serializable>> {
@@ -83,7 +100,7 @@ class ParamMatrixEditPanel extends PropertyEditor<List<Serializable>> {
@SuppressWarnings("unchecked")
private Map<String, ParamSpec> getParamSpecs() {
if (paramSpecs == null) {
- ComponentContext.push(new ComponentContext(this));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(this)));
paramSpecs = new LinkedHashMap<>();
try {
for (ParamSpec paramSpec: (List<ParamSpec>) ReflectionUtils.invokeStaticMethod(
@@ -91,7 +108,7 @@ class ParamMatrixEditPanel extends PropertyEditor<List<Serializable>> {
paramSpecs.put(paramSpec.getName(), paramSpec);
}
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
return paramSpecs;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java
index f5c28a03ce..f499951787 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java
@@ -18,7 +18,8 @@ import org.apache.wicket.util.convert.ConversionException;
import com.google.common.base.Preconditions;
import io.onedev.server.annotation.ChoiceProvider;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.ReflectionUtils;
import io.onedev.server.web.component.select2.Select2MultiChoice;
import io.onedev.server.web.component.stringchoice.StringMultiChoice;
@@ -46,12 +47,12 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {
@Override
protected List<String> load() {
- ComponentContext componentContext = new ComponentContext(MultiChoiceEditor.this);
- ComponentContext.push(componentContext);
+ HierarchicalContext hierarchicalContext = new HierarchicalContext(new ComponentHierarchical(MultiChoiceEditor.this));
+ HierarchicalContext.push(hierarchicalContext);
try {
return (List<String>) ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), getChoiceProvider().value());
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
@@ -61,13 +62,13 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {
@Override
protected Map<String, String> load() {
- ComponentContext componentContext = new ComponentContext(MultiChoiceEditor.this);
+ HierarchicalContext hierarchicalContext = new HierarchicalContext(new ComponentHierarchical(MultiChoiceEditor.this));
if (getChoiceProvider().displayNames().length() != 0) {
- ComponentContext.push(componentContext);
+ HierarchicalContext.push(hierarchicalContext);
try {
return (Map<String, String>) ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), getChoiceProvider().displayNames());
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
} else {
return new HashMap<>();
@@ -80,13 +81,13 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {
@Override
protected Map<String, String> load() {
- ComponentContext componentContext = new ComponentContext(MultiChoiceEditor.this);
+ HierarchicalContext hierarchicalContext = new HierarchicalContext(new ComponentHierarchical(MultiChoiceEditor.this));
if (getChoiceProvider().descriptions().length() != 0) {
- ComponentContext.push(componentContext);
+ HierarchicalContext.push(hierarchicalContext);
try {
return (Map<String, String>) ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), getChoiceProvider().descriptions());
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
} else {
return new HashMap<>();
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java
index de5d46edba..47a2c4c636 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java
@@ -17,7 +17,8 @@ import org.apache.wicket.util.convert.ConversionException;
import com.google.common.base.Preconditions;
import io.onedev.server.annotation.ChoiceProvider;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.ReflectionUtils;
import io.onedev.server.web.component.stringchoice.StringSingleChoice;
import io.onedev.server.web.editable.PropertyDescriptor;
@@ -44,12 +45,12 @@ public class SingleChoiceEditor extends PropertyEditor<String> {
@Override
protected List<String> load() {
- ComponentContext componentContext = new ComponentContext(SingleChoiceEditor.this);
- ComponentContext.push(componentContext);
+ HierarchicalContext hierarchicalContext = new HierarchicalContext(new ComponentHierarchical(SingleChoiceEditor.this));
+ HierarchicalContext.push(hierarchicalContext);
try {
return (List<String>)ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), getChoiceProvider().value());
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
@@ -59,13 +60,13 @@ public class SingleChoiceEditor extends PropertyEditor<String> {
@Override
protected Map<String, String> load() {
- ComponentContext componentContext = new ComponentContext(SingleChoiceEditor.this);
+ HierarchicalContext hierarchicalContext = new HierarchicalContext(new ComponentHierarchical(SingleChoiceEditor.this));
if (getChoiceProvider().displayNames().length() != 0) {
- ComponentContext.push(componentContext);
+ HierarchicalContext.push(hierarchicalContext);
try {
return (Map<String, String>) ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), getChoiceProvider().displayNames());
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
} else {
return new HashMap<>();
@@ -78,13 +79,13 @@ public class SingleChoiceEditor extends PropertyEditor<String> {
@Override
protected Map<String, String> load() {
- ComponentContext componentContext = new ComponentContext(SingleChoiceEditor.this);
+ HierarchicalContext hierarchicalContext = new HierarchicalContext(new ComponentHierarchical(SingleChoiceEditor.this));
if (getChoiceProvider().descriptions().length() != 0) {
- ComponentContext.push(componentContext);
+ HierarchicalContext.push(hierarchicalContext);
try {
return (Map<String, String>) ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), getChoiceProvider().descriptions());
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
} else {
return new HashMap<>();
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java
index 62764454e2..e84664a4fb 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java
@@ -1,22 +1,11 @@
package io.onedev.server.web.editable.code;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.CharMatcher;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Splitter;
-import io.onedev.commons.codeassist.InputSuggestion;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.OneDev;
-import io.onedev.server.annotation.Code;
-import io.onedev.server.util.ComponentContext;
-import io.onedev.server.util.ReflectionUtils;
-import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
-import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.editable.PropertyDescriptor;
-import io.onedev.server.web.editable.PropertyEditor;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.wicket.ajax.AjaxChannel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -32,11 +21,25 @@ import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.convert.ConversionException;
-import static io.onedev.server.web.translation.Translation._T;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.base.CharMatcher;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Splitter;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.annotation.Code;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
+import io.onedev.server.util.ReflectionUtils;
+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
+import io.onedev.server.web.behavior.OnTypingDoneBehavior;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
public class CodePropertyEditor extends PropertyEditor<Serializable> {
@@ -91,7 +94,7 @@ public class CodePropertyEditor extends PropertyEditor<Serializable> {
ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
ArrayNode variablesNode = mapper.createArrayNode();
if (variableProvider.length() != 0) {
- ComponentContext.push(new ComponentContext(input));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(input)));
try {
for (InputSuggestion suggestion: ((List<InputSuggestion>) ReflectionUtils.invokeStaticMethod(
descriptor.getBeanClass(), variableProvider, matchWith))) {
@@ -103,7 +106,7 @@ public class CodePropertyEditor extends PropertyEditor<Serializable> {
variablesNode.add(variableNode);
}
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
try {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java
index 08c961b7f1..0e6bd81fd0 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java
@@ -7,7 +7,6 @@ import java.util.Collection;
import java.util.Comparator;
import java.util.List;
-import io.onedev.server.util.ComponentContext;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.model.IModel;
@@ -17,13 +16,15 @@ import org.apache.wicket.util.convert.ConversionException;
import com.google.common.base.Preconditions;
import io.onedev.server.OneDev;
-import io.onedev.server.service.GroupService;
+import io.onedev.server.annotation.GroupChoice;
import io.onedev.server.model.Group;
+import io.onedev.server.service.GroupService;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.ReflectionUtils;
import io.onedev.server.web.component.groupchoice.GroupMultiChoice;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.annotation.GroupChoice;
public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {
@@ -40,8 +41,8 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {
List<Group> choices = new ArrayList<>();
- ComponentContext componentContext = new ComponentContext(this);
- ComponentContext.push(componentContext);
+ HierarchicalContext hierarchicalContext = new HierarchicalContext(new ComponentHierarchical(this));
+ HierarchicalContext.push(hierarchicalContext);
try {
GroupChoice groupChoice = descriptor.getPropertyGetter().getAnnotation(GroupChoice.class);
Preconditions.checkNotNull(groupChoice);
@@ -53,7 +54,7 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {
choices.sort(Comparator.comparing(Group::getName));
}
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
List<Group> selections = new ArrayList<>();
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java
index f0d4be5bed..93b93760a3 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java
@@ -6,7 +6,6 @@ import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
-import io.onedev.server.util.ComponentContext;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.model.IModel;
@@ -16,13 +15,15 @@ import org.apache.wicket.util.convert.ConversionException;
import com.google.common.base.Preconditions;
import io.onedev.server.OneDev;
-import io.onedev.server.service.GroupService;
+import io.onedev.server.annotation.GroupChoice;
import io.onedev.server.model.Group;
+import io.onedev.server.service.GroupService;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.ReflectionUtils;
import io.onedev.server.web.component.groupchoice.GroupSingleChoice;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.annotation.GroupChoice;
public class GroupSingleChoiceEditor extends PropertyEditor<String> {
@@ -39,8 +40,8 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {
List<Group> choices = new ArrayList<>();
- ComponentContext componentContext = new ComponentContext(this);
- ComponentContext.push(componentContext);
+ HierarchicalContext hierarchicalContext = new HierarchicalContext(new ComponentHierarchical(this));
+ HierarchicalContext.push(hierarchicalContext);
try {
GroupChoice groupChoice = descriptor.getPropertyGetter().getAnnotation(GroupChoice.class);
Preconditions.checkNotNull(groupChoice);
@@ -52,7 +53,7 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {
choices.sort(Comparator.comparing(Group::getName));
}
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
Group group;
if (getModelObject() != null)
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/iterationchoice/IterationMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/iterationchoice/IterationMultiChoiceEditor.java
index 2fefa82ddd..7a32909d37 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/iterationchoice/IterationMultiChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/iterationchoice/IterationMultiChoiceEditor.java
@@ -1,26 +1,29 @@
package io.onedev.server.web.editable.iterationchoice;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.ConversionException;
+
import com.google.common.base.Preconditions;
+
import io.onedev.server.annotation.IterationChoice;
import io.onedev.server.model.Iteration;
import io.onedev.server.model.Project;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.ReflectionUtils;
import io.onedev.server.web.component.iteration.choice.IterationMultiChoice;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.util.convert.ConversionException;
-
-import static io.onedev.server.web.translation.Translation._T;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
public class IterationMultiChoiceEditor extends PropertyEditor<List<String>> {
@@ -39,8 +42,8 @@ public class IterationMultiChoiceEditor extends PropertyEditor<List<String>> {
List<Iteration> choices = new ArrayList<>();
List<Iteration> selections = new ArrayList<>();
- ComponentContext componentContext = new ComponentContext(this);
- ComponentContext.push(componentContext);
+ HierarchicalContext hierarchicalContext = new HierarchicalContext(new ComponentHierarchical(this));
+ HierarchicalContext.push(hierarchicalContext);
try {
IterationChoice iterationChoice = descriptor.getPropertyGetter().getAnnotation(IterationChoice.class);
Preconditions.checkNotNull(iterationChoice);
@@ -56,7 +59,7 @@ public class IterationMultiChoiceEditor extends PropertyEditor<List<String>> {
selections.add(choice);
}
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
input = new IterationMultiChoice("input", Model.of(selections), Model.of(choices)) {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/iterationchoice/IterationSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/iterationchoice/IterationSingleChoiceEditor.java
index 9953ab054b..1327d3d0c6 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/iterationchoice/IterationSingleChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/iterationchoice/IterationSingleChoiceEditor.java
@@ -1,24 +1,27 @@
package io.onedev.server.web.editable.iterationchoice;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.ConversionException;
+
import com.google.common.base.Preconditions;
+
import io.onedev.server.annotation.IterationChoice;
import io.onedev.server.model.Iteration;
import io.onedev.server.model.Project;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.ReflectionUtils;
import io.onedev.server.web.component.iteration.choice.IterationSingleChoice;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.util.convert.ConversionException;
-
-import static io.onedev.server.web.translation.Translation._T;
-
-import java.util.ArrayList;
-import java.util.List;
public class IterationSingleChoiceEditor extends PropertyEditor<String> {
@@ -37,8 +40,8 @@ public class IterationSingleChoiceEditor extends PropertyEditor<String> {
List<Iteration> choices = new ArrayList<>();
Iteration selection = null;
- ComponentContext componentContext = new ComponentContext(this);
- ComponentContext.push(componentContext);
+ HierarchicalContext hierarchicalContext = new HierarchicalContext(new ComponentHierarchical(this));
+ HierarchicalContext.push(hierarchicalContext);
try {
IterationChoice iterationChoice = descriptor.getPropertyGetter().getAnnotation(IterationChoice.class);
Preconditions.checkNotNull(iterationChoice);
@@ -56,7 +59,7 @@ public class IterationSingleChoiceEditor extends PropertyEditor<String> {
}
}
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
input = new IterationSingleChoice("input", Model.of(selection), Model.of(choices)) {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/refreshtoken/RefreshTokenPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/refreshtoken/RefreshTokenPropertyEditor.java
index 56cbf81580..5fc059e9d6 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/refreshtoken/RefreshTokenPropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/refreshtoken/RefreshTokenPropertyEditor.java
@@ -36,16 +36,17 @@ import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
+import io.onedev.server.annotation.RefreshToken;
import io.onedev.server.service.SettingService;
-import io.onedev.server.util.ComponentContext;
-import io.onedev.server.util.oauth.OAuthUtils;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.ReflectionUtils;
+import io.onedev.server.util.oauth.OAuthUtils;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.page.security.OAuthCallbackPage;
-import io.onedev.server.annotation.RefreshToken;
public class RefreshTokenPropertyEditor extends PropertyEditor<String> {
@@ -80,7 +81,7 @@ public class RefreshTokenPropertyEditor extends PropertyEditor<String> {
@Override
public void onClick(AjaxRequestTarget target) {
- ComponentContext.push(new ComponentContext(RefreshTokenPropertyEditor.this));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(RefreshTokenPropertyEditor.this)));
try {
RefreshToken authentication = descriptor.getPropertyGetter().getAnnotation(RefreshToken.class);
RefreshToken.Callback callback = (RefreshToken.Callback) ReflectionUtils.invokeStaticMethod(
@@ -124,7 +125,7 @@ public class RefreshTokenPropertyEditor extends PropertyEditor<String> {
else
throw e;
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
@@ -135,7 +136,7 @@ public class RefreshTokenPropertyEditor extends PropertyEditor<String> {
@Override
protected void respond(AjaxRequestTarget target) {
String refreshTokenValue = "";
- ComponentContext.push(new ComponentContext(RefreshTokenPropertyEditor.this));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(RefreshTokenPropertyEditor.this)));
try {
RefreshToken authentication = descriptor.getPropertyGetter().getAnnotation(RefreshToken.class);
RefreshToken.Callback callback = (RefreshToken.Callback) ReflectionUtils.invokeStaticMethod(
@@ -169,7 +170,7 @@ public class RefreshTokenPropertyEditor extends PropertyEditor<String> {
else
throw ExceptionUtils.unchecked(e);
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
target.appendJavaScript(String.format("onedev.server.refreshToken.onGenerated('%s', '%s');",
RefreshTokenPropertyEditor.this.getMarkupId(), refreshTokenValue));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/revisionchoice/RevisionChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/revisionchoice/RevisionChoiceEditor.java
index fa3667ff91..6e103f8da7 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/revisionchoice/RevisionChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/revisionchoice/RevisionChoiceEditor.java
@@ -5,13 +5,14 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.util.convert.ConversionException;
+import io.onedev.server.annotation.RevisionChoice;
import io.onedev.server.model.Project;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.ReflectionUtils;
import io.onedev.server.web.component.revision.RevisionPicker;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.annotation.RevisionChoice;
public class RevisionChoiceEditor extends PropertyEditor<String> {
@@ -35,7 +36,7 @@ public class RevisionChoiceEditor extends PropertyEditor<String> {
@Override
protected Project load() {
- ComponentContext.push(new ComponentContext(RevisionChoiceEditor.this));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(RevisionChoiceEditor.this)));
try {
RevisionChoice revisionChoice = descriptor.getPropertyGetter().getAnnotation(RevisionChoice.class);
if (revisionChoice.value().length() != 0)
@@ -43,7 +44,7 @@ public class RevisionChoiceEditor extends PropertyEditor<String> {
else
return Project.get();
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.java
index c7adfd2d37..f66e58981d 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleMultiChoiceEditor.java
@@ -17,9 +17,10 @@ import com.google.common.base.Preconditions;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.RoleChoice;
-import io.onedev.server.service.RoleService;
import io.onedev.server.model.Role;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.service.RoleService;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.web.component.rolechoice.RoleMultiChoice;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
@@ -38,15 +39,15 @@ public class RoleMultiChoiceEditor extends PropertyEditor<Collection<String>> {
List<Role> choices = new ArrayList<>();
- ComponentContext componentContext = new ComponentContext(this);
- ComponentContext.push(componentContext);
+ HierarchicalContext hierarchicalContext = new HierarchicalContext(new ComponentHierarchical(RoleMultiChoiceEditor.this));
+ HierarchicalContext.push(hierarchicalContext);
try {
RoleChoice roleChoice = descriptor.getPropertyGetter().getAnnotation(RoleChoice.class);
Preconditions.checkNotNull(roleChoice);
choices.addAll(OneDev.getInstance(RoleService.class).query());
choices.sort(Comparator.comparing(Role::getName));
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
List<Role> selections = new ArrayList<>();
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java
index f3a0487c0a..5a96f46839 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/rolechoice/RoleSingleChoiceEditor.java
@@ -16,9 +16,10 @@ import com.google.common.base.Preconditions;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.RoleChoice;
-import io.onedev.server.service.RoleService;
import io.onedev.server.model.Role;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.service.RoleService;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.web.component.rolechoice.RoleSingleChoice;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
@@ -37,15 +38,15 @@ public class RoleSingleChoiceEditor extends PropertyEditor<String> {
List<Role> choices = new ArrayList<>();
- ComponentContext componentContext = new ComponentContext(this);
- ComponentContext.push(componentContext);
+ HierarchicalContext hierarchicalContext = new HierarchicalContext(new ComponentHierarchical(RoleSingleChoiceEditor.this));
+ HierarchicalContext.push(hierarchicalContext);
try {
RoleChoice roleChoice = descriptor.getPropertyGetter().getAnnotation(RoleChoice.class);
Preconditions.checkNotNull(roleChoice);
choices.addAll(OneDev.getInstance(RoleService.class).query());
choices.sort(Comparator.comparing(Role::getName));
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
Role role;
if (getModelObject() != null)
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java
index 9ed7bba410..84e701d777 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java
@@ -20,9 +20,10 @@ import com.google.common.base.Preconditions;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.UserChoice;
-import io.onedev.server.service.UserService;
import io.onedev.server.model.User;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.service.UserService;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.ReflectionUtils;
import io.onedev.server.util.facade.UserCache;
import io.onedev.server.util.facade.UserFacade;
@@ -48,8 +49,8 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {
List<Long> choiceIds;
- ComponentContext componentContext = new ComponentContext(this);
- ComponentContext.push(componentContext);
+ HierarchicalContext hierarchicalContext = new HierarchicalContext(new ComponentHierarchical(UserMultiChoiceEditor.this));
+ HierarchicalContext.push(hierarchicalContext);
try {
UserChoice userChoice = descriptor.getPropertyGetter().getAnnotation(UserChoice.class);
Preconditions.checkNotNull(userChoice);
@@ -65,7 +66,7 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {
choiceIds.sort(Comparator.comparing(it -> cache.get(it).getDisplayName()));
}
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
List<Long> selectionIds = new ArrayList<>();
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java
index cdc9cbb53d..a94cc9d62d 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java
@@ -18,9 +18,10 @@ import com.google.common.base.Preconditions;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.UserChoice;
-import io.onedev.server.service.UserService;
import io.onedev.server.model.User;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.service.UserService;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.ReflectionUtils;
import io.onedev.server.util.facade.UserCache;
import io.onedev.server.util.facade.UserFacade;
@@ -50,8 +51,8 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {
List<Long> choiceIds;
- ComponentContext componentContext = new ComponentContext(this);
- ComponentContext.push(componentContext);
+ HierarchicalContext hierarchicalContext = new HierarchicalContext(new ComponentHierarchical(UserSingleChoiceEditor.this));
+ HierarchicalContext.push(hierarchicalContext);
try {
UserChoice userChoice = descriptor.getPropertyGetter().getAnnotation(UserChoice.class);
Preconditions.checkNotNull(userChoice);
@@ -67,7 +68,7 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {
choiceIds.sort(Comparator.comparing(it -> cache.get(it).getDisplayName()));
}
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
AtomicReference<Long> selectionId = new AtomicReference<>(null);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index b59ab3af7d..9e067cb509 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -508,7 +508,7 @@ public abstract class LayoutPage extends BasePage {
item.add(menuBody);
}
- int nestLevel = WicketUtils.findParents(item, MenuBody.class).size();
+ int nestLevel = WicketUtils.findSelfOrParents(item, MenuBody.class).size();
if (menuItem.getIconHref() != null) {
menuLink.add(new SpriteImage("icon", menuItem.getIconHref()));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitMessageBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitMessageBean.java
index 89a05b2ee7..71ff3d0bed 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitMessageBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitMessageBean.java
@@ -1,12 +1,12 @@
package io.onedev.server.web.page.project.blob.render.commitoption;
+import java.io.Serializable;
+
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.Multiline;
import io.onedev.server.annotation.OmitName;
import io.onedev.server.annotation.ReferenceAware;
-import io.onedev.server.util.ComponentContext;
-
-import java.io.Serializable;
+import io.onedev.server.util.HierarchicalContext;
@Editable
public class CommitMessageBean implements Serializable {
@@ -29,7 +29,7 @@ public class CommitMessageBean implements Serializable {
@SuppressWarnings("unused")
private static String getDefaultCommitMessage() {
- return ComponentContext.get().getComponent().findParent(CommitOptionPanel.class).getDefaultCommitMessage();
+ return HierarchicalContext.get().findData(CommitOptionPanel.class).getDefaultCommitMessage();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
index f2b304fd62..a9731f0802 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
@@ -61,7 +61,8 @@ import io.onedev.server.search.entity.issue.IterationEmptyCriteria;
import io.onedev.server.search.entity.issue.StateCriteria;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.service.UserService;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
@@ -249,11 +250,11 @@ abstract class BoardColumnPanel extends AbstractColumnPanel {
FieldSpec fieldSpec = getIssueSetting().getFieldSpec(identifyField);
if (fieldSpec instanceof ChoiceField) {
ChoiceProvider choiceProvider = ((ChoiceField)fieldSpec).getChoiceProvider();
- ComponentContext.push(new ComponentContext(this));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(BoardColumnPanel.this)));
try {
color = choiceProvider.getChoices(true).get(getColumn());
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
} else if (fieldSpec instanceof UserChoiceField) {
user = OneDev.getInstance(UserService.class).findByName(getColumn());
diff --git a/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java b/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java
index a5e1c08706..bdc25f0cf0 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java
@@ -86,8 +86,8 @@ public class WicketUtils {
}
@Nullable
- public static <T> T findInnermost(Component component, Class<T> clazz) {
- List<T> parents = findParents(component, clazz);
+ public static <T> T findSelfOrParent(Component component, Class<T> clazz) {
+ List<T> parents = findSelfOrParents(component, clazz);
if (!parents.isEmpty())
return parents.get(0);
else
@@ -104,7 +104,7 @@ public class WicketUtils {
* list of parent components of specified clazz, with inner component comes first
*/
@SuppressWarnings("unchecked")
- public static <T> List<T> findParents(Component component, Class<T> clazz) {
+ public static <T> List<T> findSelfOrParents(Component component, Class<T> clazz) {
List<T> parents = new ArrayList<>();
Component current = component;
do {
diff --git a/server-core/src/main/java/org/apache/wicket/Component.java b/server-core/src/main/java/org/apache/wicket/Component.java
index 99ecec2572..63385bdb2c 100644
--- a/server-core/src/main/java/org/apache/wicket/Component.java
+++ b/server-core/src/main/java/org/apache/wicket/Component.java
@@ -95,7 +95,8 @@ import org.apache.wicket.util.visit.Visit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
/**
@@ -873,7 +874,7 @@ public abstract class Component
*/
final void fireInitialize()
{
- ComponentContext.push(new ComponentContext(this));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(this)));
try {
if (!getFlag(FLAG_INITIALIZED))
{
@@ -905,7 +906,7 @@ public abstract class Component
}
}
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
@@ -987,7 +988,7 @@ public abstract class Component
*/
public final void beforeRender()
{
- ComponentContext.push(new ComponentContext(this));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(this)));
try {
if (this instanceof IFeedback)
{
@@ -1027,7 +1028,7 @@ public abstract class Component
internalBeforeRender();
}
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
@@ -2328,7 +2329,7 @@ public abstract class Component
*/
public final void render()
{
- ComponentContext.push(new ComponentContext(this));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(this)));
try {
RuntimeException exception = null;
@@ -2372,7 +2373,7 @@ public abstract class Component
throw exception;
}
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
@@ -2739,7 +2740,7 @@ public abstract class Component
*/
public void internalRenderHead(final HtmlHeaderContainer container)
{
- ComponentContext.push(new ComponentContext(this));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(this)));
try {
if (isVisibleInHierarchy() && isRenderAllowed())
{
@@ -2792,7 +2793,7 @@ public abstract class Component
}
}
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
diff --git a/server-core/src/main/java/org/apache/wicket/RequestListenerInterface.java b/server-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
index 369401a904..b93f33e289 100644
--- a/server-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
+++ b/server-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
@@ -32,7 +32,8 @@ import org.apache.wicket.util.lang.Classes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
/**
@@ -206,7 +207,7 @@ public class RequestListenerInterface
// we are in Wicket core land
final Component component = (Component)rcomponent;
- ComponentContext.push(new ComponentContext(component));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(component)));
try {
if (!component.canCallListenerInterface(method))
{
@@ -219,7 +220,7 @@ public class RequestListenerInterface
internalInvoke(component, component);
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
@@ -237,7 +238,7 @@ public class RequestListenerInterface
// we are in Wicket core land
final Component component = (Component)rcomponent;
- ComponentContext.push(new ComponentContext(component));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(component)));
try {
if (!behavior.canCallListenerInterface(component, method))
{
@@ -249,7 +250,7 @@ public class RequestListenerInterface
internalInvoke(component, behavior);
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
diff --git a/server-core/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java b/server-core/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java
index 9d3c044193..bca39e2697 100644
--- a/server-core/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java
+++ b/server-core/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java
@@ -25,7 +25,8 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.util.lang.Args;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ComponentHierarchical;
+import io.onedev.server.util.HierarchicalContext;
/**
@@ -95,7 +96,7 @@ public abstract class AutoCompleteBehavior<T> extends AbstractAutoCompleteBehavi
@Override
public void respond(final IRequestCycle requestCycle)
{
- ComponentContext.push(new ComponentContext(getComponent()));
+ HierarchicalContext.push(new HierarchicalContext(new ComponentHierarchical(getComponent())));
try {
WebResponse r = (WebResponse)requestCycle.getResponse();
@@ -118,7 +119,7 @@ public abstract class AutoCompleteBehavior<T> extends AbstractAutoCompleteBehavi
}
renderer.renderFooter(r, count);
} finally {
- ComponentContext.pop();
+ HierarchicalContext.pop();
}
}
diff --git a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportRepositories.java b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportRepositories.java
index 70dc5c5941..e5168253c0 100644
--- a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportRepositories.java
+++ b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportRepositories.java
@@ -13,8 +13,8 @@ import io.onedev.server.annotation.DependsOn;
import io.onedev.server.annotation.Editable;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.CreateChildren;
-import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.validation.Validatable;
import io.onedev.server.web.editable.BeanEditor;
@@ -82,7 +82,7 @@ public class ImportRepositories extends ImportWorkspace implements Validatable {
@SuppressWarnings("unused")
private static List<String> getBitbucketRepositoryChoices() {
- BeanEditor editor = ComponentContext.get().getComponent().findParent(BeanEditor.class);
+ BeanEditor editor = HierarchicalContext.get().findData(BeanEditor.class);
ImportRepositories repositories = (ImportRepositories) editor.getModelObject();
String workspace = (String) EditContext.get().getInputValue("workspace");
return repositories.server.listRepositories(workspace, true);
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.java
index e7f29acedd..486b5f05c5 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
@@ -7,10 +7,10 @@ import java.util.Map;
import javax.validation.constraints.NotEmpty;
-import io.onedev.server.util.ComponentContext;
-import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.annotation.ChoiceProvider;
import io.onedev.server.annotation.Editable;
+import io.onedev.server.util.HierarchicalContext;
+import io.onedev.server.web.editable.BeanEditor;
@Editable
public class ImportWorkspace implements Serializable {
@@ -35,7 +35,7 @@ public class ImportWorkspace implements Serializable {
}
private static Map<String, String> getWorkspaceDisplayNames() {
- BeanEditor editor = ComponentContext.get().getComponent().findParent(BeanEditor.class);
+ BeanEditor editor = HierarchicalContext.get().findData(BeanEditor.class);
ImportWorkspace setting = (ImportWorkspace) editor.getModelObject();
return setting.server.listWorkspaces();
}
diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportOrganization.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportOrganization.java
index fd334e9546..5879412efa 100644
--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportOrganization.java
+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportOrganization.java
@@ -3,10 +3,10 @@ package io.onedev.server.plugin.imports.gitea;
import java.io.Serializable;
import java.util.List;
-import io.onedev.server.util.ComponentContext;
-import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.annotation.ChoiceProvider;
import io.onedev.server.annotation.Editable;
+import io.onedev.server.util.HierarchicalContext;
+import io.onedev.server.web.editable.BeanEditor;
@Editable
public class ImportOrganization implements Serializable {
@@ -32,7 +32,7 @@ public class ImportOrganization implements Serializable {
@SuppressWarnings("unused")
private static List<String> getOrganizationChoices() {
- BeanEditor editor = ComponentContext.get().getComponent().findParent(BeanEditor.class);
+ BeanEditor editor = HierarchicalContext.get().findData(BeanEditor.class);
ImportOrganization setting = (ImportOrganization) editor.getModelObject();
return setting.server.listOrganizations();
}
diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportRepositories.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportRepositories.java
index 4d4dfb8b09..9c565ca6c6 100644
--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportRepositories.java
+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportRepositories.java
@@ -12,11 +12,11 @@ import io.onedev.server.annotation.ChoiceProvider;
import io.onedev.server.annotation.ClassValidating;
import io.onedev.server.annotation.DependsOn;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.service.ProjectService;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.CreateChildren;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.service.ProjectService;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.validation.Validatable;
import io.onedev.server.web.editable.BeanEditor;
@@ -85,7 +85,7 @@ public class ImportRepositories extends ImportOrganization implements Validatabl
@SuppressWarnings("unused")
private static List<String> getGiteaRepositoryChoices() {
- BeanEditor editor = ComponentContext.get().getComponent().findParent(BeanEditor.class);
+ BeanEditor editor = HierarchicalContext.get().findData(BeanEditor.class);
ImportRepositories repositories = (ImportRepositories) editor.getModelObject();
String organization = (String) EditContext.get().getInputValue("organization");
return repositories.server.listRepositories(organization, true);
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.java
index 5ac7ced608..eba29458a7 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
@@ -4,11 +4,11 @@ import java.util.List;
import javax.validation.constraints.NotEmpty;
-import io.onedev.server.util.ComponentContext;
-import io.onedev.server.util.EditContext;
-import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.annotation.ChoiceProvider;
import io.onedev.server.annotation.Editable;
+import io.onedev.server.util.EditContext;
+import io.onedev.server.util.HierarchicalContext;
+import io.onedev.server.web.editable.BeanEditor;
@Editable
public class ImportRepository extends ImportOrganization {
@@ -30,7 +30,7 @@ public class ImportRepository extends ImportOrganization {
@SuppressWarnings("unused")
private static List<String> getRepositoryChoices() {
- BeanEditor editor = ComponentContext.get().getComponent().findParent(BeanEditor.class);
+ BeanEditor editor = HierarchicalContext.get().findData(BeanEditor.class);
ImportRepository setting = (ImportRepository) editor.getModelObject();
String organization = (String) EditContext.get().getInputValue("organization");
return setting.server.listRepositories(organization, true);
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportOrganization.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportOrganization.java
index 8e2f5a7506..602cdca4d5 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportOrganization.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportOrganization.java
@@ -3,10 +3,10 @@ package io.onedev.server.plugin.imports.github;
import java.io.Serializable;
import java.util.List;
-import io.onedev.server.util.ComponentContext;
-import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.annotation.ChoiceProvider;
import io.onedev.server.annotation.Editable;
+import io.onedev.server.util.HierarchicalContext;
+import io.onedev.server.web.editable.BeanEditor;
@Editable
public class ImportOrganization implements Serializable {
@@ -41,7 +41,7 @@ public class ImportOrganization implements Serializable {
@SuppressWarnings("unused")
private static List<String> getOrganizationChoices() {
- BeanEditor editor = ComponentContext.get().getComponent().findParent(BeanEditor.class);
+ BeanEditor editor = HierarchicalContext.get().findData(BeanEditor.class);
ImportOrganization setting = (ImportOrganization) editor.getModelObject();
return setting.server.listOrganizations();
}
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepositories.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepositories.java
index fea36a7003..4bc268242a 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepositories.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepositories.java
@@ -13,8 +13,8 @@ import io.onedev.server.annotation.DependsOn;
import io.onedev.server.annotation.Editable;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.CreateChildren;
-import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.validation.Validatable;
import io.onedev.server.web.editable.BeanEditor;
@@ -82,7 +82,7 @@ public class ImportRepositories extends ImportOrganization implements Validatabl
@SuppressWarnings("unused")
private static List<String> getGitHubRepositoryChoices() {
- BeanEditor editor = ComponentContext.get().getComponent().findParent(BeanEditor.class);
+ BeanEditor editor = HierarchicalContext.get().findData(BeanEditor.class);
ImportRepositories repositories = (ImportRepositories) editor.getModelObject();
String organization = (String) EditContext.get().getInputValue("organization");
return repositories.server.listRepositories(organization, true);
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.java
index 32e878ef86..3af49e1c81 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
@@ -4,11 +4,11 @@ import java.util.List;
import javax.validation.constraints.NotEmpty;
-import io.onedev.server.util.ComponentContext;
-import io.onedev.server.util.EditContext;
-import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.annotation.ChoiceProvider;
import io.onedev.server.annotation.Editable;
+import io.onedev.server.util.EditContext;
+import io.onedev.server.util.HierarchicalContext;
+import io.onedev.server.web.editable.BeanEditor;
@Editable
public class ImportRepository extends ImportOrganization {
@@ -35,7 +35,7 @@ public class ImportRepository extends ImportOrganization {
@SuppressWarnings("unused")
private static List<String> getRepositoryChoices() {
- BeanEditor editor = ComponentContext.get().getComponent().findParent(BeanEditor.class);
+ BeanEditor editor = HierarchicalContext.get().findData(BeanEditor.class);
ImportRepository setting = (ImportRepository) editor.getModelObject();
String organization = (String) EditContext.get().getInputValue("organization");
return setting.server.listRepositories(organization, true);
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportGroup.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportGroup.java
index 196782c752..b8b15a44cd 100644
--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportGroup.java
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportGroup.java
@@ -7,7 +7,7 @@ import java.util.Map;
import io.onedev.server.annotation.ChoiceProvider;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.web.editable.BeanEditor;
@Editable
@@ -31,7 +31,7 @@ public class ImportGroup implements Serializable {
}
private static Map<String, String> getGroupDisplayNames() {
- BeanEditor editor = ComponentContext.get().getComponent().findParent(BeanEditor.class);
+ BeanEditor editor = HierarchicalContext.get().findData(BeanEditor.class);
ImportGroup setting = (ImportGroup) editor.getModelObject();
return setting.server.listGroups();
}
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.java
index d0ab9950df..b1079bc99b 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
@@ -1,14 +1,15 @@
package io.onedev.server.plugin.imports.gitlab;
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+
import io.onedev.server.annotation.ChoiceProvider;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.web.editable.BeanEditor;
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
-
@Editable
public class ImportProject extends ImportGroup {
@@ -29,7 +30,7 @@ public class ImportProject extends ImportGroup {
@SuppressWarnings("unused")
private static List<String> getProjectChoices() {
- BeanEditor editor = ComponentContext.get().getComponent().findParent(BeanEditor.class);
+ BeanEditor editor = HierarchicalContext.get().findData(BeanEditor.class);
ImportProject project = (ImportProject) editor.getModelObject();
String groupId = (String) EditContext.get().getInputValue("groupId");
return project.server.listProjects(groupId, true);
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportProjects.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportProjects.java
index 7301519f67..f412bfb5cc 100644
--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportProjects.java
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportProjects.java
@@ -13,8 +13,8 @@ import io.onedev.server.annotation.DependsOn;
import io.onedev.server.annotation.Editable;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.CreateChildren;
-import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.validation.Validatable;
import io.onedev.server.web.editable.BeanEditor;
@@ -82,7 +82,7 @@ public class ImportProjects extends ImportGroup implements Validatable {
@SuppressWarnings("unused")
private static List<String> getGitLabProjectChoices() {
- BeanEditor editor = ComponentContext.get().getComponent().findParent(BeanEditor.class);
+ BeanEditor editor = HierarchicalContext.get().findData(BeanEditor.class);
ImportProjects projects = (ImportProjects) editor.getModelObject();
String groupId = (String) EditContext.get().getInputValue("groupId");
return projects.server.listProjects(groupId, true);
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.java
index 2873b4c8de..17be1196d6 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
@@ -5,10 +5,10 @@ import java.util.List;
import javax.validation.constraints.NotEmpty;
-import io.onedev.server.util.ComponentContext;
-import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.annotation.ChoiceProvider;
import io.onedev.server.annotation.Editable;
+import io.onedev.server.util.HierarchicalContext;
+import io.onedev.server.web.editable.BeanEditor;
@Editable
public class ImportProject implements Serializable {
@@ -32,7 +32,7 @@ public class ImportProject implements Serializable {
@SuppressWarnings("unused")
private static List<String> getProjectChoices() {
- BeanEditor editor = ComponentContext.get().getComponent().findParent(BeanEditor.class);
+ BeanEditor editor = HierarchicalContext.get().findData(BeanEditor.class);
ImportProject setting = (ImportProject) editor.getModelObject();
return setting.server.listProjects();
}
diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportProjects.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportProjects.java
index b46c92f030..0ee879ddbf 100644
--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportProjects.java
+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportProjects.java
@@ -14,7 +14,7 @@ import io.onedev.server.annotation.DependsOn;
import io.onedev.server.annotation.Editable;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.CreateChildren;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.validation.Validatable;
import io.onedev.server.web.editable.BeanEditor;
@@ -72,7 +72,7 @@ public class ImportProjects implements Serializable, Validatable {
@SuppressWarnings("unused")
private static List<String> getJiraProjectChoices() {
- BeanEditor editor = ComponentContext.get().getComponent().findParent(BeanEditor.class);
+ BeanEditor editor = HierarchicalContext.get().findData(BeanEditor.class);
ImportProjects projects = (ImportProjects) editor.getModelObject();
return projects.server.listProjects();
}
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.java
index d79f6d30d4..e9fbd7817e 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
@@ -5,10 +5,10 @@ import java.util.List;
import javax.validation.constraints.NotEmpty;
-import io.onedev.server.util.ComponentContext;
-import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.annotation.ChoiceProvider;
import io.onedev.server.annotation.Editable;
+import io.onedev.server.util.HierarchicalContext;
+import io.onedev.server.web.editable.BeanEditor;
@Editable
public class ImportProject implements Serializable {
@@ -34,7 +34,7 @@ public class ImportProject implements Serializable {
@SuppressWarnings("unused")
private static List<String> getProjectChoices() {
- BeanEditor editor = ComponentContext.get().getComponent().findParent(BeanEditor.class);
+ BeanEditor editor = HierarchicalContext.get().findData(BeanEditor.class);
ImportProject setting = (ImportProject) editor.getModelObject();
return setting.server.listProjects();
}
diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportProjects.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportProjects.java
index 9bebd9ace0..1777454b70 100644
--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportProjects.java
+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportProjects.java
@@ -14,7 +14,7 @@ import io.onedev.server.annotation.DependsOn;
import io.onedev.server.annotation.Editable;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.CreateChildren;
-import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.HierarchicalContext;
import io.onedev.server.validation.Validatable;
import io.onedev.server.web.editable.BeanEditor;
@@ -74,7 +74,7 @@ public class ImportProjects implements Serializable, Validatable {
@SuppressWarnings("unused")
private static List<String> getYouTrackProjectChoices() {
- BeanEditor editor = ComponentContext.get().getComponent().findParent(BeanEditor.class);
+ BeanEditor editor = HierarchicalContext.get().findData(BeanEditor.class);
ImportProjects projects = (ImportProjects) editor.getModelObject();
return projects.server.listProjects();
}