Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2018-08-14 14:42:02 -0400
committerDonald Dunne2018-09-05 12:08:42 -0400
commitf8d20f2b6adf7f0de6ba519a4432ae626bd2388a (patch)
treeeaff47df1c9a4963c54b3028aee4294562df87bc
parentd3130e1b3f8f73da04874e3f466e0393731365d3 (diff)
downloadorg.eclipse.osee-f8d20f2b6adf7f0de6ba519a4432ae626bd2388a.tar.gz
org.eclipse.osee-f8d20f2b6adf7f0de6ba519a4432ae626bd2388a.tar.xz
org.eclipse.osee-f8d20f2b6adf7f0de6ba519a4432ae626bd2388a.zip
refactor[ats_TW10398]: Rename FeatureDefinitionData
-rw-r--r--plugins/org.eclipse.osee.define.rest/src/org/eclipse/osee/define/rest/internal/wordupdate/ApplicabilityExpression.java6
-rw-r--r--plugins/org.eclipse.osee.define.rest/src/org/eclipse/osee/define/rest/internal/wordupdate/WordMLApplicabilityHandler.java6
-rw-r--r--plugins/org.eclipse.osee.define.rest/src/org/eclipse/osee/define/rest/internal/wordupdate/WordUpdateArtifact.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/FeatureDefinition.java (renamed from plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/FeatureDefinitionData.java)6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/ApplicabilityUtility.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ApplicabilityQueryImpl.java16
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/ApplicabilityEndpoint.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ApplicabilityEndpointImpl.java4
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/ApplicabilityQuery.java4
9 files changed, 29 insertions, 29 deletions
diff --git a/plugins/org.eclipse.osee.define.rest/src/org/eclipse/osee/define/rest/internal/wordupdate/ApplicabilityExpression.java b/plugins/org.eclipse.osee.define.rest/src/org/eclipse/osee/define/rest/internal/wordupdate/ApplicabilityExpression.java
index 350696b2f6..da0285d530 100644
--- a/plugins/org.eclipse.osee.define.rest/src/org/eclipse/osee/define/rest/internal/wordupdate/ApplicabilityExpression.java
+++ b/plugins/org.eclipse.osee.define.rest/src/org/eclipse/osee/define/rest/internal/wordupdate/ApplicabilityExpression.java
@@ -20,7 +20,7 @@ import java.util.regex.Matcher;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
-import org.eclipse.osee.framework.core.data.FeatureDefinitionData;
+import org.eclipse.osee.framework.core.data.FeatureDefinition;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.util.JsonUtil;
import org.eclipse.osee.framework.core.util.WordCoreUtil;
@@ -191,9 +191,9 @@ public class ApplicabilityExpression {
String toReturn = null;
String json = featureDefArt.getSoleAttributeAsString(CoreAttributeTypes.GeneralStringData);
- FeatureDefinitionData[] featDataList = JsonUtil.readValue(json, FeatureDefinitionData[].class);
+ FeatureDefinition[] featDataList = JsonUtil.readValue(json, FeatureDefinition[].class);
- for (FeatureDefinitionData featData : featDataList) {
+ for (FeatureDefinition featData : featDataList) {
if (featData.getName().equalsIgnoreCase(feature)) {
toReturn = featData.getDefaultValue();
break;
diff --git a/plugins/org.eclipse.osee.define.rest/src/org/eclipse/osee/define/rest/internal/wordupdate/WordMLApplicabilityHandler.java b/plugins/org.eclipse.osee.define.rest/src/org/eclipse/osee/define/rest/internal/wordupdate/WordMLApplicabilityHandler.java
index 0398c71910..9d7e3bbc75 100644
--- a/plugins/org.eclipse.osee.define.rest/src/org/eclipse/osee/define/rest/internal/wordupdate/WordMLApplicabilityHandler.java
+++ b/plugins/org.eclipse.osee.define.rest/src/org/eclipse/osee/define/rest/internal/wordupdate/WordMLApplicabilityHandler.java
@@ -31,7 +31,7 @@ import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.BranchViewData;
-import org.eclipse.osee.framework.core.data.FeatureDefinitionData;
+import org.eclipse.osee.framework.core.data.FeatureDefinition;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
@@ -577,9 +577,9 @@ public class WordMLApplicabilityHandler {
private String getDefaultValue(String feature) {
String toReturn = null;
- FeatureDefinitionData[] featDataList = JsonUtil.readValue(featureDefinitionJson, FeatureDefinitionData[].class);
+ FeatureDefinition[] featDataList = JsonUtil.readValue(featureDefinitionJson, FeatureDefinition[].class);
- for (FeatureDefinitionData featData : featDataList) {
+ for (FeatureDefinition featData : featDataList) {
if (featData.getName().equalsIgnoreCase(feature)) {
toReturn = featData.getDefaultValue();
break;
diff --git a/plugins/org.eclipse.osee.define.rest/src/org/eclipse/osee/define/rest/internal/wordupdate/WordUpdateArtifact.java b/plugins/org.eclipse.osee.define.rest/src/org/eclipse/osee/define/rest/internal/wordupdate/WordUpdateArtifact.java
index 28c352cff1..781ffebaaa 100644
--- a/plugins/org.eclipse.osee.define.rest/src/org/eclipse/osee/define/rest/internal/wordupdate/WordUpdateArtifact.java
+++ b/plugins/org.eclipse.osee.define.rest/src/org/eclipse/osee/define/rest/internal/wordupdate/WordUpdateArtifact.java
@@ -28,7 +28,7 @@ import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.AttributeTypeId;
import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.FeatureDefinitionData;
+import org.eclipse.osee.framework.core.data.FeatureDefinition;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.model.type.LinkType;
@@ -239,11 +239,11 @@ public class WordUpdateArtifact {
}
private HashCollection<String, String> getValidFeatureValuesForBranch(BranchId branch) {
- List<FeatureDefinitionData> featureDefinitionData =
+ List<FeatureDefinition> featureDefinitionData =
orcsApi.getQueryFactory().applicabilityQuery().getFeatureDefinitionData(branch);
HashCollection<String, String> validFeatureValues = new HashCollection<>();
- for (FeatureDefinitionData feat : featureDefinitionData) {
+ for (FeatureDefinition feat : featureDefinitionData) {
validFeatureValues.put(feat.getName().toUpperCase(), feat.getValues());
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/FeatureDefinitionData.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/FeatureDefinition.java
index 50e18027b0..2c94423c53 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/FeatureDefinitionData.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/FeatureDefinition.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.framework.core.data;
import java.util.List;
-public class FeatureDefinitionData {
+public class FeatureDefinition {
private String name;
private String type;
@@ -20,11 +20,11 @@ public class FeatureDefinitionData {
private String defaultValue;
private String description;
- public FeatureDefinitionData() {
+ public FeatureDefinition() {
// Not doing anything
}
- public FeatureDefinitionData(String name, String type, List<String> values, String defaultValue, String description) {
+ public FeatureDefinition(String name, String type, List<String> values, String defaultValue, String description) {
this.name = name;
this.type = type;
this.values = values;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/ApplicabilityUtility.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/ApplicabilityUtility.java
index d1bf5c6731..4555455d68 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/ApplicabilityUtility.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/ApplicabilityUtility.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.utility;
import java.util.List;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.FeatureDefinitionData;
+import org.eclipse.osee.framework.core.data.FeatureDefinition;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
import org.eclipse.osee.framework.skynet.core.internal.ServiceUtil;
import org.eclipse.osee.orcs.rest.client.OseeClient;
@@ -26,11 +26,11 @@ public class ApplicabilityUtility {
OseeClient oseeClient = ServiceUtil.getOseeClient();
- List<FeatureDefinitionData> featureDefinitionData =
+ List<FeatureDefinition> featureDefinitionData =
oseeClient.getApplicabilityEndpoint(branch).getFeatureDefinitionData();
HashCollection<String, String> validFeatureValues = new HashCollection<>();
- for (FeatureDefinitionData feat : featureDefinitionData) {
+ for (FeatureDefinition feat : featureDefinitionData) {
validFeatureValues.put(feat.getName().toUpperCase(), feat.getValues());
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ApplicabilityQueryImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ApplicabilityQueryImpl.java
index c0fafcab4b..433e8eb8b9 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ApplicabilityQueryImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ApplicabilityQueryImpl.java
@@ -31,7 +31,7 @@ import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.Branch;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.BranchViewData;
-import org.eclipse.osee.framework.core.data.FeatureDefinitionData;
+import org.eclipse.osee.framework.core.data.FeatureDefinition;
import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
@@ -123,7 +123,7 @@ public class ApplicabilityQueryImpl implements ApplicabilityQuery {
}
@Override
- public List<FeatureDefinitionData> getFeatureDefinitionData(BranchId branch) {
+ public List<FeatureDefinition> getFeatureDefinitionData(BranchId branch) {
BranchId branchToUse = branch;
Branch br = branchQuery.andId(branch).getResults().getExactlyOne();
if (br.getBranchType().equals(BranchType.MERGE)) {
@@ -133,11 +133,11 @@ public class ApplicabilityQueryImpl implements ApplicabilityQuery {
List<ArtifactReadable> featureDefinitionArts =
queryFactory.fromBranch(branchToUse).andTypeEquals(CoreArtifactTypes.FeatureDefinition).getResults().getList();
- List<FeatureDefinitionData> featureDefinition = new ArrayList<>();
+ List<FeatureDefinition> featureDefinition = new ArrayList<>();
for (ArtifactReadable art : featureDefinitionArts) {
String json = art.getSoleAttributeAsString(CoreAttributeTypes.GeneralStringData);
- FeatureDefinitionData[] readValue = JsonUtil.readValue(json, FeatureDefinitionData[].class);
+ FeatureDefinition[] readValue = JsonUtil.readValue(json, FeatureDefinition[].class);
featureDefinition.addAll(Arrays.asList(readValue));
}
return featureDefinition;
@@ -200,11 +200,11 @@ public class ApplicabilityQueryImpl implements ApplicabilityQuery {
html.append("<table border=\"1\">");
List<ArtifactId> branchViews = branchView.getBranchViews();
- List<FeatureDefinitionData> featureDefinitionData = getFeatureDefinitionData(branch);
+ List<FeatureDefinition> featureDefinitionData = getFeatureDefinitionData(branch);
- Collections.sort(featureDefinitionData, new Comparator<FeatureDefinitionData>() {
+ Collections.sort(featureDefinitionData, new Comparator<FeatureDefinition>() {
@Override
- public int compare(FeatureDefinitionData obj1, FeatureDefinitionData obj2) {
+ public int compare(FeatureDefinition obj1, FeatureDefinition obj2) {
return obj1.getName().compareTo(obj2.getName());
}
});
@@ -215,7 +215,7 @@ public class ApplicabilityQueryImpl implements ApplicabilityQuery {
for (ArtifactId artId : branchViews) {
branchViewsMap.put(artId, getNamedViewApplicabilityMap(branch, artId));
}
- for (FeatureDefinitionData featureDefinition : featureDefinitionData) {
+ for (FeatureDefinition featureDefinition : featureDefinitionData) {
html.append("<tr>");
html.append(String.format("<td>%s</td>", featureDefinition.getName()));
html.append(String.format("<td>%s</td>", featureDefinition.getDescription()));
diff --git a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/ApplicabilityEndpoint.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/ApplicabilityEndpoint.java
index 9841cd886f..5de8a80c3b 100644
--- a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/ApplicabilityEndpoint.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/ApplicabilityEndpoint.java
@@ -28,7 +28,7 @@ import org.eclipse.osee.framework.core.data.ApplicabilityToken;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.BranchViewData;
-import org.eclipse.osee.framework.core.data.FeatureDefinitionData;
+import org.eclipse.osee.framework.core.data.FeatureDefinition;
import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.data.TransactionToken;
import org.eclipse.osee.framework.jdk.core.type.Pair;
@@ -80,7 +80,7 @@ public interface ApplicabilityEndpoint {
@GET
@Path("feature-data")
@Produces({MediaType.APPLICATION_JSON})
- List<FeatureDefinitionData> getFeatureDefinitionData();
+ List<FeatureDefinition> getFeatureDefinitionData();
/**
* @return a list of branches that contain the injected change (prior to removalDate)
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ApplicabilityEndpointImpl.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ApplicabilityEndpointImpl.java
index 71d3dad32f..b50856aadf 100644
--- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ApplicabilityEndpointImpl.java
+++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ApplicabilityEndpointImpl.java
@@ -19,7 +19,7 @@ import org.eclipse.osee.framework.core.data.ApplicabilityToken;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.BranchViewData;
-import org.eclipse.osee.framework.core.data.FeatureDefinitionData;
+import org.eclipse.osee.framework.core.data.FeatureDefinition;
import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.core.data.TransactionToken;
import org.eclipse.osee.framework.core.data.UserId;
@@ -109,7 +109,7 @@ public class ApplicabilityEndpointImpl implements ApplicabilityEndpoint {
}
@Override
- public List<FeatureDefinitionData> getFeatureDefinitionData() {
+ public List<FeatureDefinition> getFeatureDefinitionData() {
return applicabilityQuery.getFeatureDefinitionData(branch);
}
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/ApplicabilityQuery.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/ApplicabilityQuery.java
index bf9bb821e5..3f0636d026 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/ApplicabilityQuery.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/ApplicabilityQuery.java
@@ -19,7 +19,7 @@ import org.eclipse.osee.framework.core.data.ApplicabilityToken;
import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.BranchViewData;
-import org.eclipse.osee.framework.core.data.FeatureDefinitionData;
+import org.eclipse.osee.framework.core.data.FeatureDefinition;
import org.eclipse.osee.framework.core.data.TransactionId;
import org.eclipse.osee.framework.jdk.core.type.Pair;
@@ -42,7 +42,7 @@ public interface ApplicabilityQuery {
HashMap<Long, ApplicabilityToken> getApplicabilityTokens(BranchId branch1, BranchId branch2);
- List<FeatureDefinitionData> getFeatureDefinitionData(BranchId branch);
+ List<FeatureDefinition> getFeatureDefinitionData(BranchId branch);
Map<String, List<String>> getNamedViewApplicabilityMap(BranchId branch, ArtifactId viewId);

Back to the top