Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport/AspNetTransport.cs URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport/AspNetTransport.cs?rev=1565898&r1=1565897&r2=1565898&view=diff ============================================================================== --- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport/AspNetTransport.cs (original) +++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport/AspNetTransport.cs Sat Feb 8 03:21:26 2014 @@ -73,9 +73,9 @@ namespace org.apache.juddi.v3.client.tra this.subscriptionListenerService.Url = clientConfig.getUDDINode(nodeName).getSubscriptionListenerUrl(); } - public override JUDDIApiService getJUDDIApiService(string enpointURL) + public override JUDDIApiService getJUDDIApiService(string endpointURL) { - this.publisherService.Url = enpointURL; + this.publisherService.Url = endpointURL; return this.publisherService; } @@ -84,39 +84,39 @@ namespace org.apache.juddi.v3.client.tra return this.publisherService; } - public override UDDI_Inquiry_SoapBinding getUDDIInquiryService(string enpointURL) + public override UDDI_Inquiry_SoapBinding getUDDIInquiryService(string endpointURL) { - this.inquiryService.Url = enpointURL; + this.inquiryService.Url = endpointURL; return this.inquiryService; } - public override UDDI_Security_SoapBinding getUDDISecurityService(string enpointURL) + public override UDDI_Security_SoapBinding getUDDISecurityService(string endpointURL) { - this.securityService.Url = enpointURL; + this.securityService.Url = endpointURL; return this.securityService; } - public override UDDI_Publication_SoapBinding getUDDIPublishService(string enpointURL) + public override UDDI_Publication_SoapBinding getUDDIPublishService(string endpointURL) { - this.publishService.Url = enpointURL; + this.publishService.Url = endpointURL; return this.publishService; } - public override UDDI_Subscription_SoapBinding getUDDISubscriptionService(string enpointURL) + public override UDDI_Subscription_SoapBinding getUDDISubscriptionService(string endpointURL) { - this.subscriptionService.Url = enpointURL; + this.subscriptionService.Url = endpointURL; return this.subscriptionService; } - public override UDDI_CustodyTransfer_SoapBinding getUDDICustodyTransferService(string enpointURL) + public override UDDI_CustodyTransfer_SoapBinding getUDDICustodyTransferService(string endpointURL) { - this.custodyTransferService.Url = enpointURL; + this.custodyTransferService.Url = endpointURL; return this.custodyTransferService; } - public override UDDI_SubscriptionListener_SoapBinding getUDDISubscriptionListenerService(string enpointURL) + public override UDDI_SubscriptionListener_SoapBinding getUDDISubscriptionListenerService(string endpointURL) { - this.subscriptionListenerService.Url = enpointURL; + this.subscriptionListenerService.Url = endpointURL; return this.subscriptionListenerService; }
Added: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport/AspNetv2TranslationTransport.cs URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport/AspNetv2TranslationTransport.cs?rev=1565898&view=auto ============================================================================== --- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport/AspNetv2TranslationTransport.cs (added) +++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport/AspNetv2TranslationTransport.cs Sat Feb 8 03:21:26 2014 @@ -0,0 +1,62 @@ +using org.apache.juddi.apiv3; +using org.apache.juddi.v3.client.transport.wrapper; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace org.apache.juddi.v3.client.transport +{ + public class AspNetv2TranslationTransport : AspNetTransport + { + + String nodeName = null; + String clientName = null; + Inquiry3to2 inquiryService = new Inquiry3to2(); + Publish3to2 publishService = new Publish3to2(); + Security3to2 securityService = new Security3to2(); + + JUDDIApiService publisherService = new JUDDIApiService(); + private string managerName; + private config.ClientConfig clientConfig; + + + public AspNetv2TranslationTransport(string managerName, string nodeName, config.ClientConfig clientConfig) + { + this.managerName = managerName; + this.nodeName = nodeName; + this.clientConfig = clientConfig; + this.inquiryService.Url = clientConfig.getUDDINode(nodeName).getInquiryUrl(); + this.publisherService.Url = clientConfig.getUDDINode(nodeName).getJuddiApiUrl(); + this.publishService.Url = clientConfig.getUDDINode(nodeName).getPublishUrl(); + this.securityService.Url = clientConfig.getUDDINode(nodeName).getSecurityUrl(); + + } + public override uddi.apiv3.UDDI_Inquiry_SoapBinding getUDDIInquiryService() + { + return inquiryService; + } + public override uddi.apiv3.UDDI_Inquiry_SoapBinding getUDDIInquiryService(string endpointURL) + { + return new Inquiry3to2(endpointURL); + } + public override uddi.apiv3.UDDI_Publication_SoapBinding getUDDIPublishService(string endpointURL) + { + return new Publish3to2(endpointURL); + } + public override uddi.apiv3.UDDI_Publication_SoapBinding getUDDIPublishService() + { + return this.publishService; + } + public override uddi.apiv3.UDDI_Security_SoapBinding getUDDISecurityService() + { + return this.securityService; + } + + public override uddi.apiv3.UDDI_Security_SoapBinding getUDDISecurityService(string endpointURL) + { + return new Security3to2(endpointURL); + } + + } +} Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport/Transport.cs URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport/Transport.cs?rev=1565898&r1=1565897&r2=1565898&view=diff ============================================================================== --- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport/Transport.cs (original) +++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.transport/Transport.cs Sat Feb 8 03:21:26 2014 @@ -26,13 +26,13 @@ namespace org.apache.juddi.v3.client.tra public readonly static String DEFAULT_NODE_NAME = "default"; - public abstract UDDI_Inquiry_SoapBinding getUDDIInquiryService(String enpointURL);// throws TransportException; - public abstract UDDI_Security_SoapBinding getUDDISecurityService(String enpointURL);// throws TransportException; - public abstract UDDI_Publication_SoapBinding getUDDIPublishService(String enpointURL);// throws TransportException; - public abstract UDDI_Subscription_SoapBinding getUDDISubscriptionService(String enpointURL);// throws TransportException; - public abstract UDDI_CustodyTransfer_SoapBinding getUDDICustodyTransferService(String enpointURL);// throws TransportException; - public abstract UDDI_SubscriptionListener_SoapBinding getUDDISubscriptionListenerService(String enpointURL);// throws TransportException; - public abstract JUDDIApiService getJUDDIApiService(String enpointURL);// throws TransportException; + public abstract UDDI_Inquiry_SoapBinding getUDDIInquiryService(String endpointURL);// throws TransportException; + public abstract UDDI_Security_SoapBinding getUDDISecurityService(String endpointURL);// throws TransportException; + public abstract UDDI_Publication_SoapBinding getUDDIPublishService(String endpointURL);// throws TransportException; + public abstract UDDI_Subscription_SoapBinding getUDDISubscriptionService(String endpointURL);// throws TransportException; + public abstract UDDI_CustodyTransfer_SoapBinding getUDDICustodyTransferService(String endpointURL);// throws TransportException; + public abstract UDDI_SubscriptionListener_SoapBinding getUDDISubscriptionListenerService(String endpointURL);// throws TransportException; + public abstract JUDDIApiService getJUDDIApiService(String endpointURL);// throws TransportException; public abstract UDDI_Inquiry_SoapBinding getUDDIInquiryService();// throws TransportException { Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv3Tov2.java URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv3Tov2.java?rev=1565898&r1=1565897&r2=1565898&view=diff ============================================================================== --- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv3Tov2.java (original) +++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/MapUDDIv3Tov2.java Sat Feb 8 03:21:26 2014 @@ -109,9 +109,9 @@ import org.uddi.v3_service.DispositionRe * @author <a href="mailto:[email protected]";>Alex O'Ree</a> */ public class MapUDDIv3Tov2 { - + public static final String VERSION = "2.0"; - + public static org.uddi.api_v2.BusinessEntity MapBusiness(org.uddi.api_v3.BusinessEntity be, String operator) { if (be == null) { return null; @@ -124,7 +124,7 @@ public class MapUDDIv3Tov2 { item.setIdentifierBag(MapIdentBag(be.getIdentifierBag())); item.setOperator(operator); item.getDescription().addAll(MapDescription(be.getDescription())); - + item.getName().addAll(MapName(be.getName())); if (be.getBusinessServices() != null && !be.getBusinessServices().getBusinessService().isEmpty()) { item.setBusinessServices(new BusinessServices()); @@ -132,7 +132,7 @@ public class MapUDDIv3Tov2 { } return item; } - + public static org.uddi.api_v2.BusinessService MapService(org.uddi.api_v3.BusinessService be) { if (be == null) { return null; @@ -149,7 +149,7 @@ public class MapUDDIv3Tov2 { } return item; } - + public static List<org.uddi.api_v2.BusinessService> MapService(List<org.uddi.api_v3.BusinessService> be) { if (be == null) { return null; @@ -160,24 +160,24 @@ public class MapUDDIv3Tov2 { } return item; } - + public static org.uddi.api_v2.BindingTemplate MapBinding(org.uddi.api_v3.BindingTemplate be) { if (be == null) { return null; } BindingTemplate item = new org.uddi.api_v2.BindingTemplate(); item.getDescription().addAll(MapDescription(be.getDescription())); - + item.setBindingKey(be.getBindingKey()); item.setServiceKey(be.getServiceKey()); item.setAccessPoint(MapAccessPoint(be.getAccessPoint())); item.setHostingRedirector(MapHostingRedir(be.getHostingRedirector())); - + item.setTModelInstanceDetails(MapTModelInstanceDetails(be.getTModelInstanceDetails())); - + return item; } - + public static List<org.uddi.api_v2.BindingTemplate> MapBinding(List<org.uddi.api_v3.BindingTemplate> be) { if (be == null) { return null; @@ -188,7 +188,7 @@ public class MapUDDIv3Tov2 { } return item; } - + public static org.uddi.api_v2.TModel MapTModel(org.uddi.api_v3.TModel be) { if (be == null) { return null; @@ -202,7 +202,7 @@ public class MapUDDIv3Tov2 { item.setOverviewDoc(MapOverviewDoc(be.getOverviewDoc())); return item; } - + private static List<Name> MapName(List<org.uddi.api_v3.Name> name) { List<Name> items = new ArrayList<Name>(); for (int i = 0; i < name.size(); i++) { @@ -211,7 +211,7 @@ public class MapUDDIv3Tov2 { } return items; } - + private static CategoryBag MapCategoryBag(org.uddi.api_v3.CategoryBag categoryBag) { if (categoryBag == null) { return null; @@ -220,7 +220,7 @@ public class MapUDDIv3Tov2 { c.getKeyedReference().addAll(MapKeyedReference(categoryBag.getKeyedReference())); return c; } - + private static List<Description> MapDescription(List<org.uddi.api_v3.Description> description) { List<Description> ret = new ArrayList<Description>(); if (description == null || description.isEmpty()) { @@ -230,11 +230,11 @@ public class MapUDDIv3Tov2 { ret.add(new Description(description.get(i).getValue(), description.get(i).getLang())); } return ret; - + } - + private static IdentifierBag MapIdentBag(org.uddi.api_v3.IdentifierBag identifierBag) { - + if (identifierBag == null) { return null; } @@ -254,22 +254,22 @@ public class MapUDDIv3Tov2 { return null; } OverviewDoc r = new OverviewDoc(); - + r.getDescription().addAll(MapDescription(overviewDoc.get(0).getDescription())); if (overviewDoc.get(0).getOverviewURL() != null && overviewDoc.get(0).getOverviewURL().getValue() != null) { r.setOverviewURL(overviewDoc.get(0).getOverviewURL().getValue()); } - + return r; } - + private static AccessPoint MapAccessPoint(org.uddi.api_v3.AccessPoint accessPoint) { if (accessPoint == null) { return null; } return new AccessPoint(accessPoint.getValue(), MapURLType(accessPoint.getValue())); } - + private static HostingRedirector MapHostingRedir(org.uddi.api_v3.HostingRedirector hostingRedirector) { if (hostingRedirector == null) { return null; @@ -278,7 +278,7 @@ public class MapUDDIv3Tov2 { r.setBindingKey(hostingRedirector.getBindingKey()); return r; } - + private static TModelInstanceDetails MapTModelInstanceDetails(org.uddi.api_v3.TModelInstanceDetails tModelInstanceDetails) { if (tModelInstanceDetails == null) { return new TModelInstanceDetails(); @@ -287,7 +287,7 @@ public class MapUDDIv3Tov2 { r.getTModelInstanceInfo().addAll(MapTModelInstanceInfo(tModelInstanceDetails.getTModelInstanceInfo())); return r; } - + private static List<KeyedReference> MapKeyedReference(List<org.uddi.api_v3.KeyedReference> keyedReference) { List<KeyedReference> r = new ArrayList<KeyedReference>(); if (keyedReference == null) { @@ -298,7 +298,7 @@ public class MapUDDIv3Tov2 { } return r; } - + private static URLType MapURLType(String url) { if (url == null) { return URLType.OTHER; @@ -323,7 +323,7 @@ public class MapUDDIv3Tov2 { } return URLType.OTHER; } - + private static List<TModelInstanceInfo> MapTModelInstanceInfo(List<org.uddi.api_v3.TModelInstanceInfo> tModelInstanceInfo) { List<TModelInstanceInfo> r = new ArrayList<TModelInstanceInfo>(); if (tModelInstanceInfo == null) { @@ -343,7 +343,7 @@ public class MapUDDIv3Tov2 { } return r; } - + public static FindBinding MapFindBinding(org.uddi.api_v3.FindBinding body) { FindBinding r = new FindBinding(); r.setFindQualifiers(MapFindQualifiers(body.getFindQualifiers())); @@ -362,9 +362,9 @@ public class MapUDDIv3Tov2 { } r.setGeneric(VERSION); return r; - + } - + public static FindBusiness MapFindBusiness(org.uddi.api_v3.FindBusiness body) { FindBusiness r = new FindBusiness(); r.setFindQualifiers(MapFindQualifiers(body.getFindQualifiers())); @@ -380,7 +380,7 @@ public class MapUDDIv3Tov2 { } return r; } - + public static FindRelatedBusinesses MapFindRelatedBusiness(org.uddi.api_v3.FindRelatedBusinesses body) { FindRelatedBusinesses r = new FindRelatedBusinesses(); r.setFindQualifiers(MapFindQualifiers(body.getFindQualifiers())); @@ -391,12 +391,12 @@ public class MapUDDIv3Tov2 { body.getKeyedReference().getKeyName(), body.getKeyedReference().getKeyValue())); } - + r.setGeneric(VERSION); - + return r; } - + public static FindService MapFindService(org.uddi.api_v3.FindService body) { FindService r = new FindService(); r.setFindQualifiers(MapFindQualifiers(body.getFindQualifiers())); @@ -404,57 +404,57 @@ public class MapUDDIv3Tov2 { r.setTModelBag(MapTModelBag(body.getTModelBag())); r.setCategoryBag(MapCategoryBag(body.getCategoryBag())); r.setGeneric(VERSION); - + r.setBusinessKey(body.getBusinessKey()); r.getName().addAll(MapName(body.getName())); return r; } - + public static FindTModel MapFindTModel(org.uddi.api_v3.FindTModel body) { FindTModel r = new FindTModel(); r.setFindQualifiers(MapFindQualifiers(body.getFindQualifiers())); r.setMaxRows(body.getMaxRows()); r.setCategoryBag(MapCategoryBag(body.getCategoryBag())); r.setGeneric(VERSION); - + if (body.getName() != null) { r.setName(new Name(body.getName().getValue(), body.getName().getLang())); } return r; } - + public static org.uddi.api_v2.GetBindingDetail MapGetBindingDetail(org.uddi.api_v3.GetBindingDetail body) { GetBindingDetail r = new GetBindingDetail(); r.getBindingKey().addAll(body.getBindingKey()); r.setGeneric(VERSION); - + return r; } - + public static org.uddi.api_v2.GetBusinessDetail MapGetBusinessDetail(org.uddi.api_v3.GetBusinessDetail body) { GetBusinessDetail r = new GetBusinessDetail(); r.getBusinessKey().addAll(body.getBusinessKey()); r.setGeneric(VERSION); - + return r; } - + public static org.uddi.api_v2.GetServiceDetail MapGetServiceDetail(org.uddi.api_v3.GetServiceDetail body) { GetServiceDetail r = new GetServiceDetail(); r.getServiceKey().addAll(body.getServiceKey()); r.setGeneric(VERSION); - + return r; } - + public static org.uddi.api_v2.GetTModelDetail MapGetTModelDetail(org.uddi.api_v3.GetTModelDetail body) { GetTModelDetail r = new GetTModelDetail(); r.getTModelKey().addAll(body.getTModelKey()); r.setGeneric(VERSION); - + return r; } - + public static AddPublisherAssertions MapAddPublisherAssertions(org.uddi.api_v3.AddPublisherAssertions body) { if (body == null) { return null; @@ -462,31 +462,31 @@ public class MapUDDIv3Tov2 { AddPublisherAssertions r = new AddPublisherAssertions(); r.setAuthInfo(body.getAuthInfo()); r.setGeneric(VERSION); - + r.getPublisherAssertion().addAll(MapPublisherAssertion(body.getPublisherAssertion())); return r; - + } - + public static DeleteBinding MapDeleteBinding(org.uddi.api_v3.DeleteBinding body) { DeleteBinding r = new DeleteBinding(); r.setGeneric(VERSION); - + r.setAuthInfo(body.getAuthInfo()); r.getBindingKey().addAll(body.getBindingKey()); return r; - + } - + public static DeleteBusiness MapDeleteBusiness(org.uddi.api_v3.DeleteBusiness body) { DeleteBusiness r = new DeleteBusiness(); r.setGeneric(VERSION); - + r.setAuthInfo(body.getAuthInfo()); r.getBusinessKey().addAll(body.getBusinessKey()); return r; } - + public static DeletePublisherAssertions MapDeletePublisherAssertions(org.uddi.api_v3.DeletePublisherAssertions body) { if (body == null) { return null; @@ -496,52 +496,52 @@ public class MapUDDIv3Tov2 { r.getPublisherAssertion().addAll(MapPublisherAssertion(body.getPublisherAssertion())); return r; } - + public static DeleteService MapDeleteService(org.uddi.api_v3.DeleteService body) { DeleteService r = new DeleteService(); r.setGeneric(VERSION); - + r.setAuthInfo(body.getAuthInfo()); r.getServiceKey().addAll(body.getServiceKey()); return r; } - + public static DeleteTModel MapDeleteTModel(org.uddi.api_v3.DeleteTModel body) { DeleteTModel r = new DeleteTModel(); r.setGeneric(VERSION); - + r.setAuthInfo(body.getAuthInfo()); r.getTModelKey().addAll(body.getTModelKey()); return r; } - + public static SaveBinding MapSaveBinding(org.uddi.api_v3.SaveBinding body) { SaveBinding r = new SaveBinding(); r.setGeneric(VERSION); - + r.setAuthInfo(body.getAuthInfo()); r.getBindingTemplate().addAll(MapBinding(body.getBindingTemplate())); return r; } - + public static SaveBusiness MapSaveBusiness(org.uddi.api_v3.SaveBusiness body) { SaveBusiness r = new SaveBusiness(); r.setGeneric(VERSION); - + r.setAuthInfo(body.getAuthInfo()); r.getBusinessEntity().addAll(MapBusinessList(body.getBusinessEntity(), null)); return r; } - + public static SaveService MapSaveService(org.uddi.api_v3.SaveService body) { SaveService r = new SaveService(); r.setGeneric(VERSION); - + r.setAuthInfo(body.getAuthInfo()); r.getBusinessService().addAll(MapService(body.getBusinessService())); return r; } - + public static SaveTModel MapSaveTModel(org.uddi.api_v3.SaveTModel body) { SaveTModel r = new SaveTModel(); r.setGeneric(VERSION); @@ -549,23 +549,23 @@ public class MapUDDIv3Tov2 { r.getTModel().addAll(MapTModelList(body.getTModel())); return r; } - + public static GetPublisherAssertions MapGetPublisherAssertions(String authInfo) { GetPublisherAssertions r = new GetPublisherAssertions(); r.setAuthInfo(authInfo); r.setGeneric(VERSION); - + return r; } - + public static GetRegisteredInfo MapGetRegisteredInfo(org.uddi.api_v3.GetRegisteredInfo body) { GetRegisteredInfo r = new GetRegisteredInfo(); r.setAuthInfo(body.getAuthInfo()); r.setGeneric(VERSION); - + return r; } - + private static FindQualifiers MapFindQualifiers(org.uddi.api_v3.FindQualifiers findQualifiers) { if (findQualifiers == null || findQualifiers.getFindQualifier().isEmpty()) { return null; @@ -574,86 +574,66 @@ public class MapUDDIv3Tov2 { for (int i = 0; i < findQualifiers.getFindQualifier().size(); i++) { if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_HTTP)) { r.getFindQualifier().add("uuid:68DE9E80-AD09-469D-8A37-088422BFBC36"); - } - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_EMAIL)) { + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_EMAIL)) { r.getFindQualifier().add("uuid:93335D49-3EFB-48A0-ACEA-EA102B60DDC6"); - } - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_FTP)) { + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_FTP)) { r.getFindQualifier().add("uuid:5FCF5CD0-629A-4C50-8B16-F94E9CF2A674"); - } - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_FAX)) { + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_FAX)) { r.getFindQualifier().add("uuid:1A2B00BE-6E2C-42F5-875B-56F32686E0E7"); - } - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_POTS)) { + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.TRANSPORT_POTS)) { r.getFindQualifier().add("uuid:38E12427-5536-4260-A6F9-B5B530E63A07"); - } - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.IS_REPLACED_BY)) { + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.IS_REPLACED_BY)) { r.getFindQualifier().add("uuid:E59AE320-77A5-11D5-B898-0004AC49CC1E"); - } - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.OWNING_BUSINESS)) { + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.OWNING_BUSINESS)) { r.getFindQualifier().add("uuid:4064C064-6D14-4F35-8953-9652106476A9"); - } - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.RELATIONSHIPS)) { + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.RELATIONSHIPS)) { r.getFindQualifier().add("uuid:807A2C6A-EE22-470D-ADC7-E0424A337C03"); - } - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase("uddi:uddi.org:categorization:nodes")) { + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase("uddi:uddi.org:categorization:nodes")) { r.getFindQualifier().add("uuid:327A56F0-3299-4461-BC23-5CD513E95C55"); - } - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase("uddi:uddi.org:categorization:general_keywords")) { + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase("uddi:uddi.org:categorization:general_keywords")) { r.getFindQualifier().add("uuid:A035A07C-F362-44dd-8F95-E2B134BF43B4"); - } - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase("uddi:uddi.org:categorization:types")) { + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase("uddi:uddi.org:categorization:types")) { r.getFindQualifier().add("uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4"); - } - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.EXACT_MATCH) + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.EXACT_MATCH) || findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.EXACT_MATCH_TMODEL)) { r.getFindQualifier().add("exactNameMatch"); - } - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.CASE_SENSITIVE_MATCH) + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.CASE_SENSITIVE_MATCH) || findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.CASE_SENSITIVE_MATCH_TMODEL)) { r.getFindQualifier().add("caseSensitiveMatch"); - } - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.OR_ALL_KEYS) + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.OR_ALL_KEYS) || findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.OR_ALL_KEYS_TMODEL)) { r.getFindQualifier().add("orAllKeys"); - } - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.OR_LIKE_KEYS) + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.OR_LIKE_KEYS) || findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.OR_LIKE_KEYS_TMODEL)) { r.getFindQualifier().add("orLikeKeys"); - } - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.AND_ALL_KEYS) + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.AND_ALL_KEYS) || findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.AND_ALL_KEYS_TMODEL)) { r.getFindQualifier().add("andAllKeys"); - } - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.SORT_BY_DATE_ASC) + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.SORT_BY_DATE_ASC) || findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.SORT_BY_DATE_ASC_TMODEL)) { r.getFindQualifier().add(UDDIConstants.SORT_BY_DATE_ASC); - } - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.SORT_BY_DATE_DESC) + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.SORT_BY_DATE_DESC) || findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.SORT_BY_DATE_DESC_TMODEL)) { r.getFindQualifier().add(UDDIConstants.SORT_BY_DATE_DESC); - } - - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.SORT_BY_NAME_ASC) + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.SORT_BY_NAME_ASC) || findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.SORT_BY_NAME_ASC_TMODEL)) { r.getFindQualifier().add(UDDIConstants.SORT_BY_NAME_ASC); - } - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.SORT_BY_NAME_DESC) + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.SORT_BY_NAME_DESC) || findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.SORT_BY_NAME_DESC_TMODEL)) { r.getFindQualifier().add(UDDIConstants.SORT_BY_NAME_DESC); - } - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.SERVICE_SUBSET) + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.SERVICE_SUBSET) || findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.SERVICE_SUBSET_TMODEL)) { r.getFindQualifier().add(UDDIConstants.SERVICE_SUBSET); - } - if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.COMBINE_CATEGORY_BAGS) + } else if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.COMBINE_CATEGORY_BAGS) || findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(UDDIConstants.COMBINE_CATEGORY_BAGS_TMODEL)) { r.getFindQualifier().add(UDDIConstants.COMBINE_CATEGORY_BAGS); + } else { + r.getFindQualifier().add(findQualifiers.getFindQualifier().get(i)); } } return r; } - + private static TModelBag MapTModelBag(org.uddi.api_v3.TModelBag tModelBag) { if (tModelBag == null || tModelBag.getTModelKey().isEmpty()) { return null; @@ -661,9 +641,9 @@ public class MapUDDIv3Tov2 { TModelBag r = new TModelBag(); r.getTModelKey().addAll(tModelBag.getTModelKey()); return r; - + } - + private static DiscoveryURLs MapDiscoveryURLs(org.uddi.api_v3.DiscoveryURLs discoveryURLs) { if (discoveryURLs == null) { return null; @@ -676,9 +656,9 @@ public class MapUDDIv3Tov2 { r.getDiscoveryURL().add(d); } return r; - + } - + private static List<BusinessEntity> MapBusinessList(List<org.uddi.api_v3.BusinessEntity> businessEntity, String operator) { List<BusinessEntity> r = new ArrayList<BusinessEntity>(); if (businessEntity == null) { @@ -689,31 +669,31 @@ public class MapUDDIv3Tov2 { } return r; } - + private static List<TModel> MapTModelList(List<org.uddi.api_v3.TModel> tModel) { List<TModel> r = new ArrayList<TModel>(); if (tModel == null) { return r; } - + for (int i = 0; i < tModel.size(); i++) { r.add(MapTModel(tModel.get(i))); } return r; } - + public static SetPublisherAssertions MapSetPublisherAssertions(List<org.uddi.api_v3.PublisherAssertion> value) { if (value == null) { return null; } SetPublisherAssertions r = new SetPublisherAssertions(); r.setGeneric(VERSION); - + r.getPublisherAssertion().addAll(MapPublisherAssertion(value)); return r; - + } - + public static BindingDetail MapBindingDetail(org.uddi.api_v3.BindingDetail findBinding, String operator) { if (findBinding == null) { return null; @@ -729,7 +709,7 @@ public class MapUDDIv3Tov2 { r.getBindingTemplate().addAll(MapBinding(findBinding.getBindingTemplate())); return r; } - + public static DispositionReport MapException(DispositionReportFaultMessage ex, String operator) { if (ex == null) { return null; @@ -737,7 +717,7 @@ public class MapUDDIv3Tov2 { DispositionReport r = new DispositionReport(ex.getMessage() + (ex.detail != null ? ex.detail.getMessage() : ""), MapDispositionReport(ex.getFaultInfo(), operator)); return r; } - + private static org.uddi.api_v2.DispositionReport MapDispositionReport(org.uddi.api_v3.DispositionReport faultInfo, String operator) { if (faultInfo == null) { return null; @@ -749,7 +729,7 @@ public class MapUDDIv3Tov2 { r.getResult().addAll(MapResults(faultInfo.getResult())); return r; } - + private static List<Result> MapResults(List<org.uddi.api_v3.Result> result) { List<Result> r = new ArrayList<Result>(); if (result == null) { @@ -780,12 +760,12 @@ public class MapUDDIv3Tov2 { x.getErrInfo().setValue(result.get(i).getErrInfo().getValue()); r.add(x); } - + return r; } - + public static BusinessList MapBusinessListEntity(org.uddi.api_v3.BusinessList findBusiness, String operator) { - + if (findBusiness == null) { return null; } @@ -800,7 +780,7 @@ public class MapUDDIv3Tov2 { } return r; } - + public static RelatedBusinessesList MapRelatedBusinessList(org.uddi.api_v3.RelatedBusinessesList findRelatedBusinesses, String operator) { if (findRelatedBusinesses == null) { return null; @@ -816,7 +796,7 @@ public class MapUDDIv3Tov2 { } r.setRelatedBusinessInfos(new RelatedBusinessInfos()); if (findRelatedBusinesses.getRelatedBusinessInfos() != null) { - + for (int i = 0; i < findRelatedBusinesses.getRelatedBusinessInfos().getRelatedBusinessInfo().size(); i++) { RelatedBusinessInfo x = new RelatedBusinessInfo(); x.setBusinessKey(findRelatedBusinesses.getRelatedBusinessInfos().getRelatedBusinessInfo().get(i).getBusinessKey()); @@ -827,7 +807,7 @@ public class MapUDDIv3Tov2 { } return r; } - + public static ServiceList MapServiceList(org.uddi.api_v3.ServiceList findService, String operator) { if (findService == null) { return null; @@ -843,13 +823,13 @@ public class MapUDDIv3Tov2 { } return r; } - + public static BusinessDetailExt MapBusinessDetailExt(BusinessDetail businessDetail, String operator) { if (businessDetail == null) { return null; } BusinessDetailExt r = new BusinessDetailExt(); - + r.setGeneric(VERSION); r.setOperator(operator); if (businessDetail.isTruncated() != null && businessDetail.isTruncated().booleanValue()) { @@ -859,14 +839,14 @@ public class MapUDDIv3Tov2 { } for (int i = 0; i < businessDetail.getBusinessEntity().size(); i++) { BusinessEntityExt x = new BusinessEntityExt(); - + x.setBusinessEntity(MapBusiness(businessDetail.getBusinessEntity().get(i), operator)); r.getBusinessEntityExt().add(x); } return r; - + } - + public static ServiceDetail MapServiceDetail(org.uddi.api_v3.ServiceDetail serviceDetail, String operator) { if (serviceDetail == null) { return null; @@ -881,9 +861,9 @@ public class MapUDDIv3Tov2 { r.setOperator(operator); r.getBusinessService().addAll(MapService(serviceDetail.getBusinessService())); return r; - + } - + public static TModelList MapTModelListElement(org.uddi.api_v3.TModelList findTModel, String operator) { TModelList r = new TModelList(); r.setGeneric(VERSION); @@ -893,20 +873,20 @@ public class MapUDDIv3Tov2 { r.setTruncated(Truncated.FALSE); return r; } - + if (findTModel.isTruncated() != null && findTModel.isTruncated()) { r.setTruncated(Truncated.TRUE); } else { r.setTruncated(Truncated.FALSE); } if (findTModel.getTModelInfos() != null) { - + r.getTModelInfos().getTModelInfo().addAll(MapTModelInfo(findTModel.getTModelInfos().getTModelInfo())); } - + return r; } - + public static org.uddi.api_v2.BusinessDetail MapBusinessDetail(BusinessDetail businessDetail, String operator) { if (businessDetail == null) { return null; @@ -919,11 +899,11 @@ public class MapUDDIv3Tov2 { } else { r.setTruncated(Truncated.FALSE); } - + r.getBusinessEntity().addAll(MapBusinessList(businessDetail.getBusinessEntity(), operator)); return r; } - + public static TModelDetail MapTModelDetail(org.uddi.api_v3.TModelDetail tModelDetail, String operator) { if (tModelDetail == null) { return null; @@ -937,16 +917,16 @@ public class MapUDDIv3Tov2 { r.setTruncated(Truncated.FALSE); } r.getTModel().addAll(MapTModelList(tModelDetail.getTModel())); - + return r; } - + private static BusinessInfos MapBusinessInfos(org.uddi.api_v3.BusinessInfos businessInfos) { BusinessInfos r = new BusinessInfos(); if (businessInfos == null || businessInfos.getBusinessInfo().isEmpty()) { return r; } - + for (int i = 0; i < businessInfos.getBusinessInfo().size(); i++) { BusinessInfo x = new BusinessInfo(); x.setBusinessKey(businessInfos.getBusinessInfo().get(i).getBusinessKey()); @@ -955,10 +935,10 @@ public class MapUDDIv3Tov2 { x.getName().addAll(MapName(businessInfos.getBusinessInfo().get(i).getName())); r.getBusinessInfo().add(x); } - + return r; } - + private static ServiceInfos MapServiceInfos(org.uddi.api_v3.ServiceInfos serviceInfos) { ServiceInfos r = new ServiceInfos(); if (serviceInfos == null) { @@ -973,7 +953,7 @@ public class MapUDDIv3Tov2 { } return r; } - + private static List<TModelInfo> MapTModelInfo(List<org.uddi.api_v3.TModelInfo> tModelInfo) { List<TModelInfo> r = new ArrayList<TModelInfo>(); if (tModelInfo == null) { @@ -981,14 +961,14 @@ public class MapUDDIv3Tov2 { } for (int i = 0; i < tModelInfo.size(); i++) { TModelInfo x = new TModelInfo(); - + x.setTModelKey(tModelInfo.get(i).getTModelKey()); x.setName(new Name(tModelInfo.get(i).getName().getValue(), tModelInfo.get(i).getName().getValue())); r.add(x); } return r; } - + public static RegisteredInfo MapRegisteredInfo(org.uddi.api_v3.RegisteredInfo registeredInfo, String operator) { if (registeredInfo == null) { return null; @@ -1015,11 +995,11 @@ public class MapUDDIv3Tov2 { r.setTModelInfos(new TModelInfos()); r.getTModelInfos().getTModelInfo().addAll(MapTModelInfo(registeredInfo.getTModelInfos().getTModelInfo())); } - + return r; - + } - + public static PublisherAssertions MapPublisherAssertions(List<org.uddi.api_v3.PublisherAssertion> publisherAssertions, String operator) { if (publisherAssertions == null) { return null; @@ -1030,10 +1010,10 @@ public class MapUDDIv3Tov2 { r.setOperator(operator); return r; } - + private static List<PublisherAssertion> MapPublisherAssertion(List<org.uddi.api_v3.PublisherAssertion> publisherAssertion) { List<PublisherAssertion> r = new ArrayList<PublisherAssertion>(); - + for (int i = 0; i < publisherAssertion.size(); i++) { PublisherAssertion x = new PublisherAssertion(); x.setFromKey(publisherAssertion.get(i).getFromKey()); @@ -1047,7 +1027,7 @@ public class MapUDDIv3Tov2 { } return r; } - + private static FindQualifiers AddApproximateMatch(FindQualifiers findQualifiers) { if (findQualifiers == null) { findQualifiers = new FindQualifiers(); @@ -1055,7 +1035,7 @@ public class MapUDDIv3Tov2 { findQualifiers.getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH); return findQualifiers; } - + private static boolean ContainsWildCard(List<Name> name) { for (int i = 0; i < name.size(); i++) { if (name.get(i).getValue() != null && name.get(i).getValue().contains(UDDIConstants.WILDCARD)) { @@ -1075,7 +1055,7 @@ public class MapUDDIv3Tov2 { } return false; } - + public static GetAssertionStatusReport MapGetAssertionStatusReport(String authInfo, CompletionStatus completionStatus) { GetAssertionStatusReport r = new GetAssertionStatusReport(); r.setAuthInfo(authInfo); @@ -1096,7 +1076,7 @@ public class MapUDDIv3Tov2 { r.setGeneric(VERSION); return r; } - + private static Contacts MapContacts(org.uddi.api_v3.Contacts contacts) { if (contacts == null) { return null; @@ -1105,9 +1085,9 @@ public class MapUDDIv3Tov2 { c.getContact().addAll(MapContactList(contacts.getContact())); return c; } - + private static List<Contact> MapContactList(List<org.uddi.api_v3.Contact> contact) { - + List<Contact> r = new ArrayList<Contact>(); if (contact == null) { return r; @@ -1120,12 +1100,12 @@ public class MapUDDIv3Tov2 { c.getDescription().addAll(MapDescription(contact.get(i).getDescription())); c.getEmail().addAll(MapEmail(contact.get(i).getEmail())); c.getPhone().addAll(MapPhone(contact.get(i).getPhone())); - + r.add(c); } return r; } - + private static List<Address> MapAddress(List<org.uddi.api_v3.Address> address) { List<Address> r = new ArrayList<Address>(); if (address == null) { @@ -1141,7 +1121,7 @@ public class MapUDDIv3Tov2 { } return r; } - + private static List<Email> MapEmail(List<org.uddi.api_v3.Email> email) { List<Email> r = new ArrayList<Email>(); if (email == null) { @@ -1153,10 +1133,10 @@ public class MapUDDIv3Tov2 { x.setValue(email.get(i).getValue()); r.add(x); } - + return r; } - + private static List<Phone> MapPhone(List<org.uddi.api_v3.Phone> phone) { List<Phone> r = new ArrayList<Phone>(); if (phone == null) { @@ -1168,10 +1148,10 @@ public class MapUDDIv3Tov2 { x.setValue(phone.get(i).getValue()); r.add(x); } - + return r; } - + private static List<AddressLine> MapAddressLine(List<org.uddi.api_v3.AddressLine> addressLine) { List<AddressLine> r = new ArrayList<AddressLine>(); if (addressLine == null) { @@ -1184,7 +1164,7 @@ public class MapUDDIv3Tov2 { x.setValue(addressLine.get(i).getValue()); r.add(x); } - + return r; } @@ -1202,7 +1182,7 @@ public class MapUDDIv3Tov2 { r.setGeneric(VERSION); for (int i = 0; i < assertionStatusReport.size(); i++) { org.uddi.api_v2.AssertionStatusItem x = new org.uddi.api_v2.AssertionStatusItem(); - + switch (assertionStatusReport.get(i).getCompletionStatus()) { case STATUS_BOTH_INCOMPLETE: x.setCompletionStatus(null); @@ -1224,13 +1204,13 @@ public class MapUDDIv3Tov2 { assertionStatusReport.get(i).getKeyedReference().getKeyName(), assertionStatusReport.get(i).getKeyedReference().getKeyValue())); } - + x.setKeysOwned(new KeysOwned()); r.getAssertionStatusItem().add(x); // assertionStatusReport.get(i). } - + return r; } - + } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
