Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngel Avila2015-08-12 00:36:41 +0000
committerAngel Avila2015-09-12 01:00:09 +0000
commit37c7112b8c3e5c3621197205a5a61066977b9896 (patch)
treecb4deda81b1dc36d23ba73cf04c3a1b6f04b1f99 /plugins/org.eclipse.osee.orcs.rest.model
parenta4e4963bb44cf7b77e5091b88233c7ba8c796cf9 (diff)
downloadorg.eclipse.osee-37c7112b8c3e5c3621197205a5a61066977b9896.tar.gz
org.eclipse.osee-37c7112b8c3e5c3621197205a5a61066977b9896.tar.xz
org.eclipse.osee-37c7112b8c3e5c3621197205a5a61066977b9896.zip
feature[ats_ATS197755]: Provide REST endpoint for UI Count
Diffstat (limited to 'plugins/org.eclipse.osee.orcs.rest.model')
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/BranchEndpoint.java3
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/CompareResults.java39
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/TransactionEndpoint.java1
4 files changed, 4 insertions, 40 deletions
diff --git a/plugins/org.eclipse.osee.orcs.rest.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.rest.model/META-INF/MANIFEST.MF
index 7230bd6771..f5c5f2943e 100644
--- a/plugins/org.eclipse.osee.orcs.rest.model/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.rest.model/META-INF/MANIFEST.MF
@@ -19,5 +19,6 @@ Import-Package: javax.annotation.security;version="1.2.0",
org.eclipse.osee.framework.core.util,
org.eclipse.osee.framework.jdk.core.type,
org.eclipse.osee.framework.jdk.core.util,
+ org.eclipse.osee.orcs.transaction,
org.eclipse.osee.orcs.writer.model.config,
org.eclipse.osee.orcs.writer.model.reader
diff --git a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/BranchEndpoint.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/BranchEndpoint.java
index 95778d5cf1..b4410e2a03 100644
--- a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/BranchEndpoint.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/BranchEndpoint.java
@@ -25,6 +25,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
+import org.eclipse.osee.orcs.transaction.CompareResults;
/**
* @author Roberto E. Escobar
@@ -38,7 +39,7 @@ public interface BranchEndpoint {
/**
* Perform a branch query based on query parameter input
- *
+ *
* @param branchUuids comma separated list of branch uuids
* @param branchTypes comma separated list of {@link org.eclipse.osee.framework.core.enums.BranchType BranchType}
* @param branchStates comma separated list of {@link org.eclipse.osee.framework.core.enums.BranchState BranchState}
diff --git a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/CompareResults.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/CompareResults.java
deleted file mode 100644
index 35cf58e649..0000000000
--- a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/CompareResults.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.orcs.rest.model;
-
-import java.util.Collections;
-import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
-import org.eclipse.osee.framework.core.model.change.ChangeItem;
-
-/**
- * @author Roberto E. Escobar
- */
-@XmlRootElement
-public class CompareResults {
-
- private List<ChangeItem> changes;
-
- public List<ChangeItem> getChanges() {
- return changes != null ? changes : Collections.<ChangeItem> emptyList();
- }
-
- public void setChanges(List<ChangeItem> changes) {
- this.changes = changes;
- }
-
- @Override
- public String toString() {
- return "CompareResults [changes=" + changes + "]";
- }
-
-}
diff --git a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/TransactionEndpoint.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/TransactionEndpoint.java
index 12fd7ef6f0..d5a0afe4e0 100644
--- a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/TransactionEndpoint.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/TransactionEndpoint.java
@@ -19,6 +19,7 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import org.eclipse.osee.orcs.transaction.CompareResults;
/**
* @author Roberto E. Escobar

Back to the top