Skip to content

The Unified and Autonomous Development Platform

Preserve common properties when switch between different implementations of a polymorphic editor

Robin Shen5a4c7a52ceef
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
index b9e06e34e7..1acc2fb81b 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
@@ -76,11 +76,11 @@ abstract class BatchEditPanel extends Panel implements InputContext {
@Override
protected void onUpdate(AjaxRequestTarget target) {
- for (List<PropertyDescriptor> values: builtInFieldsEditor.getBeanDescriptor().getPropertyDescriptors().values()) {
+ for (List<PropertyDescriptor> values: builtInFieldsEditor.getDescriptor().getPropertyDescriptors().values()) {
for (PropertyDescriptor value: values)
value.setPropertyExcluded(!selectedFields.contains(value.getDisplayName()));
}
- for (List<PropertyDescriptor> values: customFieldsEditor.getBeanDescriptor().getPropertyDescriptors().values()) {
+ for (List<PropertyDescriptor> values: customFieldsEditor.getDescriptor().getPropertyDescriptors().values()) {
for (PropertyDescriptor value: values)
value.setPropertyExcluded(!selectedFields.contains(value.getDisplayName()));
}
diff --git a/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java b/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java
index 5b0908c0c1..31781bdd45 100644
--- a/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java
@@ -54,7 +54,7 @@ public class ProfileEditPanel extends GenericPanel<User> {
public void setObject(Serializable object) {
// check contract of UserManager.save on why we assign oldName here
oldName = getUser().getName();
- editor.getBeanDescriptor().copyProperties(object, getUser());
+ editor.getDescriptor().copyProperties(object, getUser());
}
}, Sets.newHashSet("password"), true);
diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java b/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java
index 684a7d33fc..4195b0436d 100644
--- a/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java
@@ -80,8 +80,8 @@ public class BeanDescriptor implements Serializable {
public void copyProperties(Object from, Object to) {
for (List<PropertyDescriptor> groupProperties: getPropertyDescriptors().values()) {
for (PropertyDescriptor property: groupProperties) {
- if (!property.isPropertyExcluded())
- property.copyProperty(from, to);
+ if (!property.isPropertyExcluded())
+ property.copyProperty(from, to);
}
}
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
index 6db610b82a..c503e91489 100644
--- a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
@@ -45,7 +45,7 @@ public class BeanEditor extends ValueEditor<Serializable> {
public static final String SCRIPT_CONTEXT_BEAN = "beanEditor";
- private final BeanDescriptor beanDescriptor;
+ private final BeanDescriptor descriptor;
private final Map<String, List<PropertyContext<Serializable>>> propertyContexts = new LinkedHashMap<>();
@@ -53,17 +53,17 @@ public class BeanEditor extends ValueEditor<Serializable> {
private RepeatingView groupsView;
- public BeanEditor(String id, BeanDescriptor beanDescriptor, IModel<Serializable> model) {
+ public BeanEditor(String id, BeanDescriptor descriptor, IModel<Serializable> model) {
super(id, model);
- this.beanDescriptor = beanDescriptor;
+ this.descriptor = descriptor;
- for (Map.Entry<String, List<PropertyDescriptor>> entry: beanDescriptor.getPropertyDescriptors().entrySet()) {
+ for (Map.Entry<String, List<PropertyDescriptor>> entry: descriptor.getPropertyDescriptors().entrySet()) {
propertyContexts.put(entry.getKey(),
entry.getValue().stream().map(it->PropertyContext.of(it)).collect(Collectors.toList()));
}
- Class<?> beanClass = beanDescriptor.getBeanClass();
+ Class<?> beanClass = descriptor.getBeanClass();
if (beanClass.getAnnotation(Vertical.class) != null)
vertical = true;
else if (beanClass.getAnnotation(Horizontal.class) != null)
@@ -204,7 +204,7 @@ public class BeanEditor extends ValueEditor<Serializable> {
* Field will be display name of the property when the bean class being edited is
* generated via groovy script
*/
- String propertyName = beanDescriptor.getPropertyName(name);
+ String propertyName = descriptor.getPropertyName(name);
property.getDescriptor().getDependencyPropertyNames().add(propertyName);
Optional<Object> result= BeanEditor.this.visitChildren(PropertyEditor.class, new IVisitor<PropertyEditor<?>, Optional<Object>>() {
@@ -228,7 +228,7 @@ public class BeanEditor extends ValueEditor<Serializable> {
protected void onConfigure() {
super.onConfigure();
setVisible(!property.getDescriptor().isPropertyExcluded()
- && property.getDescriptor().isPropertyVisible(new OneContext(this), beanDescriptor));
+ && property.getDescriptor().isPropertyVisible(new OneContext(this), descriptor));
}
};
@@ -312,8 +312,8 @@ public class BeanEditor extends ValueEditor<Serializable> {
setOutputMarkupId(true);
}
- public BeanDescriptor getBeanDescriptor() {
- return beanDescriptor;
+ public BeanDescriptor getDescriptor() {
+ return descriptor;
}
@Override
@@ -341,7 +341,7 @@ public class BeanEditor extends ValueEditor<Serializable> {
@Override
protected Serializable convertInputToValue() throws ConversionException {
- final Serializable bean = (Serializable) getBeanDescriptor().newBeanInstance();
+ final Serializable bean = (Serializable) getDescriptor().newBeanInstance();
visitChildren(PropertyEditor.class, new IVisitor<PropertyEditor<Serializable>, PropertyEditor<Serializable>>() {
diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java
index 9a50e8b088..b97d114fe2 100644
--- a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java
@@ -24,6 +24,7 @@ import com.google.common.base.Preconditions;
import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.commons.launcher.loader.ImplementationRegistry;
import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.BeanUpdating;
import io.onedev.server.web.editable.EditableUtils;
@@ -40,10 +41,10 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {
private final List<Class<?>> implementations = new ArrayList<>();
- public PolymorphicPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<Serializable> propertyModel) {
- super(id, propertyDescriptor, propertyModel);
+ public PolymorphicPropertyEditor(String id, PropertyDescriptor descriptor, IModel<Serializable> propertyModel) {
+ super(id, descriptor, propertyModel);
- Class<?> baseClass = propertyDescriptor.getPropertyClass();
+ Class<?> baseClass = descriptor.getPropertyClass();
ImplementationRegistry registry = AppLoader.getInstance(ImplementationRegistry.class);
implementations.addAll(registry.getImplementations(baseClass));
@@ -93,7 +94,7 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {
public String getObject() {
Component beanEditor = PolymorphicPropertyEditor.this.get(BEAN_EDITOR_ID);
if (beanEditor instanceof BeanEditor) {
- return EditableUtils.getDisplayName(((BeanEditor) beanEditor).getBeanDescriptor().getBeanClass());
+ return EditableUtils.getDisplayName(((BeanEditor) beanEditor).getDescriptor().getBeanClass());
} else {
return null;
}
@@ -106,6 +107,18 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {
if (getDisplayName(each).equals(object)) {
try {
propertyValue = (Serializable) each.newInstance();
+ Serializable prevPropertyValue = PolymorphicPropertyEditor.this.getConvertedInput();
+ if (prevPropertyValue != null) {
+ BeanDescriptor prevDescriptor = new BeanDescriptor(prevPropertyValue.getClass());
+ for (List<PropertyDescriptor> prevGroupProperties: prevDescriptor.getPropertyDescriptors().values()) {
+ for (PropertyDescriptor prevProperty: prevGroupProperties) {
+ Class<?> declaringClass = prevProperty.getPropertyGetter().getDeclaringClass();
+ Class<?> baseClass = prevProperty.getPropertyGetter().getDeclaringClass();
+ if (!prevProperty.isPropertyExcluded() && declaringClass.isAssignableFrom(baseClass))
+ prevProperty.copyProperty(prevPropertyValue, propertyValue);
+ }
+ }
+ }
} catch (InstantiationException | IllegalAccessException e) {
throw new RuntimeException(e);
}
@@ -150,7 +163,7 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {
public String getObject() {
Component beanEditor = PolymorphicPropertyEditor.this.get(BEAN_EDITOR_ID);
if (beanEditor instanceof BeanEditor) {
- Class<?> beanClass = ((BeanEditor) beanEditor).getBeanDescriptor().getBeanClass();
+ Class<?> beanClass = ((BeanEditor) beanEditor).getDescriptor().getBeanClass();
return EditableUtils.getDescription(beanClass);
} else {
return null;
@@ -165,7 +178,7 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {
Component beanEditor = PolymorphicPropertyEditor.this.get(BEAN_EDITOR_ID);
if (beanEditor instanceof BeanEditor) {
- Class<?> beanClass = ((BeanEditor) beanEditor).getBeanDescriptor().getBeanClass();
+ Class<?> beanClass = ((BeanEditor) beanEditor).getDescriptor().getBeanClass();
setVisible(EditableUtils.getDescription(beanClass) != null);
} else {
setVisible(false);
diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java
index f6828a1932..ec9ca33139 100644
--- a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java
@@ -206,7 +206,7 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa
public String getObject() {
Component elementEditor = row.get("elementEditor");
if (elementEditor.isVisible()) {
- return EditableUtils.getDisplayName(((BeanEditor) elementEditor).getBeanDescriptor().getBeanClass());
+ return EditableUtils.getDisplayName(((BeanEditor) elementEditor).getDescriptor().getBeanClass());
} else {
return null;
}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java
index d3d7362b72..3bb504bc01 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java
@@ -61,7 +61,7 @@ public class GroupProfilePage extends GroupPage {
public void setObject(Serializable object) {
// check contract of GroupManager.save on why we assign oldName here
oldName = getGroup().getName();
- editor.getBeanDescriptor().copyProperties(object, getGroup());
+ editor.getDescriptor().copyProperties(object, getGroup());
}
}, Sets.newHashSet("administrator", "canCreateProjects"), true);
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java
index 23ec4e3a10..4704830912 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java
@@ -154,9 +154,9 @@ abstract class JobExecutorEditPanel extends Panel {
});
if (jobExecutorEditor != null
&& jobExecutorEditor.isVisibleInHierarchy()
- && Testable.class.isAssignableFrom(jobExecutorEditor.getBeanDescriptor().getBeanClass())) {
+ && Testable.class.isAssignableFrom(jobExecutorEditor.getDescriptor().getBeanClass())) {
Class<? extends Serializable> testDataClass = null;
- for (Type type: jobExecutorEditor.getBeanDescriptor().getBeanClass().getGenericInterfaces()) {
+ for (Type type: jobExecutorEditor.getDescriptor().getBeanClass().getGenericInterfaces()) {
ParameterizedType parameterizedType = (ParameterizedType) type;
if (parameterizedType.getRawType() == Testable.class) {
testDataClass = (Class<? extends Serializable>) parameterizedType.getActualTypeArguments()[0];
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.java
index 46d369341b..a289eddaee 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.java
@@ -49,7 +49,7 @@ abstract class MilestoneEditPanel extends Panel {
}
if (!editor.hasErrors(true)){
Milestone reloaded = getMilestone();
- editor.getBeanDescriptor().copyProperties(milestone, reloaded);
+ editor.getDescriptor().copyProperties(milestone, reloaded);
milestoneManager.save(reloaded);
Session.get().success("Milestone saved");
onMilestoneSaved(target, reloaded);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java
index a67d34b4ea..0146744f6a 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java
@@ -57,7 +57,7 @@ public class MilestoneEditPage extends ProjectIssuesPage {
.addError("This name has already been used by another milestone in the project");
}
if (!editor.hasErrors(true)){
- editor.getBeanDescriptor().copyProperties(milestone, milestoneModel.getObject());
+ editor.getDescriptor().copyProperties(milestone, milestoneModel.getObject());
milestoneManager.save(milestoneModel.getObject());
Session.get().success("Milestone saved");
setResponsePage(MilestoneDetailPage.class, MilestoneDetailPage.paramsOf(milestoneModel.getObject(), null));
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java
index c973398791..fb555d9f59 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java
@@ -51,7 +51,7 @@ public class GeneralSettingPage extends ProjectSettingPage {
public void setObject(Serializable object) {
// check contract of projectManager.save on why we assign oldName here
oldName = getProject().getName();
- editor.getBeanDescriptor().copyProperties(object, getProject());
+ editor.getDescriptor().copyProperties(object, getProject());
}
}, Lists.newArrayList("name", "description", "defaultPrivilege"), false);