Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2013-09-26 22:22:28 +0000
committerRoberto E. Escobar2013-10-12 01:16:41 +0000
commit3553e04b163167f7ad6a6d753e5cb58ca805ce95 (patch)
treef0460b231fc22d87b632d85bb3401f0f73ff055c /plugins/org.eclipse.osee.framework.manager.servlet
parent8947a09c304cf45ca4beba0af5a15e220f118770 (diff)
downloadorg.eclipse.osee-3553e04b163167f7ad6a6d753e5cb58ca805ce95.tar.gz
org.eclipse.osee-3553e04b163167f7ad6a6d753e5cb58ca805ce95.tar.xz
org.eclipse.osee-3553e04b163167f7ad6a6d753e5cb58ca805ce95.zip
feature[ats_8G0FW]: Remove HRIDs as an ID
Diffstat (limited to 'plugins/org.eclipse.osee.framework.manager.servlet')
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/AtsXmlSearch.java8
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/IdUtils.java5
2 files changed, 3 insertions, 10 deletions
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/AtsXmlSearch.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/AtsXmlSearch.java
index 6bfd982109e..26cac2fefb9 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/AtsXmlSearch.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/AtsXmlSearch.java
@@ -55,7 +55,7 @@ public class AtsXmlSearch {
return toReturn;
}
- public String multiIdsToXPath(String idsWithCommas) throws OseeCoreException {
+ public String multiIdsToXPath(String idsWithCommas) {
List<String> predicates = new ArrayList<String>();
if (Strings.isValid(idsWithCommas)) {
String[] ids = idsWithCommas.split("[\\s,]+");
@@ -66,16 +66,14 @@ public class AtsXmlSearch {
return Collections.toString(" or ", predicates);
}
- public String idToXPath(String id) throws OseeCoreException {
+ public String idToXPath(String id) {
StringBuilder builder = new StringBuilder();
if (IdUtils.isValidLegacyId(id)) {
builder.append("workflowPcrId=");
} else if (IdUtils.isValidGUID(id)) {
builder.append("workflowId=");
- } else if (IdUtils.isValidHRID(id)) {
- builder.append("workflowHrid=");
} else {
- throw new OseeCoreException("Invalid id [%s]", id);
+ builder.append("workflowAtsId=");
}
if (builder.length() > 0) {
builder.append("\"" + id + "\"");
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/IdUtils.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/IdUtils.java
index 7c3516d6d70..3fba09804cd 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/IdUtils.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/IdUtils.java
@@ -13,7 +13,6 @@ package org.eclipse.osee.framework.manager.servlet.ats;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.eclipse.osee.framework.jdk.core.util.GUID;
-import org.eclipse.osee.framework.jdk.core.util.HumanReadableId;
/**
* @author Roberto E. Escobar
@@ -26,10 +25,6 @@ public final class IdUtils {
private IdUtils() {
}
- public static boolean isValidHRID(String hrid) {
- return HumanReadableId.isValid(hrid);
- }
-
public static boolean isValidGUID(String guid) {
return GUID.isValid(guid);
}

Back to the top