Skip to content

The Unified and Autonomous Development Platform

Remove unused classes

Robin Shenb5b508cdf567
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
index ddf49f2a17..d4092769ac 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
@@ -9,7 +9,6 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
import javax.annotation.Nullable;
@@ -17,10 +16,7 @@ import com.google.common.collect.Lists;
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.support.inputspec.InputSpec;
import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.Choice;
import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
import io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider.SpecifiedDefaultValue;
@@ -68,15 +64,6 @@ public class GlobalIssueSetting implements Serializable {
private List<IssueTemplate> issueTemplates = new ArrayList<>();
- @SuppressWarnings("unused")
- private static List<String> getWorkingPeriodFieldChoices() {
- return OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpecs()
- .stream()
- .filter(it->it.getType().equals(InputSpec.WORKING_PERIOD))
- .map(it->it.getName())
- .collect(Collectors.toList());
- }
-
private boolean reconciled = true;
public GlobalIssueSetting() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/IssueEffortSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/IssueEffortSetting.java
deleted file mode 100644
index cb1e36806e..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/IssueEffortSetting.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package io.onedev.server.model.support.issue;
-
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputSpec;
-import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
-import io.onedev.server.web.editable.annotation.ChoiceProvider;
-import io.onedev.server.web.editable.annotation.Editable;
-
-@Editable
-public class IssueEffortSetting implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private String effortEstimatedField;
-
- @Editable(order=100, description="Specify a field of type 'Working Period' recording estimated effort "
- + "of the issue")
- @ChoiceProvider("getWorkingPeriodFieldChoices")
- @NotEmpty
- public String getEffortEstimatedField() {
- return effortEstimatedField;
- }
-
- public void setEffortEstimatedField(String effortEstimatedField) {
- this.effortEstimatedField = effortEstimatedField;
- }
-
- @SuppressWarnings("unused")
- private static List<String> getWorkingPeriodFieldChoices() {
- return OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpecs()
- .stream()
- .filter(it->it.getType().equals(InputSpec.WORKING_PERIOD))
- .map(it->it.getName())
- .collect(Collectors.toList());
- }
-
- private GlobalIssueSetting getIssueSeting() {
- return OneDev.getInstance(SettingManager.class).getIssueSetting();
- }
-
- public Set<String> getUndefinedFields() {
- Set<String> undefinedFields = new HashSet<>();
- if (getIssueSeting().getFieldSpec(getEffortEstimatedField()) == null)
- undefinedFields.add(getEffortEstimatedField());
- return undefinedFields;
- }
-
- public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {
- for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {
- UndefinedFieldResolution resolution = entry.getValue();
- if (resolution.getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {
- if (getEffortEstimatedField().equals(entry.getKey()))
- setEffortEstimatedField(resolution.getNewField());
- } else if (getEffortEstimatedField().equals(entry.getKey())) {
- return false;
- }
- }
- return true;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
index b79a0ded3e..bef1fe6dbf 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
@@ -23,9 +23,7 @@ import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldReso
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;
-import io.onedev.server.web.editable.annotation.Editable;
-@Editable
public class ProjectIssueSetting implements Serializable {
private static final long serialVersionUID = 1L;