You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by tc...@apache.org on 2009/08/13 16:04:02 UTC
svn commit: r803891 - in /webservices/juddi/trunk:
juddi-core/src/main/java/org/apache/juddi/config/
juddi-core/src/main/java/org/apache/juddi/mapping/
juddi-core/src/main/java/org/apache/juddi/query/
juddi-core/src/main/java/org/apache/juddi/validatio...
Author: tcunning
Date: Thu Aug 13 14:04:01 2009
New Revision: 803891
URL: http://svn.apache.org/viewvc?rev=803891&view=rev
Log:
JUDDI-263
Remove getContent() methods and replace them relevant getter methods
(like for instance getOverviewDoc()).
Modified:
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateInquiry.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java
webservices/juddi/trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckValidator.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/CategoryBag.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/InstanceDetails.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/KeysOwned.java
webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/OverviewDoc.java
webservices/juddi/trunk/uddi-ws/src/test/java/org/uddi/api_v3/AuthInfoTest.java
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java?rev=803891&r1=803890&r2=803891&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java Thu Aug 13 14:04:01 2009
@@ -140,7 +140,7 @@
KeyedReference keyedRef = new KeyedReference();
keyedRef.setTModelKey(Constants.NODE_CATEGORY_TMODEL);
keyedRef.setKeyValue(Constants.NODE_KEYVALUE);
- categoryBag.getContent().add(new ObjectFactory().createKeyedReference(keyedRef));
+ categoryBag.getKeyedReference().add(keyedRef);
List<?> keyList = FindBusinessByCategoryQuery.select(em, new FindQualifiers(), categoryBag, null);
if (keyList != null && keyList.size() > 1)
throw new ConfigurationException("Only one business entity can be categorized as the node.");
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java?rev=803891&r1=803890&r2=803891&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java Thu Aug 13 14:04:01 2009
@@ -35,6 +35,7 @@
/**
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
* @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
*/
public class MappingApiToModel {
private static Logger logger = Logger.getLogger(MappingApiToModel.class);
@@ -357,18 +358,21 @@
throws DispositionReportFaultMessage {
if (apiCategoryBag != null) {
- List<JAXBElement<?>> apiCategoryList = apiCategoryBag.getContent();
- for (JAXBElement<?> elem : apiCategoryList) {
-
- if (elem.getValue() instanceof org.uddi.api_v3.KeyedReference) {
+ List krList = apiCategoryBag.getKeyedReference();
+ List<org.uddi.api_v3.KeyedReferenceGroup> krgList = apiCategoryBag.getKeyedReferenceGroup();
+ for (Object elem : krList) {
+ if (elem instanceof org.uddi.api_v3.KeyedReference) {
+ org.uddi.api_v3.KeyedReference kr = (org.uddi.api_v3.KeyedReference) elem;
List<org.apache.juddi.model.KeyedReference> modelKeyedReferences=modelCategoryBag.getKeyedReferences();
//modelKeyedReferences.clear();
- org.uddi.api_v3.KeyedReference apiKeyedReference = (org.uddi.api_v3.KeyedReference)elem.getValue();
+ org.uddi.api_v3.KeyedReference apiKeyedReference = (org.uddi.api_v3.KeyedReference)elem;
modelKeyedReferences.add(new org.apache.juddi.model.KeyedReference(modelCategoryBag,
apiKeyedReference.getTModelKey(), apiKeyedReference.getKeyName(), apiKeyedReference.getKeyValue()));
}
- if (elem.getValue() instanceof org.uddi.api_v3.KeyedReferenceGroup) {
- org.uddi.api_v3.KeyedReferenceGroup apiKeyedReferenceGroup = (org.uddi.api_v3.KeyedReferenceGroup) elem.getValue();
+ }
+ for (org.uddi.api_v3.KeyedReferenceGroup elem : krgList) {
+ if (elem instanceof org.uddi.api_v3.KeyedReferenceGroup) {
+ org.uddi.api_v3.KeyedReferenceGroup apiKeyedReferenceGroup = (org.uddi.api_v3.KeyedReferenceGroup) elem;
org.apache.juddi.model.KeyedReferenceGroup modelKeyedReferenceGroup = new org.apache.juddi.model.KeyedReferenceGroup();
List<org.apache.juddi.model.KeyedReferenceGroup> modelKeyedReferenceGroups=modelCategoryBag.getKeyedReferenceGroups();
@@ -438,23 +442,20 @@
modelTmodelInstInfo.getInstanceDetailsDescrs().clear();
if (apiInstanceDetails != null) {
- List<JAXBElement<?>> apiInstanceDetailsContent = apiInstanceDetails.getContent();
- for (JAXBElement<?> elem : apiInstanceDetailsContent) {
- if (elem.getValue() instanceof org.uddi.api_v3.Description) {
- org.uddi.api_v3.Description apiDesc = (org.uddi.api_v3.Description)elem.getValue();
- org.apache.juddi.model.InstanceDetailsDescr modelInstanceDetailsDescr =
- new org.apache.juddi.model.InstanceDetailsDescr(
- modelTmodelInstInfo, apiDesc.getLang(), apiDesc.getValue());
- modelTmodelInstInfo.getInstanceDetailsDescrs().add(modelInstanceDetailsDescr);
- } else if (elem.getValue() instanceof org.uddi.api_v3.OverviewDoc) {
- org.uddi.api_v3.OverviewDoc apiOverviewDoc = (org.uddi.api_v3.OverviewDoc)elem.getValue();
- org.apache.juddi.model.OverviewDoc modelOverviewDoc = new org.apache.juddi.model.OverviewDoc(modelTmodelInstInfo);
- mapOverviewDoc(apiOverviewDoc, modelOverviewDoc);
- modelTmodelInstInfo.getOverviewDocs().add(modelOverviewDoc);
- } else if (elem.getValue() instanceof String) {
- modelTmodelInstInfo.setInstanceParms((String)elem.getValue());
- }
+ List<org.uddi.api_v3.Description> descriptions = apiInstanceDetails.getDescription();
+ List<org.uddi.api_v3.OverviewDoc> overviewdocs = apiInstanceDetails.getOverviewDoc();
+ for (org.uddi.api_v3.Description apiDesc : descriptions) {
+ org.apache.juddi.model.InstanceDetailsDescr modelInstanceDetailsDescr =
+ new org.apache.juddi.model.InstanceDetailsDescr(
+ modelTmodelInstInfo, apiDesc.getLang(), apiDesc.getValue());
+ modelTmodelInstInfo.getInstanceDetailsDescrs().add(modelInstanceDetailsDescr);
+ }
+ for (org.uddi.api_v3.OverviewDoc apiOverviewDoc : overviewdocs) {
+ org.apache.juddi.model.OverviewDoc modelOverviewDoc = new org.apache.juddi.model.OverviewDoc(modelTmodelInstInfo);
+ mapOverviewDoc(apiOverviewDoc, modelOverviewDoc);
+ modelTmodelInstInfo.getOverviewDocs().add(modelOverviewDoc);
}
+ modelTmodelInstInfo.setInstanceParms((String)apiInstanceDetails.getInstanceParms());
}
}
@@ -463,20 +464,24 @@
throws DispositionReportFaultMessage {
if (apiOverviewDoc != null) {
- List<JAXBElement<?>> apiOverviewDocContent = apiOverviewDoc.getContent();
- for (JAXBElement<?> elem : apiOverviewDocContent) {
- if (elem.getValue() instanceof org.uddi.api_v3.OverviewURL) {
- org.uddi.api_v3.OverviewURL overviewURL = (org.uddi.api_v3.OverviewURL) elem.getValue();
- modelOverviewDoc.setOverviewUrl(overviewURL.getValue());
- modelOverviewDoc.setOverviewUrlUseType(overviewURL.getUseType());
- } else if (elem.getValue() instanceof org.uddi.api_v3.Description) {
- org.uddi.api_v3.Description description = (org.uddi.api_v3.Description) elem.getValue();
+ List descContent = apiOverviewDoc.getDescription();
+ for (Object elem : descContent) {
+ org.uddi.api_v3.Description description = (org.uddi.api_v3.Description) elem;
+ if (description != null) {
org.apache.juddi.model.OverviewDocDescr modelOverviewDocDescr
= new org.apache.juddi.model.OverviewDocDescr(
- modelOverviewDoc, description.getLang(), description.getValue());
+ modelOverviewDoc, description.getLang(), description.getValue());
modelOverviewDoc.getOverviewDocDescrs().add(modelOverviewDocDescr);
- }
+ }
}
+
+ org.uddi.api_v3.OverviewURL elem = apiOverviewDoc.getOverviewURL();
+ if (elem instanceof org.uddi.api_v3.OverviewURL) {
+ org.uddi.api_v3.OverviewURL overviewURL = (org.uddi.api_v3.OverviewURL) elem;
+ modelOverviewDoc.setOverviewUrl(overviewURL.getValue());
+ modelOverviewDoc.setOverviewUrlUseType(overviewURL.getUseType());
+ }
+
}
}
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java?rev=803891&r1=803890&r2=803891&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java Thu Aug 13 14:04:01 2009
@@ -396,23 +396,20 @@
if (modelCategoryBag != null) {
if (apiCategoryBag == null)
apiCategoryBag = new org.uddi.api_v3.CategoryBag();
-
- List<JAXBElement<?>> apiCategoryList = apiCategoryBag.getContent();
- apiCategoryList.clear();
-
+
for (org.apache.juddi.model.KeyedReference modelKeyedReference : modelCategoryBag.getKeyedReferences()) {
org.uddi.api_v3.KeyedReference apiKeyedReference = new org.uddi.api_v3.KeyedReference();
apiKeyedReference.setTModelKey(modelKeyedReference.getTmodelKeyRef());
apiKeyedReference.setKeyName(modelKeyedReference.getKeyName());
apiKeyedReference.setKeyValue(modelKeyedReference.getKeyValue());
- apiCategoryList.add(new ObjectFactory().createKeyedReference(apiKeyedReference));
+ apiCategoryBag.getKeyedReference().add(apiKeyedReference);
}
for (org.apache.juddi.model.KeyedReferenceGroup modelKeyedReferenceGroup : modelCategoryBag.getKeyedReferenceGroups()) {
org.uddi.api_v3.KeyedReferenceGroup apiKeyedReferenceGroup = new org.uddi.api_v3.KeyedReferenceGroup();
mapKeyedReferenceGroup(modelKeyedReferenceGroup, apiKeyedReferenceGroup);
- apiCategoryList.add(new ObjectFactory().createKeyedReferenceGroup(apiKeyedReferenceGroup));
+ apiCategoryBag.getKeyedReferenceGroup().add(apiKeyedReferenceGroup);
}
}
return apiCategoryBag;
@@ -481,17 +478,15 @@
if (apiInstanceDetails == null)
apiInstanceDetails = new org.uddi.api_v3.InstanceDetails();
- List<JAXBElement<?>> apiInstanceDetailsContent = apiInstanceDetails.getContent();
- apiInstanceDetailsContent.clear();
//InstanceParms
- apiInstanceDetailsContent.add(new ObjectFactory().createInstanceParms(modelTModelInstInfo.getInstanceParms()));
+ apiInstanceDetails.setInstanceParms(modelTModelInstInfo.getInstanceParms());
//Descriptions
List<org.apache.juddi.model.InstanceDetailsDescr> modelInstDetailsDescrList = modelTModelInstInfo.getInstanceDetailsDescrs();
for (org.apache.juddi.model.InstanceDetailsDescr modelInstDetailDescr : modelInstDetailsDescrList) {
org.uddi.api_v3.Description apiDesc = new org.uddi.api_v3.Description();
apiDesc.setLang(modelInstDetailDescr.getLangCode());
apiDesc.setValue(modelInstDetailDescr.getDescr());
- apiInstanceDetailsContent.add(new ObjectFactory().createDescription(apiDesc));
+ apiInstanceDetails.getDescription().add(apiDesc);
}
//OverviewDoc
mapOverviewDocs(modelTModelInstInfo.getOverviewDocs(),apiInstanceDetails,null);
@@ -505,8 +500,6 @@
{
for (OverviewDoc modelOverviewDoc : modelOverviewDocs) {
org.uddi.api_v3.OverviewDoc apiOverviewDoc = new org.uddi.api_v3.OverviewDoc();
- List<JAXBElement<?>> apiOverviewDocContent = apiOverviewDoc.getContent();
- apiOverviewDocContent.clear();
//Descriptions
List<org.apache.juddi.model.OverviewDocDescr> overviewDocDescrList = modelOverviewDoc.getOverviewDocDescrs();
@@ -514,16 +507,16 @@
org.uddi.api_v3.Description apiDesc = new org.uddi.api_v3.Description();
apiDesc.setLang(overviewDocDescr.getLangCode());
apiDesc.setValue(overviewDocDescr.getDescr());
- apiOverviewDocContent.add(new ObjectFactory().createDescription(apiDesc));
+ apiOverviewDoc.getDescription().add(apiDesc);
}
//OverviewURL
org.uddi.api_v3.OverviewURL apiOverviewURL = new org.uddi.api_v3.OverviewURL();
apiOverviewURL.setUseType(modelOverviewDoc.getOverviewUrlUseType());
apiOverviewURL.setValue(modelOverviewDoc.getOverviewUrl());
- apiOverviewDocContent.add(new ObjectFactory().createOverviewURL(apiOverviewURL));
+ apiOverviewDoc.setOverviewURL(apiOverviewURL);
//Set the entity on the apiOverviewDoc
if (apiInstanceDetails!=null) {
- apiInstanceDetails.getContent().add(new ObjectFactory().createOverviewDoc(apiOverviewDoc));
+ apiInstanceDetails.getOverviewDoc().add(apiOverviewDoc);
} else {
apiTModel.getOverviewDoc().add(apiOverviewDoc);
}
@@ -697,10 +690,10 @@
Collections.sort((List<String>)businessKeys);
if (Collections.binarySearch((List<String>)businessKeys, modelPublisherAssertion.getBusinessEntityByFromKey().getEntityKey()) >= 0)
- keysOwned.getContent().add(new ObjectFactory().createFromKey(modelPublisherAssertion.getBusinessEntityByFromKey().getEntityKey()));
+ keysOwned.getFromKey().add(modelPublisherAssertion.getBusinessEntityByFromKey().getEntityKey());
if (Collections.binarySearch((List<String>)businessKeys, modelPublisherAssertion.getBusinessEntityByToKey().getEntityKey()) >= 0)
- keysOwned.getContent().add(new ObjectFactory().createToKey(modelPublisherAssertion.getBusinessEntityByToKey().getEntityKey()));
+ keysOwned.setToKey(modelPublisherAssertion.getBusinessEntityByToKey().getEntityKey());
}
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java?rev=803891&r1=803890&r2=803891&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryGroupQuery.java Thu Aug 13 14:04:01 2009
@@ -125,14 +125,14 @@
if (categoryBag == null)
return keysIn;
- List<JAXBElement<?>> categories = categoryBag.getContent();
+ List<KeyedReferenceGroup> categories = categoryBag.getKeyedReferenceGroup();
if (categories == null || categories.size() == 0)
return keysIn;
List<KeyedReferenceGroup> keyedRefGroups = new ArrayList<KeyedReferenceGroup>(0);
- for (JAXBElement<?> elem : categories) {
- if (elem.getValue() instanceof KeyedReferenceGroup)
- keyedRefGroups.add((KeyedReferenceGroup)elem.getValue());
+ for (KeyedReferenceGroup elem : categories) {
+ if (elem instanceof KeyedReferenceGroup)
+ keyedRefGroups.add((KeyedReferenceGroup)elem);
}
if (keyedRefGroups.size() == 0)
return keysIn;
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java?rev=803891&r1=803890&r2=803891&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java Thu Aug 13 14:04:01 2009
@@ -114,14 +114,14 @@
if (categoryBag == null)
return keysIn;
- List<JAXBElement<?>> categories = categoryBag.getContent();
+ List<KeyedReference> categories = categoryBag.getKeyedReference();
if (categories == null || categories.size() == 0)
return keysIn;
List<KeyedReference> keyedRefs = new ArrayList<KeyedReference>(0);
- for (JAXBElement<?> elem : categories) {
- if (elem.getValue() instanceof KeyedReference)
- keyedRefs.add((KeyedReference)elem.getValue());
+ for (KeyedReference elem : categories) {
+ if (elem instanceof KeyedReference)
+ keyedRefs.add((KeyedReference)elem);
}
if (keyedRefs.size() == 0)
return keysIn;
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=803891&r1=803890&r2=803891&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 Thu Aug 13 14:04:01 2009
@@ -34,6 +34,7 @@
import org.uddi.api_v3.FindTModel;
import org.uddi.api_v3.FindRelatedBusinesses;
import org.uddi.api_v3.KeyedReference;
+import org.uddi.api_v3.KeyedReferenceGroup;
import org.uddi.api_v3.Name;
import org.uddi.api_v3.ObjectFactory;
import org.uddi.api_v3.TModelBag;
@@ -50,6 +51,7 @@
/**
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ * @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
*/
public class ValidateInquiry extends ValidateUDDIApi {
@@ -300,12 +302,16 @@
return;
// If category bag does exist, it must have at least one element
- List<JAXBElement<?>> elems = categories.getContent();
+ List<KeyedReference> elems = categories.getKeyedReference();
if (elems == null || elems.size() == 0)
throw new ValueNotAllowedException(new ErrorMessage("errors.categorybag.NoInput"));
- for (JAXBElement<?> elem : elems) {
- validateKeyedReferenceTypes(elem);
+ for (KeyedReference elem : elems) {
+ validateKeyedReference(elem);
+ }
+ List<KeyedReferenceGroup> krgs = categories.getKeyedReferenceGroup();
+ for (KeyedReferenceGroup elem : krgs) {
+ validateKeyedReferenceGroup(elem);
}
}
@@ -321,33 +327,32 @@
throw new ValueNotAllowedException(new ErrorMessage("errors.identifierbag.NoInput"));
for (org.uddi.api_v3.KeyedReference keyedRef : keyedRefList) {
- validateKeyedReferenceTypes(new ObjectFactory().createKeyedReference(keyedRef));
+ validateKeyedReference(keyedRef);
}
}
- public void validateKeyedReferenceTypes(JAXBElement<?> elem) throws DispositionReportFaultMessage {
- if (elem == null || elem.getValue() == null)
- throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NullInput"));
-
+ public void validateKeyedReferenceGroup (KeyedReferenceGroup krg) throws DispositionReportFaultMessage {
// Keyed reference groups must contain a tModelKey
- if (elem.getValue() instanceof org.uddi.api_v3.KeyedReferenceGroup) {
- org.uddi.api_v3.KeyedReferenceGroup krg = (org.uddi.api_v3.KeyedReferenceGroup)elem.getValue();
+ if (krg instanceof org.uddi.api_v3.KeyedReferenceGroup) {
if (krg.getTModelKey() == null || krg.getTModelKey().length() == 0)
throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NoTModelKey"));
}
+ }
+
+ public void validateKeyedReference(KeyedReference kr) throws DispositionReportFaultMessage {
+ if (kr == null)
+ throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NullInput"));
+
// Keyed references must contain a tModelKey and keyValue
- else if (elem.getValue() instanceof org.uddi.api_v3.KeyedReference) {
- org.uddi.api_v3.KeyedReference kr = (org.uddi.api_v3.KeyedReference)elem.getValue();
+ if (kr instanceof org.uddi.api_v3.KeyedReference) {
if (kr.getTModelKey() == null || kr.getTModelKey().length() == 0)
throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NoTModelKey"));
if (kr.getKeyValue() == null || kr.getKeyValue().length() == 0)
- throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NoKeyValue"));
-
+ throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NoKeyValue"));
}
}
-
-
+
private void validateFindQualifiers(org.uddi.api_v3.FindQualifiers findQualifiers) throws DispositionReportFaultMessage {
if (findQualifiers == null)
return;
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java?rev=803891&r1=803890&r2=803891&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java Thu Aug 13 14:04:01 2009
@@ -23,6 +23,8 @@
import javax.xml.bind.JAXBElement;
import javax.xml.ws.Holder;
+import org.uddi.api_v3.KeyedReference;
+import org.uddi.api_v3.KeyedReferenceGroup;
import org.uddi.api_v3.Name;
import org.uddi.api_v3.ObjectFactory;
import org.uddi.api_v3.DeleteBusiness;
@@ -30,6 +32,8 @@
import org.uddi.api_v3.DeletePublisherAssertions;
import org.uddi.api_v3.DeleteService;
import org.uddi.api_v3.DeleteTModel;
+import org.uddi.api_v3.OverviewDoc;
+import org.uddi.api_v3.OverviewURL;
import org.uddi.api_v3.SaveBusiness;
import org.uddi.api_v3.SaveService;
import org.uddi.api_v3.SaveBinding;
@@ -57,6 +61,7 @@
/**
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ * @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
*/
public class ValidatePublish extends ValidateUDDIApi {
@@ -823,12 +828,15 @@
return;
// If category bag does exist, it must have at least one element
- List<JAXBElement<?>> elems = categories.getContent();
- if (elems == null || elems.size() == 0)
+ List elems = categories.getKeyedReference();
+ List<KeyedReferenceGroup> groups = categories.getKeyedReferenceGroup();
+ if (groups.size() == 0 && elems.size() == 0)
throw new ValueNotAllowedException(new ErrorMessage("errors.categorybag.NoInput"));
- for (JAXBElement<?> elem : elems) {
- validateKeyedReferenceTypes(elem);
+ for (Object elem : elems) {
+ if (elem instanceof org.uddi.api_v3.KeyedReference) {
+ validateKeyedReference((KeyedReference) elem);
+ }
}
}
@@ -844,35 +852,28 @@
throw new ValueNotAllowedException(new ErrorMessage("errors.identifierbag.NoInput"));
for (org.uddi.api_v3.KeyedReference keyedRef : keyedRefList) {
- validateKeyedReferenceTypes(new ObjectFactory().createKeyedReference(keyedRef));
+ validateKeyedReference(keyedRef);
}
}
-
- public void validateKeyedReferenceTypes(JAXBElement<?> elem) throws DispositionReportFaultMessage {
- if (elem == null || elem.getValue() == null)
- throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NullInput"));
-
+
+ public void validateKeyedReferenceGroup(KeyedReferenceGroup krg) throws DispositionReportFaultMessage {
// Keyed reference groups must contain a tModelKey
- if (elem.getValue() instanceof org.uddi.api_v3.KeyedReferenceGroup) {
- org.uddi.api_v3.KeyedReferenceGroup krg = (org.uddi.api_v3.KeyedReferenceGroup)elem.getValue();
- if (krg.getTModelKey() == null || krg.getTModelKey().length() == 0)
- throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NoTModelKey"));
- }
- // Keyed references must contain a tModelKey and keyValue
- else if (elem.getValue() instanceof org.uddi.api_v3.KeyedReference) {
- org.uddi.api_v3.KeyedReference kr = (org.uddi.api_v3.KeyedReference)elem.getValue();
- if (kr.getTModelKey() == null || kr.getTModelKey().length() == 0)
- throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NoTModelKey"));
-
- if (kr.getKeyValue() == null || kr.getKeyValue().length() == 0)
- throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NoKeyValue"));
-
- // Per section 6.2.2.1 of the specification, no publishers (except the root) are allowed to use the node categorization tmodelKey
- if (Constants.NODE_CATEGORY_TMODEL.equalsIgnoreCase(kr.getTModelKey())) {
- if (!Constants.ROOT_PUBLISHER.equals(publisher.getAuthorizedName()))
- throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NodeCategoryTModel", Constants.NODE_CATEGORY_TMODEL));
- }
+ if (krg.getTModelKey() == null || krg.getTModelKey().length() == 0)
+ throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NoTModelKey"));
+ }
+
+ public void validateKeyedReference(KeyedReference kr) throws DispositionReportFaultMessage {
+ if (kr.getTModelKey() == null || kr.getTModelKey().length() == 0)
+ throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NoTModelKey"));
+
+ if (kr.getKeyValue() == null || kr.getKeyValue().length() == 0)
+ throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NoKeyValue"));
+
+ // Per section 6.2.2.1 of the specification, no publishers (except the root) are allowed to use the node categorization tmodelKey
+ if (Constants.NODE_CATEGORY_TMODEL.equalsIgnoreCase(kr.getTModelKey())) {
+ if (!Constants.ROOT_PUBLISHER.equals(publisher.getAuthorizedName()))
+ throw new ValueNotAllowedException(new ErrorMessage("errors.keyedreference.NodeCategoryTModel", Constants.NODE_CATEGORY_TMODEL));
}
}
@@ -911,26 +912,10 @@
return;
// At least one OverviewDoc or instanceParms must be supplied
- List<JAXBElement<?>> elems = instDetails.getContent();
- if (elems == null || elems.size() == 0)
+ List<OverviewDoc> elems = instDetails.getOverviewDoc();
+ if (instDetails.getInstanceParms() == null && elems.size() == 0)
throw new ValueNotAllowedException(new ErrorMessage("errors.instdetails.NoOverviewOrParms"));
- // At least one OverviewDoc or instanceParms must be supplied
- boolean overviewOrParmsFound = false;
- for (JAXBElement<?> elem : elems) {
- if (elem.getValue() instanceof org.uddi.api_v3.OverviewDoc) {
- overviewOrParmsFound = true;
- org.uddi.api_v3.OverviewDoc od = (org.uddi.api_v3.OverviewDoc)elem.getValue();
- validateOverviewDoc(od);
- }
- else if (elem.getValue() instanceof String) {
- overviewOrParmsFound = true;
- }
- }
-
- if (!overviewOrParmsFound)
- throw new ValueNotAllowedException(new ErrorMessage("errors.instdetails.NoOverviewOrParms"));
-
}
public void validateOverviewDoc(org.uddi.api_v3.OverviewDoc overviewDoc) throws DispositionReportFaultMessage {
@@ -939,8 +924,8 @@
throw new ValueNotAllowedException(new ErrorMessage("errors.overviewdoc.NullInput"));
// At least one description or overview URL must be supplied
- List<JAXBElement<?>> elems = overviewDoc.getContent();
- if (elems == null || elems.size() == 0)
+ List<org.uddi.api_v3.Description> elems = overviewDoc.getDescription();
+ if ((elems == null || elems.size() == 0 ) && overviewDoc.getOverviewURL() == null)
throw new ValueNotAllowedException(new ErrorMessage("errors.overviewdoc.NoDescOrUrl"));
}
Modified: webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java?rev=803891&r1=803890&r2=803891&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java (original)
+++ webservices/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateUDDIKey.java Thu Aug 13 14:04:01 2009
@@ -30,6 +30,7 @@
/**
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ * @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
*/
public class ValidateUDDIKey {
@@ -82,13 +83,12 @@
// A key generator key should have exactly one category and it's key value should be 'keyGenerator'
org.uddi.api_v3.CategoryBag categories = tModel.getCategoryBag();
if (categories != null) {
- List<JAXBElement<?>> elems = categories.getContent();
+ List<org.uddi.api_v3.KeyedReference> elems = categories.getKeyedReference();
if (elems != null && elems.size() == 1) {
- JAXBElement<?> elem = elems.get(0);
+ org.uddi.api_v3.KeyedReference elem = elems.get(0);
if (elem != null) {
- Object obj = elem.getValue();
- if (obj != null && obj instanceof org.uddi.api_v3.KeyedReference) {
- String keyedValue = ((org.uddi.api_v3.KeyedReference)obj).getKeyValue();
+ if (elem != null && elem instanceof org.uddi.api_v3.KeyedReference) {
+ String keyedValue = ((org.uddi.api_v3.KeyedReference)elem).getKeyValue();
if (keyedValue != null) {
if (keyedValue.equalsIgnoreCase(KeyGenerator.KEYGENERATOR_SUFFIX))
return;
Modified: webservices/juddi/trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckValidator.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckValidator.java?rev=803891&r1=803890&r2=803891&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckValidator.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckValidator.java Thu Aug 13 14:04:01 2009
@@ -17,6 +17,7 @@
/**
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
* @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
*/
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue;
@@ -150,25 +151,23 @@
assertEquals(cbag1, cbag2);
return;
}
- List<JAXBElement<?>> elemList1 = cbag1.getContent();
- List<JAXBElement<?>> elemList2 = cbag2.getContent();
+ List<KeyedReference> elemList1 = cbag1.getKeyedReference();
+ List<KeyedReference> elemList2 = cbag2.getKeyedReference();
if (elemList1 == null || elemList2 == null) {
assertEquals(elemList1, elemList2);
return;
}
// In object could have KeyedReferenceGroups which are ignored. For now, only solo KeyedReferences are checked.
//assertEquals(elemList1.size(), elemList2.size());
- Iterator<JAXBElement<?>> elemList1Itr = elemList1.iterator();
- Iterator<JAXBElement<?>> elemList2Itr = elemList2.iterator();
+ Iterator<KeyedReference> elemList1Itr = elemList1.iterator();
+ Iterator<KeyedReference> elemList2Itr = elemList2.iterator();
while (elemList1Itr.hasNext()) {
- JAXBElement<?> elem1 = elemList1Itr.next();
- if (elem1.getValue() instanceof org.uddi.api_v3.KeyedReference) {
- JAXBElement<?> elem2 = elemList2Itr.next();
- KeyedReference kr1 = (KeyedReference)elem1.getValue();
- KeyedReference kr2 = (KeyedReference)elem2.getValue();;
- assertEquals(kr1.getTModelKey(), kr2.getTModelKey());
- assertEquals(kr1.getKeyName(), kr2.getKeyName());
- assertEquals(kr1.getKeyValue(), kr2.getKeyValue());
+ KeyedReference elem1 = elemList1Itr.next();
+ if (elem1 instanceof org.uddi.api_v3.KeyedReference) {
+ KeyedReference elem2 = elemList2Itr.next();
+ assertEquals(elem1.getTModelKey(), elem2.getTModelKey());
+ assertEquals(elem1.getKeyName(), elem2.getKeyName());
+ assertEquals(elem1.getKeyValue(), elem2.getKeyValue());
}
// add comparing keyedReferenceGroup
}
@@ -221,57 +220,64 @@
assertEquals(ids1, ids2);
return;
}
- List<JAXBElement<?>> elem1s = ids1.getContent();
- List<JAXBElement<?>> elem2s = ids2.getContent();
- Iterator<JAXBElement<?>> elem1 = elem1s.iterator();
+ List<Description> elem1s = ids1.getDescription();
+ List<Description> elem2s = ids2.getDescription();
+ Iterator<Description> elem1 = elem1s.iterator();
+
+ boolean isMatch=false;
+
+ if (elem1s.size() == 0 && elem2s.size() == 0) {
+ isMatch = true;
+ }
while (elem1.hasNext()) {
- boolean isMatch=false;
- JAXBElement<?> element1 = elem1.next();
+ Description desc1 = elem1.next();
- if (element1.getValue() instanceof org.uddi.api_v3.Description) {
+ if (desc1 instanceof org.uddi.api_v3.Description) {
//Descriptions
- Description desc1 = (Description) element1.getValue();
- Iterator<JAXBElement<?>> elem2 = elem2s.iterator();
+ Iterator<Description> elem2 = elem2s.iterator();
while (elem2.hasNext()) {
- JAXBElement<?> element2 = elem2.next();
- if (element2.getValue() instanceof org.uddi.api_v3.Description) {
- Description desc2 = (Description) element2.getValue();
+ Description desc2 = elem2.next();
+ if (desc2 instanceof org.uddi.api_v3.Description) {
if (desc1.getLang().equals(desc2.getLang()) && desc1.getValue().equals(desc2.getValue())) {
isMatch=true;
break;
}
}
}
- } else if (element1.getValue() instanceof org.uddi.api_v3.OverviewDoc) {
+ }
+ }
+ assertTrue(isMatch);
+
+
+ List<OverviewDoc> odoc1s = ids1.getOverviewDoc();
+ List<OverviewDoc> odoc2s = ids2.getOverviewDoc();
+ Iterator<OverviewDoc> docelem1 = odoc1s.iterator();
+ isMatch = false;
+ if (odoc1s.size() == 0 && odoc2s.size() == 0) {
+ isMatch = true;
+ }
+
+ while (docelem1.hasNext()) {
+ OverviewDoc odoc1 = docelem1.next();
+ if (odoc1 instanceof org.uddi.api_v3.OverviewDoc) {
//OverviewDocs
- OverviewDoc doc1 = (OverviewDoc) element1.getValue();
- checkOverviewDocs(doc1, elem2s);
+ checkOverviewDocs(odoc1, odoc2s);
isMatch=true;
- } else if (element1.getValue() instanceof String) {
- //InstanceParams
- Iterator<JAXBElement<?>> elem2 = elem2s.iterator();
- while (elem2.hasNext()) {
- JAXBElement<?> element2 = elem2.next();
- if (element1.getValue() instanceof String) {
- assertEquals((String)element1.getValue(),(String)element2.getValue());
- }
- isMatch=true;
- break;
- }
}
- assertTrue(isMatch);
}
+
+ assertEquals((String)ids1.getInstanceParms(),(String)ids2.getInstanceParms());
+ assertTrue(isMatch);
}
- public static void checkOverviewDocs(OverviewDoc doc1, List<JAXBElement<?>> elem2s) {
+ public static void checkOverviewDocs(OverviewDoc doc1, List<OverviewDoc> elem2s) {
boolean isMatch=false;
- Iterator<JAXBElement<?>> elem2 = elem2s.iterator();
+ Iterator<OverviewDoc> elem2 = elem2s.iterator();
//Match against any OverviewDocs in the elem2 list
while (elem2.hasNext()) {
- JAXBElement<?> element2 = elem2.next();
- if (element2.getValue() instanceof org.uddi.api_v3.OverviewDoc) {
- OverviewDoc doc2 = (OverviewDoc) element2.getValue();
+ OverviewDoc doc2 = elem2.next();
+ if (doc2 instanceof org.uddi.api_v3.OverviewDoc) {
//match doc1 against this doc2
isMatch = compareOverviewDocs(doc1, doc2);
if (isMatch) break;
@@ -296,42 +302,33 @@
{
boolean descMatch=false;
boolean urlMatch =false;
- List<JAXBElement<?>> odElem1List = doc1.getContent();
- Iterator<JAXBElement<?>> odElem1 = odElem1List.iterator();
- while (odElem1.hasNext()) {
- JAXBElement<?> odElement1 = odElem1.next();
- if (odElement1.getValue() instanceof org.uddi.api_v3.Description) {
- Description descr1 = (Description) odElement1.getValue();
- List<JAXBElement<?>> odElem2List = doc2.getContent();
- Iterator<JAXBElement<?>> odElem2 = odElem2List.iterator();
- while (odElem2.hasNext()) {
- JAXBElement<?> odElement2 = odElem2.next();
- if (odElement2.getValue() instanceof org.uddi.api_v3.Description) {
- Description descr2 = (Description) odElement2.getValue();
- if (descr1.getLang().equals(descr2.getLang()) && descr1.getValue().equals(descr2.getValue())) {
- descMatch=true;
- break;
- }
- }
- }
- } else if (odElement1.getValue() instanceof org.uddi.api_v3.OverviewURL) {
- OverviewURL url1 = (OverviewURL) odElement1.getValue();
- List<JAXBElement<?>> odElem2List = doc2.getContent();
- Iterator<JAXBElement<?>> odElem2 = odElem2List.iterator();
- while (odElem2.hasNext()) {
- JAXBElement<?> odElement2 = odElem2.next();
- if (odElement2.getValue() instanceof org.uddi.api_v3.OverviewURL) {
- OverviewURL url2 = (OverviewURL) odElement2.getValue();
- if (url1.getUseType().equals(url2.getUseType()) && url1.getValue().equals(url2.getValue())) {
- urlMatch=true;
- break;
- }
- }
+
+ OverviewURL url1 = (OverviewURL) doc1.getOverviewURL();
+ OverviewURL url2 = (OverviewURL) doc2.getOverviewURL();
+ if (url1.getUseType().equals(url2.getUseType()) && url1.getValue().equals(url2.getValue())) {
+ urlMatch=true;
+ }
+
+
+ List<Description> descList1 = doc1.getDescription();
+ Iterator<Description> descIter1 = descList1.iterator();
+ if (descList1.size() == 0 && doc2.getDescription().size() == 0) {
+ descMatch = true;
+ }
+ while (descIter1.hasNext()) {
+ Description descr1 = (Description) descIter1.next();
+ List<Description> descList2 = doc2.getDescription();
+ Iterator<Description> descElem2 = descList2.iterator();
+ while (descElem2.hasNext()) {
+ Description descr2 = descElem2.next();
+ if (descr1.getLang().equals(descr2.getLang()) && descr1.getValue().equals(descr2.getValue())) {
+ descMatch=true;
}
}
- if (urlMatch && descMatch || ( odElem1List.size()==1 && (urlMatch || descMatch)) ) {
+ }
+
+ if (urlMatch && descMatch) {
return true;
- }
}
return false;
}
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/CategoryBag.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/CategoryBag.java?rev=803891&r1=803890&r2=803891&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/CategoryBag.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/CategoryBag.java Thu Aug 13 14:04:01 2009
@@ -24,6 +24,7 @@
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementRefs;
import javax.xml.bind.annotation.XmlTransient;
@@ -55,17 +56,16 @@
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "categoryBag", propOrder = {
- "content"
+ "keyedReference", "keyedReferenceGroup"
})
-public class CategoryBag implements Serializable{
-
+public class CategoryBag implements Serializable {
@XmlTransient
private static final long serialVersionUID = 1L;
- @XmlElementRefs({
- @XmlElementRef(name = "keyedReference", namespace = "urn:uddi-org:api_v3", type = JAXBElement.class),
- @XmlElementRef(name = "keyedReferenceGroup", namespace = "urn:uddi-org:api_v3", type = JAXBElement.class)
- })
- protected List<JAXBElement<?>> content;
+
+ @XmlElement
+ protected List<KeyedReference> keyedReference;
+ @XmlElement
+ protected List<KeyedReferenceGroup> keyedReferenceGroup;
/**
* Gets the rest of the content model.
@@ -100,12 +100,18 @@
*
*
*/
- public List<JAXBElement<?>> getContent() {
- if (content == null) {
- content = new ArrayList<JAXBElement<?>>();
+ public List<KeyedReference> getKeyedReference() {
+ if (keyedReference == null) {
+ keyedReference = new ArrayList<KeyedReference>();
}
- return this.content;
+ return this.keyedReference;
+ }
+
+ public List<KeyedReferenceGroup> getKeyedReferenceGroup() {
+ if (keyedReferenceGroup == null) {
+ keyedReferenceGroup = new ArrayList<KeyedReferenceGroup>();
+ }
+ return this.keyedReferenceGroup;
}
-
}
\ No newline at end of file
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/InstanceDetails.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/InstanceDetails.java?rev=803891&r1=803890&r2=803891&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/InstanceDetails.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/InstanceDetails.java Thu Aug 13 14:04:01 2009
@@ -24,11 +24,14 @@
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementRefs;
import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
/**
* <p>Java class for instanceDetails complex type.
@@ -58,58 +61,40 @@
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "instanceDetails", propOrder = {
- "content"
+ "instanceParms", "description", "overviewDoc"
})
-public class InstanceDetails implements Serializable{
+public class InstanceDetails implements Serializable {
@XmlTransient
private static final long serialVersionUID = 1L;
- @XmlElementRefs({
- @XmlElementRef(name = "instanceParms", namespace = "urn:uddi-org:api_v3", type = JAXBElement.class),
- @XmlElementRef(name = "description", namespace = "urn:uddi-org:api_v3", type = JAXBElement.class),
- @XmlElementRef(name = "overviewDoc", namespace = "urn:uddi-org:api_v3", type = JAXBElement.class)
- })
- protected List<JAXBElement<?>> content;
- /**
- * Gets the rest of the content model.
- *
- * <p>
- * You are getting this "catch-all" property because of the following reason:
- * The field name "InstanceParms" is used by two different parts of a schema. See:
- * line 329 of file:/C:/Development/Projects/jUDDI_v3/uddi-ws/src/main/resources/uddi_v3.xsd
- * line 327 of file:/C:/Development/Projects/jUDDI_v3/uddi-ws/src/main/resources/uddi_v3.xsd
- * <p>
- * To get rid of this property, apply a property customization to one
- * of both of the following declarations to change their names:
- * Gets the value of the content property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the content property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getContent().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link Description }{@code >}
- * {@link JAXBElement }{@code <}{@link String }{@code >}
- * {@link JAXBElement }{@code <}{@link OverviewDoc }{@code >}
- *
- *
- */
- public List<JAXBElement<?>> getContent() {
- if (content == null) {
- content = new ArrayList<JAXBElement<?>>();
+ @XmlElement
+ protected String instanceParms;
+ @XmlElement
+ protected List<Description> description;
+ @XmlElement
+ protected List<OverviewDoc> overviewDoc;
+
+ public void setInstanceParms(String instanceParms) {
+ this.instanceParms = instanceParms;
+ }
+
+ public String getInstanceParms() {
+ return instanceParms;
+ }
+
+ public List<OverviewDoc> getOverviewDoc() {
+ if (overviewDoc == null) {
+ overviewDoc = new ArrayList<OverviewDoc>();
+ }
+ return this.overviewDoc;
+ }
+
+ public List<Description> getDescription() {
+ if (description == null) {
+ description = new ArrayList<Description>();
}
- return this.content;
+ return this.description;
}
}
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/KeysOwned.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/KeysOwned.java?rev=803891&r1=803890&r2=803891&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/KeysOwned.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/KeysOwned.java Thu Aug 13 14:04:01 2009
@@ -24,6 +24,8 @@
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementRefs;
import javax.xml.bind.annotation.XmlTransient;
@@ -55,18 +57,20 @@
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "keysOwned", propOrder = {
- "content"
})
-public class KeysOwned implements Serializable{
+public class KeysOwned implements Serializable {
@XmlTransient
private static final long serialVersionUID = 1L;
- @XmlElementRefs({
- @XmlElementRef(name = "fromKey", namespace = "urn:uddi-org:api_v3", type = JAXBElement.class),
- @XmlElementRef(name = "toKey", namespace = "urn:uddi-org:api_v3", type = JAXBElement.class)
- })
- protected List<JAXBElement<String>> content;
+
+ @XmlElement
+ protected List<String> fromKey;
+
+ @XmlElement
+ protected String toKey;
+
+
/**
* Gets the rest of the content model.
*
@@ -100,12 +104,17 @@
*
*
*/
- public List<JAXBElement<String>> getContent() {
- if (content == null) {
- content = new ArrayList<JAXBElement<String>>();
- }
- return this.content;
+ public String getToKey() {
+ return toKey;
}
+ public void setToKey(String toKey) {
+ this.toKey = toKey;
+ }
+
+ public List<String> getFromKey() {
+ return fromKey;
+ }
+
}
\ No newline at end of file
Modified: webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/OverviewDoc.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/OverviewDoc.java?rev=803891&r1=803890&r2=803891&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/OverviewDoc.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/OverviewDoc.java Thu Aug 13 14:04:01 2009
@@ -24,6 +24,8 @@
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementRefs;
import javax.xml.bind.annotation.XmlTransient;
@@ -55,19 +57,28 @@
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "overviewDoc", propOrder = {
- "content"
+ "overviewURL", "description"
})
-public class OverviewDoc implements Serializable{
-
+public class OverviewDoc implements Serializable {
+
@XmlTransient
private static final long serialVersionUID = 1L;
- @XmlElementRefs({
- @XmlElementRef(name = "overviewURL", namespace = "urn:uddi-org:api_v3", type = JAXBElement.class),
- @XmlElementRef(name = "description", namespace = "urn:uddi-org:api_v3", type = JAXBElement.class)
- })
- protected List<JAXBElement<?>> content;
+ @XmlElement
+ protected List<Description> description;
+ @XmlElement(required = false)
+ protected OverviewURL overviewURL;
+
+
+ public OverviewURL getOverviewURL() {
+ return overviewURL;
+ }
+
- /**
+ public void setOverviewURL(OverviewURL overviewURL) {
+ this.overviewURL = overviewURL;
+ }
+
+ /**
* Gets the rest of the content model.
*
* <p>
@@ -100,12 +111,12 @@
*
*
*/
- public List<JAXBElement<?>> getContent() {
- if (content == null) {
- content = new ArrayList<JAXBElement<?>>();
+ public List<Description> getDescription() {
+ if (description == null) {
+ description = new ArrayList<Description>();
}
- return this.content;
+ return this.description;
}
-
+
}
\ No newline at end of file
Modified: webservices/juddi/trunk/uddi-ws/src/test/java/org/uddi/api_v3/AuthInfoTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/src/test/java/org/uddi/api_v3/AuthInfoTest.java?rev=803891&r1=803890&r2=803891&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/src/test/java/org/uddi/api_v3/AuthInfoTest.java (original)
+++ webservices/juddi/trunk/uddi-ws/src/test/java/org/uddi/api_v3/AuthInfoTest.java Thu Aug 13 14:04:01 2009
@@ -77,6 +77,8 @@
boolean assertion = EXPECTED_XML_FRAGMENT1.equals(actualXml) || EXPECTED_XML_FRAGMENT2.equals(actualXml);
assertTrue(assertion);
} catch (JAXBException jaxbe) {
+ jaxbe.printStackTrace();
+
fail("No exception should be thrown");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org