feature[ats_EPQBU]: Add support for match locations to search REST API

Change-Id: I27466e06e91a4db6d4671ce9de9baf6e3a908576

4 files changed, 82 insertions, 1 deletions

diff --git a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/RequestType.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/RequestType.java
index c2e031a7d45..da3a7bc7082 100644
--- a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/RequestType.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/RequestType.java
@@ -15,5 +15,6 @@ package org.eclipse.osee.orcs.rest.model.search;
  */
 public enum RequestType {
    COUNT,
-   IDS;
+   IDS,
+   MATCHES;
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchMatch.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchMatch.java
new file mode 100644
index 00000000000..bb9c3cebefb
--- /dev/null
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchMatch.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2013 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.search;
+
+import java.util.List;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+import org.eclipse.osee.framework.jdk.core.type.MatchLocation;
+
+/**
+ * @author John Misinco
+ */
+@XmlRootElement(name = "SearchMatch")
+public class SearchMatch {
+
+   private int artId;
+   private int attrId;
+
+   @XmlTransient
+   private List<MatchLocation> locations;
+
+   public SearchMatch() {
+      // default constructor
+   }
+
+   public SearchMatch(int artId, int attrId, List<MatchLocation> locations) {
+      this.artId = artId;
+      this.attrId = attrId;
+      this.locations = locations;
+   }
+
+   public int getArtId() {
+      return artId;
+   }
+
+   public void setArtId(int artId) {
+      this.artId = artId;
+   }
+
+   public int getAttrId() {
+      return attrId;
+   }
+
+   public void setAttrId(int attrId) {
+      this.attrId = attrId;
+   }
+
+   public List<MatchLocation> getLocations() {
+      return locations;
+   }
+
+   public void setLocations(List<MatchLocation> locations) {
+      this.locations = locations;
+   }
+
+}
diff --git a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchResponse.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchResponse.java
index 47f74d3eabd..4581d30fc27 100644
--- a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchResponse.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchResponse.java
@@ -32,6 +32,9 @@ public class SearchResponse implements SearchResult {
    @XmlTransient
    private List<Integer> ids = new LinkedList<Integer>();
 
+   @XmlTransient
+   private List<SearchMatch> searchMatches = new LinkedList<SearchMatch>();
+
    public void setSearchRequest(SearchRequest searchRequest) {
       this.searchRequest = searchRequest;
    }
@@ -86,4 +89,15 @@ public class SearchResponse implements SearchResult {
       return getSearchRequest();
    }
 
+   public void setMatches(List<SearchMatch> searchMatches) {
+      this.searchMatches = searchMatches;
+   }
+
+   @Override
+   @XmlElementWrapper(name = "matches")
+   @XmlElement(name = "match")
+   public List<SearchMatch> getSearchMatches() {
+      return searchMatches;
+   }
+
 }
diff --git a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchResult.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchResult.java
index 7a6107529f1..15628f86cbc 100644
--- a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchResult.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchResult.java
@@ -28,4 +28,6 @@ public interface SearchResult {
 
    List<Integer> getIds();
 
+   List<SearchMatch> getSearchMatches();
+
 }