Skip to content

The Unified and Autonomous Development Platform

feat: Move path and service desk name into basic info of project resource for brevity (OD-2034)

Robin Shen09e4c229861f
diff --git a/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java b/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java
index f137260b8e..cc7d3fdb91 100644
--- a/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java
+++ b/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java
@@ -1,6 +1,7 @@
package io.onedev.server.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.rest.annotation.Api;
import io.onedev.server.util.facade.EntityFacade;
@@ -17,6 +18,8 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
+import static com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY;
+
@MappedSuperclass
@JsonIgnoreProperties("handler")
public abstract class AbstractEntity implements Serializable, Comparable<AbstractEntity> {
@@ -36,7 +39,8 @@ public abstract class AbstractEntity implements Serializable, Comparable<Abstrac
@Api(order=1)
@Id
@GenericGenerator(name="entity_id", strategy="io.onedev.server.persistence.IdGenerator")
- @GeneratedValue(generator="entity_id")
+ @GeneratedValue(generator="entity_id")
+ @JsonProperty(access = READ_ONLY)
private Long id;
public Long getId() {
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 ada2bd1b2a..36932bc378 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
@@ -215,7 +215,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
@Column(nullable=false)
private String name;
- @JsonIgnore
+ @JsonProperty(access = READ_ONLY)
@Column(nullable=false)
private String path;
@@ -353,7 +353,6 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
// SQL Server does not allow duplicate null values for unique column. So we use
// special prefix to indicate null
- @JsonIgnore
@Column(unique=true, nullable=false)
private String serviceDeskName = NULL_SERVICE_DESK_PREFIX + UUID.randomUUID();
@@ -1043,6 +1042,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
}
@Nullable
+ @JsonProperty
public String getServiceDeskName() {
if (serviceDeskName.startsWith(NULL_SERVICE_DESK_PREFIX))
return null;
@@ -1056,7 +1056,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
else if (!this.serviceDeskName.startsWith(NULL_SERVICE_DESK_PREFIX))
this.serviceDeskName = NULL_SERVICE_DESK_PREFIX + UUID.randomUUID();
}
-
+
public GitPackConfig getGitPackConfig() {
return gitPackConfig;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/code/GitPackConfig.java b/server-core/src/main/java/io/onedev/server/model/support/code/GitPackConfig.java
index f59986710c..6f6e57dc20 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/code/GitPackConfig.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/code/GitPackConfig.java
@@ -12,16 +12,16 @@ public class GitPackConfig implements Serializable {
private static final long serialVersionUID = 1L;
- @Api(description = "May be null")
+ @Api(description = "May be null", example = "0")
private String windowMemory;
- @Api(description = "May be null")
+ @Api(description = "May be null", example="1g")
private String packSizeLimit;
- @Api(description = "May be null")
+ @Api(description = "May be null", example="0")
private String threads;
- @Api(description = "May be null")
+ @Api(description = "May be null", example="10")
private String window;
@Editable(order = 100, placeholder = "Use default", description = "Optionally specify value of git config " +
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
index 6d7a575f94..f985448350 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
@@ -1,16 +1,11 @@
package io.onedev.server.rest.resource;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Sets;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.entitymanager.IterationManager;
import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.model.support.pack.ProjectPackSetting;
-import io.onedev.server.web.UrlManager;
import io.onedev.server.git.GitContribution;
import io.onedev.server.git.GitContributor;
-import io.onedev.server.xodus.CommitInfoManager;
import io.onedev.server.model.*;
import io.onedev.server.model.support.NamedCodeCommentQuery;
import io.onedev.server.model.support.NamedCommitQuery;
@@ -19,17 +14,20 @@ import io.onedev.server.model.support.build.ProjectBuildSetting;
import io.onedev.server.model.support.code.BranchProtection;
import io.onedev.server.model.support.code.TagProtection;
import io.onedev.server.model.support.issue.ProjectIssueSetting;
+import io.onedev.server.model.support.pack.ProjectPackSetting;
import io.onedev.server.model.support.pullrequest.ProjectPullRequestSetting;
import io.onedev.server.persistence.dao.EntityCriteria;
-import io.onedev.server.rest.annotation.Api;
import io.onedev.server.rest.InvalidParamException;
+import io.onedev.server.rest.annotation.Api;
import io.onedev.server.rest.resource.support.RestConstants;
import io.onedev.server.search.entity.project.ProjectQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.date.DateUtils;
import io.onedev.server.util.date.Day;
import io.onedev.server.util.facade.ProjectFacade;
+import io.onedev.server.web.UrlManager;
import io.onedev.server.web.page.project.setting.ContributedProjectSetting;
+import io.onedev.server.xodus.CommitInfoManager;
import org.apache.shiro.authz.UnauthorizedException;
import org.hibernate.criterion.Restrictions;
@@ -61,16 +59,13 @@ public class ProjectResource {
private final UrlManager urlManager;
- private final ObjectMapper objectMapper;
-
@Inject
public ProjectResource(ProjectManager projectManager, IterationManager iterationManager,
- CommitInfoManager commitInfoManager, UrlManager urlManager, ObjectMapper objectMapper) {
+ CommitInfoManager commitInfoManager, UrlManager urlManager) {
this.projectManager = projectManager;
this.iterationManager = iterationManager;
this.commitInfoManager = commitInfoManager;
this.urlManager = urlManager;
- this.objectMapper = objectMapper;
}
@Api(order=100)
@@ -98,20 +93,6 @@ public class ProjectResource {
return cloneUrl;
}
- @Api(order=150)
- @Path("/{projectId}/path")
- @GET
- public String getPath(@PathParam("projectId") Long projectId) {
- Project project = projectManager.load(projectId);
- if (!SecurityUtils.canAccessProject(project))
- throw new UnauthorizedException();
- try {
- return objectMapper.writeValueAsString(project.getPath());
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
- }
-
@Api(order=200)
@Path("/{projectId}/setting")
@GET
@@ -120,7 +101,6 @@ public class ProjectResource {
if (!SecurityUtils.canManageProject(project))
throw new UnauthorizedException();
ProjectSetting setting = new ProjectSetting();
- setting.serviceDeskName = project.getServiceDeskName();
setting.branchProtections = project.getBranchProtections();
setting.tagProtections = project.getTagProtections();
setting.buildSetting = project.getBuildSetting();
@@ -327,7 +307,6 @@ public class ProjectResource {
Project project = projectManager.load(projectId);
if (!SecurityUtils.canManageProject(project))
throw new UnauthorizedException();
- project.setServiceDeskName(setting.serviceDeskName);
project.setBranchProtections(setting.branchProtections);
project.setTagProtections(setting.tagProtections);
project.setBuildSetting(setting.buildSetting);
@@ -382,8 +361,6 @@ public class ProjectResource {
private static final long serialVersionUID = 1L;
- private String serviceDeskName;
-
private ArrayList<BranchProtection> branchProtections = new ArrayList<>();
private ArrayList<TagProtection> tagProtections = new ArrayList<>();
@@ -404,14 +381,6 @@ public class ProjectResource {
private LinkedHashMap<String, ContributedProjectSetting> contributedSettings = new LinkedHashMap<>();
- public String getServiceDeskName() {
- return serviceDeskName;
- }
-
- public void setServiceDeskName(String serviceDeskName) {
- this.serviceDeskName = serviceDeskName;
- }
-
public ArrayList<BranchProtection> getBranchProtections() {
return branchProtections;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ApiComparator.java b/server-core/src/main/java/io/onedev/server/web/page/help/ApiComparator.java
index d5d5d3444e..66a77578e9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/ApiComparator.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ApiComparator.java
@@ -1,10 +1,10 @@
package io.onedev.server.web.page.help;
+import io.onedev.server.rest.annotation.Api;
+
import java.lang.reflect.AnnotatedElement;
import java.util.Comparator;
-import io.onedev.server.rest.annotation.Api;
-
public class ApiComparator implements Comparator<AnnotatedElement> {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java
index 47326e286f..f7e8ffc9bc 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java
@@ -11,7 +11,6 @@ import io.onedev.server.rest.annotation.Api;
import io.onedev.server.rest.annotation.Immutable;
import io.onedev.server.util.BeanUtils;
import io.onedev.server.util.ReflectionUtils;
-import io.onedev.server.web.page.help.ValueInfo.Origin;
import io.onedev.server.web.page.layout.AdministrationSettingContribution;
import io.onedev.server.web.page.layout.ContributedAdministrationSetting;
import io.onedev.server.web.page.project.setting.ContributedProjectSetting;
@@ -24,6 +23,9 @@ import java.lang.reflect.*;
import java.util.*;
import static com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY;
+import static io.onedev.server.web.page.help.ValueInfo.Origin.CREATE_BODY;
+import static io.onedev.server.web.page.help.ValueInfo.Origin.UPDATE_BODY;
+import static java.util.Comparator.comparing;
public class ApiHelpUtils {
@@ -102,23 +104,22 @@ public class ApiHelpUtils {
instantiationClass = valueClass;
}
value = new ObjenesisStd(true).getInstantiatorOf(instantiationClass).newInstance();
- for (Field field: getJsonFields(instantiationClass, origin)) {
- Object fieldValue = new ExampleProvider(valueClass, field.getAnnotation(Api.class)).getExample();
- if (fieldValue == null) {
- if (field.getAnnotation(ManyToOne.class) != null || field.getAnnotation(JoinColumn.class) != null) {
- fieldValue = field.getType().getDeclaredConstructor().newInstance();
+ for (var member: getJsonMembers(instantiationClass, origin)) {
+ Object memberValue = new ExampleProvider(valueClass, member.getAnnotation(Api.class)).getExample();
+ if (memberValue == null) {
+ if (member.getAnnotation(ManyToOne.class) != null || member.getAnnotation(JoinColumn.class) != null) {
+ memberValue = member.getType().getDeclaredConstructor().newInstance();
Field idField = AbstractEntity.class.getDeclaredField("id");
Object id = new ExampleProvider(idField.getType(), idField.getAnnotation(Api.class)).getExample();
- if (id == null)
+ if (id == null)
id = getExampleValue(idField.getGenericType(), new HashSet<>(parsedTypes), origin);
idField.setAccessible(true);
- idField.set(fieldValue, id);
+ idField.set(memberValue, id);
} else {
- fieldValue = getExampleValue(field.getGenericType(), new HashSet<>(parsedTypes), origin);
+ memberValue = getExampleValue(member.getGenericType(), new HashSet<>(parsedTypes), origin);
}
}
- field.setAccessible(true);
- field.set(value, fieldValue);
+ member.setValue(value, memberValue);
}
}
} catch (InstantiationException | IllegalAccessException | NoSuchFieldException | SecurityException
@@ -150,47 +151,108 @@ public class ApiHelpUtils {
implementations.addAll(OneDev.getInstance(ImplementationRegistry.class).getImplementations(clazz));
}
- Collections.sort(implementations, new Comparator<Class<?>>() {
-
- @Override
- public int compare(Class<?> o1, Class<?> o2) {
- return o1.getName().compareTo(o2.getName());
- }
-
- });
+ Collections.sort(implementations, comparing((Class<?> o) -> o.getName()));
return implementations;
}
- public static List<Field> getJsonFields(Class<?> beanClass, ValueInfo.Origin origin) {
- List<Field> fields = new ArrayList<>();
+ public static List<JsonMember> getJsonMembers(Class<?> beanClass, ValueInfo.Origin origin) {
+ List<JsonMember> members = new ArrayList<>();
for (Field field: BeanUtils.findFields(beanClass)) {
+ var jsonProperty = field.getAnnotation(JsonProperty.class);
+ Method getter = BeanUtils.findGetter(beanClass, field.getName());
if (field.getAnnotation(JsonIgnore.class) != null
|| field.getAnnotation(OneToMany.class) != null
|| field.getAnnotation(Transient.class) != null
|| field.getAnnotation(OneToOne.class) != null && field.getAnnotation(JoinColumn.class) == null
|| Modifier.isTransient(field.getModifiers())
- || (origin == Origin.CREATE_BODY || origin == Origin.UPDATE_BODY)
- && field.getAnnotation(JsonProperty.class) != null
- && field.getAnnotation(JsonProperty.class).access() == READ_ONLY
- || origin == Origin.UPDATE_BODY && field.getAnnotation(Immutable.class) != null) {
+ || (origin == CREATE_BODY || origin == UPDATE_BODY) && jsonProperty != null && jsonProperty.access() == READ_ONLY
+ || origin == UPDATE_BODY && field.getAnnotation(Immutable.class) != null
+ || getter != null && getter.getAnnotation(JsonProperty.class) != null) {
continue;
}
- if (field.getAnnotation(JsonProperty.class) != null) {
- fields.add(field);
- } else {
- Method getter = BeanUtils.findGetter(beanClass, field.getName());
- Method setter = BeanUtils.findSetter(beanClass, field.getName(), field.getType());
+ if (getter == null || getter.getAnnotation(JsonIgnore.class) == null) {
+ members.add(new JsonMember(field.getName(), field) {
+
+ @Override
+ public Class<?> getType() {
+ return field.getType();
+ }
+
+ @Override
+ public Type getGenericType() {
+ return field.getGenericType();
+ }
+
+ @Override
+ public Object getValue(Object obj) {
+ field.setAccessible(true);
+ try {
+ return field.get(obj);
+ } catch (IllegalAccessException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public void setValue(Object obj, Object value) {
+ field.setAccessible(true);
+ try {
+ field.set(obj, value);
+ } catch (IllegalAccessException e) {
+ throw new RuntimeException(e);
+ }
+ }
- if ((getter == null || getter.getAnnotation(JsonIgnore.class) == null)
- && (setter == null || setter.getAnnotation(JsonIgnore.class) == null)) {
- fields.add(field);
- }
+ });
+ }
+ }
+
+ for (Method getter: BeanUtils.findGetters(beanClass)) {
+ var jsonProperty = getter.getAnnotation(JsonProperty.class);
+ if (getter.getAnnotation(JsonIgnore.class) == null
+ && jsonProperty != null
+ && (origin != CREATE_BODY && origin != UPDATE_BODY || jsonProperty.access() != READ_ONLY)
+ && (origin != UPDATE_BODY || getter.getAnnotation(Immutable.class) == null)) {
+ members.add(new JsonMember(BeanUtils.getPropertyName(getter), getter) {
+
+ @Override
+ public Class<?> getType() {
+ return getter.getReturnType();
+ }
+
+ @Override
+ public Type getGenericType() {
+ return getter.getGenericReturnType();
+ }
+
+ @Override
+ public Object getValue(Object obj) {
+ try {
+ return getter.invoke(obj);
+ } catch (IllegalAccessException | InvocationTargetException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public void setValue(Object obj, Object value) {
+ var setter = BeanUtils.findSetter(getter);
+ if (setter != null) {
+ try {
+ setter.invoke(obj, value);
+ } catch (IllegalAccessException | InvocationTargetException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+ });
}
}
- Collections.sort(fields, new ApiComparator());
+ Collections.sort(members, new ApiComparator());
- return fields;
+ return members;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java
index 27ea94fd09..ce90aff045 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java
@@ -40,7 +40,6 @@ import javax.persistence.ManyToOne;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import java.io.Serializable;
-import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
@@ -48,6 +47,7 @@ import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.regex.Pattern;
+import static io.onedev.server.web.page.help.ApiHelpUtils.getJsonMembers;
import static io.onedev.server.web.page.help.ValueInfo.Origin.*;
@SuppressWarnings("serial")
@@ -122,9 +122,7 @@ public class ExampleValuePanel extends Panel {
StringBuilder builder = new StringBuilder();
if (isScalarValue()) {
builder.append(toJson(getValue()));
- } else if (getField() != null
- && (getField().getAnnotation(ManyToOne.class) != null
- || getField().getAnnotation(JoinColumn.class) != null)) {
+ } else if (getMember() != null && (getMember().getAnnotation(ManyToOne.class) != null || getMember().getAnnotation(JoinColumn.class) != null)) {
builder.append(toJson(((AbstractEntity)getValue()).getId()));
} else if (getValue() instanceof Collection || getValue() instanceof Serializable[]) {
List<String> elements = new ArrayList<>();
@@ -186,9 +184,7 @@ public class ExampleValuePanel extends Panel {
protected void onBeforeRender() {
if (isScalarValue()) {
addOrReplace(newScalarFragment(getValue()));
- } else if (getField() != null
- && (getField().getAnnotation(ManyToOne.class) != null
- || getField().getAnnotation(JoinColumn.class) != null)) {
+ } else if (getMember() != null && (getMember().getAnnotation(ManyToOne.class) != null || getMember().getAnnotation(JoinColumn.class) != null)) {
addOrReplace(newScalarFragment(((AbstractEntity)getValue()).getId()));
} else if (getValue() instanceof Collection || getValue() instanceof Serializable[]) {
addOrReplace(newArrayFragment());
@@ -233,11 +229,9 @@ public class ExampleValuePanel extends Panel {
typeHintFrag.add(new Label("possibleValues", StringUtils.join(possibleValues)));
fragment.add(typeHintFrag);
hasHint = true;
- } else if (getField() != null) {
+ } else if (getMember() != null) {
fragment.add(new WebMarkupContainer("typeHint").setVisible(false));
- } else if (getValue() instanceof Long
- && getValueOrigin() == READ_BODY
- && requestBodyClass != null) {
+ } else if (getValue() instanceof Long && getValueOrigin() == READ_BODY && requestBodyClass != null) {
if (AbstractEntity.class.isAssignableFrom(requestBodyClass)) {
Class<?> resourceClass = resourceMap.get(requestBodyClass);
if (resourceClass != null) {
@@ -276,8 +270,8 @@ public class ExampleValuePanel extends Panel {
}
String description = "";
- if (getField() != null && getField().getAnnotation(Api.class) != null)
- description = getField().getAnnotation(Api.class).description();
+ if (getMember() != null && getMember().getAnnotation(Api.class) != null)
+ description = getMember().getAnnotation(Api.class).description();
if (description.length() == 0 && getValue() != null
&& getValue().getClass().getAnnotation(Api.class) != null) {
description = getValue().getClass().getAnnotation(Api.class).description();
@@ -433,18 +427,19 @@ public class ExampleValuePanel extends Panel {
private Fragment newObjectFragment() {
Fragment fragment = new Fragment("content", "objectFrag", this);
- IModel<List<Field>> fieldsModel = new LoadableDetachableModel<>() {
+ IModel<List<JsonMember>> membersModel = new LoadableDetachableModel<>() {
@Override
- protected List<Field> load() {
- List<Field> fields = ApiHelpUtils.getJsonFields(getValue().getClass(), getValueOrigin());
- for (var it = fields.iterator(); it.hasNext();) {
- var field = it.next();
+ protected List<JsonMember> load() {
+ var members = getJsonMembers(getValue().getClass(), getValueOrigin());
+ for (var it = members.iterator(); it.hasNext();) {
+ var member = it.next();
var valueOrigin = getValueOrigin();
- if ((valueOrigin == CREATE_BODY || valueOrigin == UPDATE_BODY) && field.getAnnotation(Id.class) != null)
+ var id = member.getAnnotation(Id.class);
+ if ((valueOrigin == CREATE_BODY || valueOrigin == UPDATE_BODY) && id != null)
it.remove();
}
- return fields;
+ return members;
}
};
@@ -515,17 +510,17 @@ public class ExampleValuePanel extends Panel {
});
typeInfoFragment.add(new WebMarkupContainer("comma")
- .setVisible(!fieldsModel.getObject().isEmpty()));
+ .setVisible(!membersModel.getObject().isEmpty()));
fragment.add(typeInfoFragment);
} else {
fragment.add(new WebMarkupContainer("typeInfo").setVisible(false));
}
- fragment.add(new ListView<>("properties", fieldsModel) {
+ fragment.add(new ListView<>("properties", membersModel) {
@Override
- protected void populateItem(ListItem<Field> item) {
- Field field = item.getModelObject();
+ protected void populateItem(ListItem<JsonMember> item) {
+ var member = item.getModelObject();
IModel<ValueInfo> valueInfoModel = new LoadableDetachableModel<ValueInfo>() {
@@ -535,18 +530,17 @@ public class ExampleValuePanel extends Panel {
}
};
- if (field.getAnnotation(ManyToOne.class) != null || field.getAnnotation(JoinColumn.class) != null)
- item.add(new ExampleValuePanel("name", Model.of(field.getName() + "Id"), valueInfoModel, requestBodyClass));
+
+ if (member.getAnnotation(ManyToOne.class) != null || member.getAnnotation(JoinColumn.class) != null)
+ item.add(new ExampleValuePanel("name", Model.of(member.getName() + "Id"), valueInfoModel, requestBodyClass));
else
- item.add(new ExampleValuePanel("name", Model.of(field.getName()), valueInfoModel, requestBodyClass));
-
- field.setAccessible(true);
+ item.add(new ExampleValuePanel("name", Model.of(member.getName()), valueInfoModel, requestBodyClass));
valueInfoModel = new LoadableDetachableModel<>() {
@Override
protected ValueInfo load() {
- Field field = item.getModelObject();
- return new ValueInfo(getValueOrigin(), field.getGenericType(), field);
+ var member = item.getModelObject();
+ return new ValueInfo(getValueOrigin(), member.getGenericType(), member);
}
};
@@ -559,24 +553,14 @@ public class ExampleValuePanel extends Panel {
@Override
public Serializable getObject() {
- try {
- Field field = item.getModelObject();
- field.setAccessible(true);
- return (Serializable) field.get(getValue());
- } catch (IllegalArgumentException | IllegalAccessException e) {
- throw new RuntimeException(e);
- }
+ var member = item.getModelObject();
+ return (Serializable) member.getValue(getValue());
}
@Override
public void setObject(Serializable object) {
- try {
- Field field = item.getModelObject();
- field.setAccessible(true);
- field.set(getValue(), object);
- } catch (IllegalArgumentException | IllegalAccessException e) {
- throw new RuntimeException(e);
- }
+ var member = item.getModelObject();
+ member.setValue(getValue(), object);
}
}, valueInfoModel, requestBodyClass));
@@ -594,10 +578,10 @@ public class ExampleValuePanel extends Panel {
}
@Nullable
- private Field getField() {
- return getValueInfo().getField();
+ private JsonMember getMember() {
+ return getValueInfo().getMember();
}
-
+
private Type getDeclaredType() {
return getValueInfo().getDeclaredType();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/JsonMember.java b/server-core/src/main/java/io/onedev/server/web/page/help/JsonMember.java
new file mode 100644
index 0000000000..a0cd6cc3f5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/JsonMember.java
@@ -0,0 +1,65 @@
+package io.onedev.server.web.page.help;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Type;
+
+public abstract class JsonMember implements AnnotatedElement {
+
+ private final String name;
+
+ private final AnnotatedElement delegate;
+
+ public JsonMember(String name, AnnotatedElement delegate) {
+ this.name = name;
+ this.delegate = delegate;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public abstract Class<?> getType();
+
+ public abstract Type getGenericType();
+
+ public abstract Object getValue(Object obj);
+
+ public abstract void setValue(Object obj, Object value);
+
+ @Override
+ public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
+ return delegate.isAnnotationPresent(annotationClass);
+ }
+
+ @Override
+ public <T extends Annotation> T[] getAnnotationsByType(Class<T> annotationClass) {
+ return delegate.getAnnotationsByType(annotationClass);
+ }
+
+ @Override
+ public <T extends Annotation> T getDeclaredAnnotation(Class<T> annotationClass) {
+ return delegate.getDeclaredAnnotation(annotationClass);
+ }
+
+ @Override
+ public <T extends Annotation> T[] getDeclaredAnnotationsByType(Class<T> annotationClass) {
+ return delegate.getDeclaredAnnotationsByType(annotationClass);
+ }
+
+ @Override
+ public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
+ return delegate.getAnnotation(annotationClass);
+ }
+
+ @Override
+ public Annotation[] getAnnotations() {
+ return delegate.getAnnotations();
+ }
+
+ @Override
+ public Annotation[] getDeclaredAnnotations() {
+ return delegate.getDeclaredAnnotations();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ValueInfo.java b/server-core/src/main/java/io/onedev/server/web/page/help/ValueInfo.java
index 890bfda8bf..cd83ccbfde 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/ValueInfo.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ValueInfo.java
@@ -1,7 +1,9 @@
package io.onedev.server.web.page.help;
import javax.annotation.Nullable;
+import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Field;
+import java.lang.reflect.Member;
import java.lang.reflect.Type;
public class ValueInfo {
@@ -12,12 +14,12 @@ public class ValueInfo {
private final Type declaredType;
- private final Field field;
+ private final JsonMember member;
- public ValueInfo(Origin origin, Type declaredType, @Nullable Field field) {
+ public ValueInfo(Origin origin, Type declaredType, @Nullable JsonMember member) {
this.origin = origin;
this.declaredType = declaredType;
- this.field = field;
+ this.member = member;
}
public ValueInfo(Origin origin, Type declaredType) {
@@ -33,8 +35,8 @@ public class ValueInfo {
}
@Nullable
- public Field getField() {
- return field;
+ public JsonMember getMember() {
+ return member;
}
}
\ No newline at end of file
diff --git a/server-product/system/incompatibilities/incompatibilities.md b/server-product/system/incompatibilities/incompatibilities.md
index 67817b75c1..feebd07669 100644
--- a/server-product/system/incompatibilities/incompatibilities.md
+++ b/server-product/system/incompatibilities/incompatibilities.md
@@ -1,3 +1,11 @@
+# 11.0.6
+
+### RESTful api
+
+1. Project path now gets returned via _Get Basic Info_ operation
+2. Project service desk name now gets returned via _Get Basic Info_ operation
+3. Project service desk name now gets updated via _Update Basic Info_ operation
+
# 10.9.0
### RESTful api