Repository: juddi Updated Branches: refs/heads/master 18f04ebc2 -> 37c6b3685
JUDDI-865 fixed, added support for replicationUrl mapping too JUDDI-725 adding help functions for tmodel instance info Project: http://git-wip-us.apache.org/repos/asf/juddi/repo Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/37c6b368 Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/37c6b368 Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/37c6b368 Branch: refs/heads/master Commit: 37c6b3685751bd67c44da5f70f51e654ce5ae9c0 Parents: 18f04eb Author: alexoree <[email protected]> Authored: Sat Mar 1 18:20:01 2014 -0500 Committer: alexoree <[email protected]> Committed: Sat Mar 1 18:20:01 2014 -0500 ---------------------------------------------------------------------- .../compare/TModelInstanceInfoContains.java | 44 ++++++++++++++++++++ .../juddi/v3/client/config/ClientConfig.java | 1 + .../apache/juddi/v3/client/config/UDDINode.java | 25 +++++++++-- 3 files changed, 67 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/juddi/blob/37c6b368/juddi-client/src/main/java/org/apache/juddi/v3/client/compare/TModelInstanceInfoContains.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/compare/TModelInstanceInfoContains.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/compare/TModelInstanceInfoContains.java new file mode 100644 index 0000000..5cde6c4 --- /dev/null +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/compare/TModelInstanceInfoContains.java @@ -0,0 +1,44 @@ +/* + * Copyright 2014 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.juddi.v3.client.compare; + +import java.util.List; +import org.uddi.api_v3.InstanceDetails; +import org.uddi.api_v3.TModelInstanceDetails; +import org.uddi.api_v3.TModelInstanceInfo; + +/** + * + * @author Alex O'Ree + */ +public class TModelInstanceInfoContains { + + public static InstanceDetails contains(TModelInstanceDetails input, String key) { + if (input == null) { + return null; + } + if (key==null)return null; + if (input.getTModelInstanceInfo() == null || input.getTModelInstanceInfo().isEmpty()) { + return null; + } + for (int i=0; i < input.getTModelInstanceInfo().size(); i++){ + if (input.getTModelInstanceInfo().get(i).getTModelKey()!=null && + input.getTModelInstanceInfo().get(i).getTModelKey().equalsIgnoreCase(key)) + return input.getTModelInstanceInfo().get(i).getInstanceDetails(); + } + return null; + } +} http://git-wip-us.apache.org/repos/asf/juddi/blob/37c6b368/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java index 22e6ad6..54249a5 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java @@ -262,6 +262,7 @@ public class ClientConfig uddiNode.setPublishUrl( TokenResolver.replaceTokens(config.getString("client.nodes.node(" + i +").publishUrl"),properties)); uddiNode.setCustodyTransferUrl( TokenResolver.replaceTokens(config.getString("client.nodes.node(" + i +").custodyTransferUrl"),properties)); uddiNode.setSecurityUrl( TokenResolver.replaceTokens(config.getString("client.nodes.node(" + i +").securityUrl"),properties)); + uddiNode.setReplicationUrl( TokenResolver.replaceTokens(config.getString("client.nodes.node(" + i +").replicationUrl"),properties)); uddiNode.setSubscriptionUrl( TokenResolver.replaceTokens(config.getString("client.nodes.node(" + i +").subscriptionUrl"),properties)); uddiNode.setSubscriptionListenerUrl(TokenResolver.replaceTokens(config.getString("client.nodes.node(" + i +").subscriptionListenerUrl"),properties)); uddiNode.setJuddiApiUrl( TokenResolver.replaceTokens(config.getString("client.nodes.node(" + i +").juddiApiUrl"),properties)); http://git-wip-us.apache.org/repos/asf/juddi/blob/37c6b368/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java index 46e57ee..490ebb2 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java @@ -45,6 +45,7 @@ public class UDDINode implements Serializable { private String inquiryRESTUrl; private String publishUrl; private String securityUrl; + private String replicationUrl; private String subscriptionUrl; private String subscriptionListenerUrl; private String juddiApiUrl; @@ -70,6 +71,7 @@ public class UDDINode implements Serializable { securityUrl = node.getSecurityUrl(); subscriptionUrl = node.getSubscriptionUrl(); subscriptionListenerUrl = node.getSubscriptionListenerUrl(); + replicationUrl=node.getReplicationUrl(); juddiApiUrl = node.getJuddiApiUrl(); proxyTransport = node.getProxyTransport(); factoryInitial = node.getFactoryInitial(); @@ -87,20 +89,23 @@ public class UDDINode implements Serializable { public Node getApiNode() { Node apiNode = new Node(); - apiNode.setCustodyTransferUrl(custodyTransferUrl); + apiNode.setClientName(clientName); + apiNode.setCustodyTransferUrl(custodyTransferUrl); apiNode.setDescription(description); apiNode.setFactoryInitial(factoryInitial); apiNode.setFactoryNamingProvider(factoryNamingProvider); apiNode.setFactoryURLPkgs(factoryURLPkgs); apiNode.setInquiryUrl(inquiryUrl); - //apiNode.setInquiryRESTUrl(name); + //no mapping for this apiNode.setInquiryRESTUrl(name); apiNode.setJuddiApiUrl(juddiApiUrl); - apiNode.setClientName(clientName); + apiNode.setName(name); apiNode.setProxyTransport(proxyTransport); apiNode.setPublishUrl(publishUrl); + apiNode.setReplicationUrl(replicationUrl); apiNode.setSecurityUrl(securityUrl); apiNode.setSubscriptionUrl(subscriptionUrl); + apiNode.setSubscriptionListenerUrl(subscriptionListenerUrl); return apiNode; } @@ -154,6 +159,20 @@ public class UDDINode implements Serializable { public String getInquiryUrl() { return inquiryUrl; } + /** + * @since 3.2.1 + * @return + */ + public String getReplicationUrl() { + return replicationUrl; + } + /** + * @since 3.2.1 + * @param value + */ + public void setReplicationUrl(String value) { + replicationUrl=value; + } /** * used ONLY for UDDI's HTTP GET (REST) endpoint --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
