X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fnetconf-client%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fclient%2FNetconfClientSessionNegotiatorFactory.java;h=6215f4f0a82b2db3e8f21f06400a74e27d749ce7;hb=7bf7d3fd39c6966a2414d4ca6fd77d195021c1f8;hp=2d6cac2ba01c8b95886c6bc23e82cf63b12973ce;hpb=4c0c091813aea131d32dc70c5121a450eb9b7291;p=netconf.git diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactory.java b/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactory.java index 2d6cac2ba0..6215f4f0a8 100644 --- a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactory.java +++ b/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorFactory.java @@ -5,33 +5,33 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.client; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.collect.ImmutableSet; import io.netty.channel.Channel; import io.netty.util.Timer; import io.netty.util.concurrent.Promise; +import java.util.Optional; import java.util.Set; -import org.opendaylight.netconf.nettyutil.handler.exi.NetconfStartExiMessage; +import org.checkerframework.checker.index.qual.NonNegative; +import org.opendaylight.netconf.api.NetconfSessionListenerFactory; import org.opendaylight.netconf.api.messages.NetconfHelloMessage; import org.opendaylight.netconf.api.messages.NetconfHelloMessageAdditionalHeader; -import org.opendaylight.netconf.api.NetconfClientSessionPreferences; -import org.opendaylight.netconf.api.NetconfDocumentedException; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.protocol.framework.SessionListenerFactory; -import org.opendaylight.protocol.framework.SessionNegotiator; -import org.opendaylight.protocol.framework.SessionNegotiatorFactory; -import org.openexi.proc.common.AlignmentType; -import org.openexi.proc.common.EXIOptions; -import org.openexi.proc.common.EXIOptionsException; +import org.opendaylight.netconf.nettyutil.AbstractNetconfSessionNegotiator; +import org.opendaylight.netconf.nettyutil.NetconfSessionNegotiatorFactory; +import org.opendaylight.netconf.nettyutil.handler.exi.EXIParameters; +import org.opendaylight.netconf.nettyutil.handler.exi.NetconfStartExiMessage; +import org.opendaylight.netconf.shaded.exificient.core.CodingMode; +import org.opendaylight.netconf.shaded.exificient.core.FidelityOptions; +import org.opendaylight.netconf.shaded.exificient.core.exceptions.UnsupportedOption; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class NetconfClientSessionNegotiatorFactory implements SessionNegotiatorFactory { +public class NetconfClientSessionNegotiatorFactory + implements NetconfSessionNegotiatorFactory { public static final Set EXI_CLIENT_CAPABILITIES = ImmutableSet.of( XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_BASE_1_0, @@ -51,28 +51,27 @@ public class NetconfClientSessionNegotiatorFactory implements SessionNegotiatorF private static final Logger LOG = LoggerFactory.getLogger(NetconfClientSessionNegotiatorFactory.class); private static final String START_EXI_MESSAGE_ID = "default-start-exi"; - private static final EXIOptions DEFAULT_OPTIONS; - - private final Optional additionalHeader; - private final long connectionTimeoutMillis; - private final Timer timer; - private final EXIOptions options; + private static final EXIParameters DEFAULT_OPTIONS; static { - final EXIOptions opts = new EXIOptions(); + final FidelityOptions fidelity = FidelityOptions.createDefault(); try { - opts.setPreserveDTD(true); - opts.setPreserveNS(true); - opts.setPreserveLexicalValues(true); - opts.setAlignmentType(AlignmentType.byteAligned); - } catch (EXIOptionsException e) { - throw new ExceptionInInitializerError(e); + fidelity.setFidelity(FidelityOptions.FEATURE_DTD, true); + fidelity.setFidelity(FidelityOptions.FEATURE_LEXICAL_VALUE, true); + fidelity.setFidelity(FidelityOptions.FEATURE_PREFIX, true); + } catch (UnsupportedOption e) { + LOG.warn("Failed to set fidelity options, continuing", e); } - DEFAULT_OPTIONS = opts; + DEFAULT_OPTIONS = new EXIParameters(CodingMode.BYTE_PACKED, fidelity); } + private final Optional additionalHeader; + private final @NonNegative int maximumIncomingChunkSize; private final Set clientCapabilities; + private final long connectionTimeoutMillis; + private final Timer timer; + private final EXIParameters options; public NetconfClientSessionNegotiatorFactory(final Timer timer, final Optional additionalHeader, @@ -80,6 +79,14 @@ public class NetconfClientSessionNegotiatorFactory implements SessionNegotiatorF this(timer, additionalHeader, connectionTimeoutMillis, DEFAULT_OPTIONS); } + public NetconfClientSessionNegotiatorFactory(final Timer timer, + final Optional additionalHeader, + final long connectionTimeoutMillis, + final @NonNegative int maximumIncomingChunkSize) { + this(timer, additionalHeader, connectionTimeoutMillis, DEFAULT_OPTIONS, EXI_CLIENT_CAPABILITIES, + maximumIncomingChunkSize); + } + public NetconfClientSessionNegotiatorFactory(final Timer timer, final Optional additionalHeader, final long connectionTimeoutMillis, final Set capabilities) { @@ -89,36 +96,42 @@ public class NetconfClientSessionNegotiatorFactory implements SessionNegotiatorF public NetconfClientSessionNegotiatorFactory(final Timer timer, final Optional additionalHeader, - final long connectionTimeoutMillis, final EXIOptions exiOptions) { + final long connectionTimeoutMillis, final EXIParameters exiOptions) { this(timer, additionalHeader, connectionTimeoutMillis, exiOptions, EXI_CLIENT_CAPABILITIES); } public NetconfClientSessionNegotiatorFactory(final Timer timer, final Optional additionalHeader, - final long connectionTimeoutMillis, final EXIOptions exiOptions, final Set capabilities) { - this.timer = Preconditions.checkNotNull(timer); + final long connectionTimeoutMillis, final EXIParameters exiOptions, + final Set capabilities) { + this(timer, additionalHeader, connectionTimeoutMillis, exiOptions, capabilities, + AbstractNetconfSessionNegotiator.DEFAULT_MAXIMUM_INCOMING_CHUNK_SIZE); + } + + public NetconfClientSessionNegotiatorFactory(final Timer timer, + final Optional additionalHeader, + final long connectionTimeoutMillis, final EXIParameters exiOptions, + final Set capabilities, + final @NonNegative int maximumIncomingChunkSize) { + this.timer = requireNonNull(timer); this.additionalHeader = additionalHeader; this.connectionTimeoutMillis = connectionTimeoutMillis; - this.options = exiOptions; - this.clientCapabilities = capabilities; + options = exiOptions; + clientCapabilities = capabilities; + this.maximumIncomingChunkSize = maximumIncomingChunkSize; } - @Override - public SessionNegotiator getSessionNegotiator(final SessionListenerFactory sessionListenerFactory, - final Channel channel, - final Promise promise) { - - NetconfMessage startExiMessage = NetconfStartExiMessage.create(options, START_EXI_MESSAGE_ID); - NetconfHelloMessage helloMessage = null; - try { - helloMessage = NetconfHelloMessage.createClientHello(clientCapabilities, additionalHeader); - } catch (NetconfDocumentedException e) { - LOG.error("Unable to create client hello message with capabilities {} and additional handler {}", clientCapabilities,additionalHeader); - throw new IllegalStateException(e); - } + public long getConnectionTimeoutMillis() { + return connectionTimeoutMillis; + } - NetconfClientSessionPreferences proposal = new NetconfClientSessionPreferences(helloMessage, startExiMessage); - return new NetconfClientSessionNegotiator(proposal, promise, channel, timer, - sessionListenerFactory.getSessionListener(),connectionTimeoutMillis); + @Override + public NetconfClientSessionNegotiator getSessionNegotiator( + final NetconfSessionListenerFactory sessionListenerFactory, + final Channel channel, final Promise promise) { + return new NetconfClientSessionNegotiator( + NetconfHelloMessage.createClientHello(clientCapabilities, additionalHeader), + NetconfStartExiMessage.create(options, START_EXI_MESSAGE_ID), promise, channel, timer, + sessionListenerFactory.getSessionListener(), connectionTimeoutMillis, maximumIncomingChunkSize); } }