You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by jf...@apache.org on 2009/05/27 02:31:18 UTC
svn commit: r778935 - in /webservices/juddi/branches/v3_trunk:
juddi-core/src/main/java/org/apache/juddi/query/
uddi-tck/src/main/resources/uddi_data/find/
Author: jfaath
Date: Wed May 27 00:31:17 2009
New Revision: 778935
URL: http://svn.apache.org/viewvc?rev=778935&view=rev
Log:
JUDDI-235: wildcards are no longer added automatically when "approximateMatch" is set
Modified:
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java
webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findBusiness1.xml
webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findTModel1.xml
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java?rev=778935&r1=778934&r2=778935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java Wed May 27 00:31:17 2009
@@ -221,8 +221,9 @@
String keyName = keyedRef.getKeyName();
if (fq.isApproximateMatch()) {
- keyValue = keyValue.endsWith(DynamicQuery.WILDCARD)?keyValue:keyValue + DynamicQuery.WILDCARD;
- keyName = keyName.endsWith(DynamicQuery.WILDCARD)?keyName:keyName + DynamicQuery.WILDCARD;
+ // JUDDI-235: wildcards are provided by user (only commenting in case a new interpretation arises)
+ //keyValue = keyValue.endsWith(DynamicQuery.WILDCARD)?keyValue:keyValue + DynamicQuery.WILDCARD;
+ //keyName = keyName.endsWith(DynamicQuery.WILDCARD)?keyName:keyName + DynamicQuery.WILDCARD;
}
tblCount++;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java?rev=778935&r1=778934&r2=778935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java Wed May 27 00:31:17 2009
@@ -166,8 +166,9 @@
String keyName = keyedRef.getKeyName();
if (fq.isApproximateMatch()) {
- keyValue = keyValue.endsWith(DynamicQuery.WILDCARD)?keyValue:keyValue + DynamicQuery.WILDCARD;
- keyName = keyName.endsWith(DynamicQuery.WILDCARD)?keyName:keyName + DynamicQuery.WILDCARD;
+ // JUDDI-235: wildcards are provided by user (only commenting in case a new interpretation arises)
+ //keyValue = keyValue.endsWith(DynamicQuery.WILDCARD)?keyValue:keyValue + DynamicQuery.WILDCARD;
+ //keyName = keyName.endsWith(DynamicQuery.WILDCARD)?keyName:keyName + DynamicQuery.WILDCARD;
}
// Either opening up (and AND'ing) a new "group" of like keys or simply appending an "or". If this is not "orLikeKeys", then just need to increment
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java?rev=778935&r1=778934&r2=778935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByIdentifierQuery.java Wed May 27 00:31:17 2009
@@ -152,8 +152,9 @@
String keyName = keyedRef.getKeyName();
if (fq.isApproximateMatch()) {
- keyValue = keyValue.endsWith(DynamicQuery.WILDCARD)?keyValue:keyValue + DynamicQuery.WILDCARD;
- keyName = keyName.endsWith(DynamicQuery.WILDCARD)?keyName:keyName + DynamicQuery.WILDCARD;
+ // JUDDI-235: wildcards are provided by user (only commenting in case a new interpretation arises)
+ //keyValue = keyValue.endsWith(DynamicQuery.WILDCARD)?keyValue:keyValue + DynamicQuery.WILDCARD;
+ //keyName = keyName.endsWith(DynamicQuery.WILDCARD)?keyName:keyName + DynamicQuery.WILDCARD;
}
// Either opening up (and AND'ing) a new "group" of like keys or simply appending an "or". If this is not "orLikeKeys", then just need to increment
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java?rev=778935&r1=778934&r2=778935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByNamesQuery.java Wed May 27 00:31:17 2009
@@ -125,13 +125,15 @@
nameTerm = "upper(" + entityAliasChild + ".name)";
nameValue = n.getValue().toUpperCase();
}
- if (fq.isApproximateMatch())
- nameValue = nameValue.endsWith(DynamicQuery.WILDCARD)?nameValue:nameValue + DynamicQuery.WILDCARD;
+ // JUDDI-235: wildcards are provided by user (only commenting in case a new interpretation arises)
+ //if (fq.isApproximateMatch())
+ // nameValue = nameValue.endsWith(DynamicQuery.WILDCARD)?nameValue:nameValue + DynamicQuery.WILDCARD;
if (n.getLang() == null || n.getLang().length() == 0 ) {
qry.appendGroupedAnd(new DynamicQuery.Parameter(nameTerm, nameValue, namePredicate));
}
else {
+ // Per spec, the language argument is always wildcarded and case insensitive
String langValue = n.getLang().endsWith(DynamicQuery.WILDCARD)?n.getLang().toUpperCase():n.getLang().toUpperCase() + DynamicQuery.WILDCARD;
qry.appendGroupedAnd(new DynamicQuery.Parameter(nameTerm, nameValue, namePredicate),
new DynamicQuery.Parameter("upper(" + entityAliasChild + ".langCode)", langValue, DynamicQuery.PREDICATE_LIKE));
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java?rev=778935&r1=778934&r2=778935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java Wed May 27 00:31:17 2009
@@ -81,8 +81,9 @@
nameTerm = "upper(" + ENTITY_ALIAS + ".name)";
nameValue = name.getValue().toUpperCase();
}
- if (fq.isApproximateMatch())
- nameValue = nameValue.endsWith(DynamicQuery.WILDCARD)?nameValue:nameValue + DynamicQuery.WILDCARD;
+ // JUDDI-235: wildcards are provided by user (only commenting in case a new interpretation arises)
+ //if (fq.isApproximateMatch())
+ // nameValue = nameValue.endsWith(DynamicQuery.WILDCARD)?nameValue:nameValue + DynamicQuery.WILDCARD;
if (name.getLang() == null || name.getLang().length() == 0 ) {
qry.appendGroupedAnd(new DynamicQuery.Parameter(nameTerm, nameValue, namePredicate));
Modified: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findBusiness1.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findBusiness1.xml?rev=778935&r1=778934&r2=778935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findBusiness1.xml (original)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findBusiness1.xml Wed May 27 00:31:17 2009
@@ -21,17 +21,17 @@
<findQualifier>caseInsensitiveMatch</findQualifier>
<findQualifier>approximateMatch</findQualifier>
</findQualifiers>
- <name xml:lang="en">john</name>
- <name xml:lang="en">A-1</name>
+ <name xml:lang="en">john%</name>
+ <name xml:lang="en">A-1%</name>
<identifierBag>
- <keyedReference tModelKey="uddi:tmodelkey:identifier" keyName="identify" keyValue="identity" />
- <keyedReference tModelKey="uddi:tmodelkey:identifier" keyName="identify" keyValue="identityX" />
+ <keyedReference tModelKey="uddi:tmodelkey:identifier" keyName="identify" keyValue="identity%" />
+ <keyedReference tModelKey="uddi:tmodelkey:identifier" keyName="identify" keyValue="identityX%" />
</identifierBag>
<categoryBag>
- <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="apples" />
- <keyedReference tModelKey="uddi:tmodelkey:categories:music" keyName="category" keyValue="blues" />
+ <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="apples%" />
+ <keyedReference tModelKey="uddi:tmodelkey:categories:music" keyName="category" keyValue="blues%" />
<keyedReferenceGroup tModelKey="uddi:tmodelKey:group">
- <keyedReference tModelKey="uddi:tmodelKey:blank" keyName="blank" keyValue="blank" />
+ <keyedReference tModelKey="uddi:tmodelKey:blank" keyName="blank" keyValue="blank%" />
</keyedReferenceGroup>
</categoryBag>
<discoveryURLs>
@@ -44,6 +44,6 @@
<findQualifier>approximateMatch</findQualifier>
<findQualifier>andAllKeys</findQualifier>
</findQualifiers>
- <name>uddi-org:serverAuthenticatedSSL3</name>
+ <name>uddi-org:serverAuthenticatedSSL3%</name>
</find_tModel>
</find_business>
Modified: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findTModel1.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findTModel1.xml?rev=778935&r1=778934&r2=778935&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findTModel1.xml (original)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findTModel1.xml Wed May 27 00:31:17 2009
@@ -21,9 +21,9 @@
<findQualifier>approximateMatch</findQualifier>
<findQualifier>andAllKeys</findQualifier>
</findQualifiers>
- <name>Joe Publisher</name>
+ <name>Joe Publisher%</name>
<categoryBag>
- <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
- keyValue="keyGenerator" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator%"
+ keyValue="keyGenerator%" />
</categoryBag>
</find_tModel>
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org