Author: kstam
Date: Mon Jan 27 20:00:43 2014
New Revision: 1561820
URL: http://svn.apache.org/r1561820
Log:
JUDDI-809 adding finding all services for a businessKey
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java?rev=1561820&r1=1561819&r2=1561820&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/InquiryHelper.java
Mon Jan 27 20:00:43 2014
@@ -61,6 +61,7 @@ import org.uddi.api_v3.FindRelatedBusine
import org.uddi.api_v3.FindService;
import org.uddi.api_v3.FindTModel;
import org.uddi.api_v3.ListDescription;
+import org.uddi.api_v3.Name;
import org.uddi.api_v3.RelatedBusinessesList;
import org.uddi.api_v3.ServiceList;
import org.uddi.api_v3.TModelBag;
@@ -296,6 +297,14 @@ public class InquiryHelper {
keysFound = FindServiceByCategoryQuery.select(em,
findQualifiers, body.getCategoryBag(), body.getBusinessKey(), keysFound);
}
keysFound = FindServiceByCategoryGroupQuery.select(em,
findQualifiers, body.getCategoryBag(), body.getBusinessKey(), keysFound);
+
+ if (body.getFindTModel()==null && body.getCategoryBag()==null
&&
+ ( body.getTModelBag()==null ||
body.getTModelBag().getTModelKey().size() == 0)
+ && body.getName().size() == 0 &&
body.getBusinessKey() != null) {
+ //support searching for all services for a business
+ findQualifiers.setApproximateMatch(true);
+ body.getName().add(new Name("%", null));
+ }
keysFound = FindServiceByNameQuery.select(em, findQualifiers,
body.getName(), body.getBusinessKey(), keysFound);
if (body.getTModelBag().getTModelKey().size()==0)
body.setTModelBag(null);
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java?rev=1561820&r1=1561819&r2=1561820&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java
Mon Jan 27 20:00:43 2014
@@ -235,7 +235,10 @@ public class ValidateInquiry extends Val
throw new FatalErrorException(new
ErrorMessage("errors.NullInput"));
}
- if (body.getCategoryBag() == null && body.getFindTModel() ==
null && body.getTModelBag() == null && body.getName().size() == 0) {
+ if (body.getCategoryBag() == null && body.getFindTModel() ==
null &&
+ (body.getTModelBag() == null ||
body.getTModelBag().getTModelKey().size() == 0)
+ && body.getName().size() == 0 &&
body.getBusinessKey() == null)
+ {
throw new FatalErrorException(new
ErrorMessage("errors.findservice.NoInput"));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
