Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2018-07-02 14:38:57 -0400
committerRyan Brooks2018-07-07 11:39:50 -0400
commit4abb46a66563d9ffb5a9c7f5bac92b0c99e19f42 (patch)
tree57093b53fe0ff52170fe4265ce6cca35f80e00cf
parent1f989066546699811e28fe625bcd78b2eb246b0d (diff)
downloadorg.eclipse.osee-4abb46a66563d9ffb5a9c7f5bac92b0c99e19f42.tar.gz
org.eclipse.osee-4abb46a66563d9ffb5a9c7f5bac92b0c99e19f42.tar.xz
org.eclipse.osee-4abb46a66563d9ffb5a9c7f5bac92b0c99e19f42.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.java9
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/ApplicabilityEndpointImpl.java5
2 files changed, 8 insertions, 6 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 cf3d5895a4..83f0d0d68d 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;
/**
@@ -126,20 +127,20 @@ public interface ApplicabilityEndpoint {
* @param removalDateMs if default value of -1 is used, return list of branches after injectionDate
*/
@PUT
- @Path("change/")
+ @Path("change")
@Consumes({MediaType.APPLICATION_JSON})
@Produces(MediaType.APPLICATION_JSON)
List<BranchId> getAffectedBranches(@QueryParam("injectionDateMs") Long injectDateMs, @QueryParam("removalDateMs") @DefaultValue("-1") Long removalDateMs, List<ApplicabilityId> applicabilityIds);
@PUT
- @Path("change/")
+ @Path("change")
@Consumes({MediaType.APPLICATION_JSON})
@Produces(MediaType.APPLICATION_JSON)
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 adf486df53..bfc09cd57f 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;
@@ -230,11 +231,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, SystemUser.OseeSystem, "Create new applicability");
tx.addTuple2(CoreTupleTypes.ViewApplicability, viewId, applicability);
- tx.commit();
+ return tx.commit();
}
@Override

Back to the top