SCOUT-127 set the FindQualifier defaults as they are for UDDI v2.
git-svn-id: https://svn.apache.org/repos/asf/juddi/scout/trunk@1295116 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java b/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java
index 2f3fd57..3e61e45 100644
--- a/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java
+++ b/src/main/java/org/apache/ws/scout/registry/BusinessQueryManagerV3Impl.java
@@ -957,28 +957,32 @@
static FindQualifiers mapFindQualifiers(Collection jaxrQualifiers) throws UnsupportedCapabilityException
{
- if (jaxrQualifiers == null)
- {
- return null;
- }
FindQualifiers result = objectFactory.createFindQualifiers();
- for (Iterator i = jaxrQualifiers.iterator(); i.hasNext();)
- {
- String jaxrQualifier = (String) i.next();
- String juddiQualifier = jaxrQualifier;
-
- // SCOUT-111
- // If the JAXR qualifier is exactNameMatch, then
- // set the UDDI v3 qualifier to exactMatch
- if ("exactNameMatch".equals(jaxrQualifier)) {
- juddiQualifier = "exactMatch";
- }
-
- if (juddiQualifier == null)
+ boolean exact = false;
+ if (jaxrQualifiers != null) {
+ for (Iterator i = jaxrQualifiers.iterator(); i.hasNext();)
{
- throw new UnsupportedCapabilityException("jUDDI does not support FindQualifer: " + jaxrQualifier);
+ String jaxrQualifier = (String) i.next();
+ String juddiQualifier = jaxrQualifier;
+
+ // SCOUT-111
+ // If the JAXR qualifier is exactNameMatch, then
+ // set the UDDI v3 qualifier to exactMatch
+ if ("exactNameMatch".equals(jaxrQualifier) || "exactMatch".equals(jaxrQualifier)) {
+ juddiQualifier = "exactMatch";
+ exact = true;
+ }
+
+ if (juddiQualifier == null)
+ {
+ throw new UnsupportedCapabilityException("jUDDI does not support FindQualifer: " + jaxrQualifier);
+ }
+ result.getFindQualifier().add(juddiQualifier);
}
- result.getFindQualifier().add(juddiQualifier);
+ }
+ if (!exact) {
+ //Making it backwards compatible with UDDIv2, so the JAXR tests don't get confused.
+ result.getFindQualifier().add("approximateMatch");
}
return result;
}
