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 2010/07/10 02:45:16 UTC
svn commit: r962735 -
/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java
Author: jfaath
Date: Sat Jul 10 00:45:16 2010
New Revision: 962735
URL: http://svn.apache.org/viewvc?rev=962735&view=rev
Log:
reverting previous commit to fix build
Modified:
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java?rev=962735&r1=962734&r2=962735&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java Sat Jul 10 00:45:16 2010
@@ -68,18 +68,10 @@ public class ValidateInquiry extends Val
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.NoKeys"));
HashSet<String> dupCheck = new HashSet<String>();
- int i = 0;
for (String entityKey : entityKeyList) {
-
- // Per section 4.4: keys must be case-folded
- entityKey = entityKey.toLowerCase();
- entityKeyList.set(i, entityKey);
-
boolean inserted = dupCheck.add(entityKey);
if (!inserted)
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.DuplicateKey", entityKey));
-
- i++;
}
}
@@ -95,18 +87,10 @@ public class ValidateInquiry extends Val
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.NoKeys"));
HashSet<String> dupCheck = new HashSet<String>();
- int i = 0;
for (String entityKey : entityKeyList) {
-
- // Per section 4.4: keys must be case-folded
- entityKey = entityKey.toLowerCase();
- entityKeyList.set(i, entityKey);
-
boolean inserted = dupCheck.add(entityKey);
if (!inserted)
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.DuplicateKey", entityKey));
-
- i++;
}
}
@@ -122,18 +106,10 @@ public class ValidateInquiry extends Val
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.NoKeys"));
HashSet<String> dupCheck = new HashSet<String>();
- int i = 0;
for (String entityKey : entityKeyList) {
-
- // Per section 4.4: keys must be case-folded
- entityKey = entityKey.toLowerCase();
- entityKeyList.set(i, entityKey);
-
boolean inserted = dupCheck.add(entityKey);
if (!inserted)
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.DuplicateKey", entityKey));
-
- i++;
}
}
@@ -149,18 +125,10 @@ public class ValidateInquiry extends Val
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.NoKeys"));
HashSet<String> dupCheck = new HashSet<String>();
- int i = 0;
for (String entityKey : entityKeyList) {
-
- // Per section 4.4: keys must be case-folded
- entityKey = entityKey.toLowerCase();
- entityKeyList.set(i, entityKey);
-
boolean inserted = dupCheck.add(entityKey);
if (!inserted)
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.DuplicateKey", entityKey));
-
- i++;
}
}
@@ -176,18 +144,10 @@ public class ValidateInquiry extends Val
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.NoKeys"));
HashSet<String> dupCheck = new HashSet<String>();
- int i = 0;
for (String entityKey : entityKeyList) {
-
- // Per section 4.4: keys must be case-folded
- entityKey = entityKey.toLowerCase();
- entityKeyList.set(i, entityKey);
-
boolean inserted = dupCheck.add(entityKey);
if (!inserted)
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.DuplicateKey", entityKey));
-
- i++;
}
}
@@ -235,7 +195,7 @@ public class ValidateInquiry extends Val
if (body.getCategoryBag() == null && body.getFindTModel() == null && body.getTModelBag() == null)
throw new FatalErrorException(new ErrorMessage("errors.findbinding.NoInput"));
-
+
validateFindQualifiers(body.getFindQualifiers());
validateTModelBag(body.getTModelBag());
validateFindTModel(body.getFindTModel(), true);
@@ -279,24 +239,17 @@ public class ValidateInquiry extends Val
boolean fromKeyExists = false;
if (body.getBusinessKey() != null && body.getBusinessKey().length() > 0) {
businessKeyExists = true;
-
- // Per section 4.4: keys must be case-folded
- body.setBusinessKey(body.getBusinessKey().toLowerCase());
+
}
if (body.getFromKey() != null && body.getFromKey().length() > 0) {
fromKeyExists = true;
if (businessKeyExists)
throw new FatalErrorException(new ErrorMessage("errors.findrelatedbusiness.MultipleInput"));
-
- // Per section 4.4: keys must be case-folded
- body.setFromKey(body.getFromKey().toLowerCase());
+
}
if (body.getToKey() != null && body.getToKey().length() > 0) {
if (businessKeyExists || fromKeyExists)
throw new FatalErrorException(new ErrorMessage("errors.findrelatedbusiness.MultipleInput"));
-
- // Per section 4.4: keys must be case-folded
- body.setToKey(body.getToKey().toLowerCase());
}
KeyedReference keyedRef = body.getKeyedReference();
@@ -306,8 +259,6 @@ public class ValidateInquiry extends Val
keyedRef.getKeyValue() == null || keyedRef.getKeyValue().length() == 0)
throw new ValueNotAllowedException(new ErrorMessage("errors.findrelatedbusiness.BlankKeyedRef"));
}
- validateKeyedReference(keyedRef);
-
}
@@ -328,15 +279,6 @@ public class ValidateInquiry extends Val
if (tmodelBag.getTModelKey() == null || tmodelBag.getTModelKey().size() == 0)
throw new ValueNotAllowedException(new ErrorMessage("errors.tmodelbag.NoInput"));
- List<String> keyList = tmodelBag.getTModelKey();
- int i = 0;
- for (String key : keyList) {
- // Per section 4.4: keys must be case-folded
- key = key.toLowerCase();
- keyList.set(i, key);
- i++;
- }
-
}
public void validateDiscoveryUrls(org.uddi.api_v3.DiscoveryURLs discUrls) throws DispositionReportFaultMessage {
@@ -391,9 +333,6 @@ public class ValidateInquiry extends Val
if (krg instanceof org.uddi.api_v3.KeyedReferenceGroup) {
if (krg.getTModelKey() == null || krg.getTModelKey().length() == 0)
throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NoTModelKey"));
-
- // Per section 4.4: keys must be case-folded
- krg.setTModelKey(krg.getTModelKey().toLowerCase());
}
}
@@ -406,9 +345,6 @@ public class ValidateInquiry extends Val
if (kr.getTModelKey() == null || kr.getTModelKey().length() == 0)
throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NoTModelKey"));
- // Per section 4.4: keys must be case-folded
- kr.setTModelKey(kr.getTModelKey().toLowerCase());
-
if (kr.getKeyValue() == null || kr.getKeyValue().length() == 0)
throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NoKeyValue"));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org