Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2017-07-04 17:52:57 -0400
committerRyan D. Brooks2017-07-26 14:36:24 -0400
commit793150c50dc6bcf06549842cd08dc2eb4f047e1f (patch)
tree54bf6ae7316c6adbe60c920108da853ff82ad7a7
parent009539d24eda00e4a82328e370e0a1c18c878730 (diff)
downloadorg.eclipse.osee-793150c50dc6bcf06549842cd08dc2eb4f047e1f.tar.gz
org.eclipse.osee-793150c50dc6bcf06549842cd08dc2eb4f047e1f.tar.xz
org.eclipse.osee-793150c50dc6bcf06549842cd08dc2eb4f047e1f.zip
refinement: Support spaces in applicability name
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/ApplicabilityEndpoint.java5
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ApplicabilityEndpointImpl.java5
2 files changed, 6 insertions, 4 deletions
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 51f738785d..64b04d1bf4 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
@@ -31,6 +31,7 @@ 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.TransactionId;
+import org.eclipse.osee.framework.core.data.TransactionToken;
import org.eclipse.osee.framework.jdk.core.type.Pair;
/**
@@ -132,8 +133,8 @@ public interface ApplicabilityEndpoint {
List<BranchId> getAffectedBranches(@QueryParam("injectiontx") TransactionId injectionTx, @QueryParam("removaltx") @DefaultValue("-1") TransactionId removalTx, List<ApplicabilityId> applicabilityIds);
@POST
- @Path("view/{viewId}/applic/{applicability}/")
+ @Path("view/{viewId}/applic")
@Consumes({MediaType.APPLICATION_JSON})
@Produces(MediaType.APPLICATION_JSON)
- void createNewApplicabilityForView(@PathParam("viewId") ArtifactId viewId, @PathParam("applicability") String applicability);
+ TransactionToken createNewApplicabilityForView(@PathParam("viewId") ArtifactId viewId, String applicability);
} \ No newline at end of file
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 7b052593cc..32f61709e6 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
@@ -26,6 +26,7 @@ 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.TransactionId;
+import org.eclipse.osee.framework.core.data.TransactionToken;
import org.eclipse.osee.framework.core.data.UserId;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.enums.CoreArtifactTokens;
@@ -220,11 +221,11 @@ public class ApplicabilityEndpointImpl implements ApplicabilityEndpoint {
}
@Override
- public void createNewApplicabilityForView(ArtifactId viewId, String applicability) {
+ public TransactionToken createNewApplicabilityForView(ArtifactId viewId, String applicability) {
TransactionBuilder tx =
orcsApi.getTransactionFactory().createTransaction(branch, account, "Create new applicability");
tx.addTuple2(CoreTupleTypes.ViewApplicability, viewId, applicability);
- tx.commit();
+ return tx.commit();
}
@Override

Back to the top