From: Robert Varga Date: Mon, 20 Jun 2022 08:58:59 +0000 (+0200) Subject: Remove use of yangtools.concepts.Builder X-Git-Tag: v4.0.0~33 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=netconf.git;a=commitdiff_plain;h=a4c21e1161d781152e5fca521c7874b209dd2c03;hp=a78068af580cf09e4b92c38d7a4c7b8c532e04cd Remove use of yangtools.concepts.Builder This concept has been deprecated, let's not use it. Change-Id: I25abbedb5bf9530d517e976c4e1bc1cded65d724 Signed-off-by: Robert Varga --- diff --git a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/CallHomeAuthorization.java b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/CallHomeAuthorization.java index 51f02601be..5d0e48d7eb 100644 --- a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/CallHomeAuthorization.java +++ b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/CallHomeAuthorization.java @@ -14,6 +14,7 @@ import java.security.KeyPair; import java.util.Collection; import java.util.HashSet; import java.util.Set; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.netconf.shaded.sshd.client.session.ClientSession; /** @@ -93,11 +94,9 @@ public abstract class CallHomeAuthorization { * Builder for CallHomeAuthorization which accepts incoming connection. * *

- * Use {@link CallHomeAuthorization#serverAccepted(String, String)} to instantiate - * builder. + * Use {@link CallHomeAuthorization#serverAccepted(String, String)} to instantiate builder. */ - public static class Builder implements org.opendaylight.yangtools.concepts.Builder { - + public static class Builder { private final String nodeId; private final String username; private final Set passwords = new HashSet<>(); @@ -115,7 +114,7 @@ public abstract class CallHomeAuthorization { * @return this builder. */ public Builder addPassword(final String password) { - this.passwords.add(password); + passwords.add(password); return this; } @@ -126,19 +125,16 @@ public abstract class CallHomeAuthorization { * @return this builder. */ public Builder addClientKeys(final KeyPair clientKey) { - this.clientKeys.add(clientKey); + clientKeys.add(clientKey); return this; } - @Override - public CallHomeAuthorization build() { + public @NonNull CallHomeAuthorization build() { return new ServerAllowed(nodeId, username, passwords, clientKeys); } - } - private static class ServerAllowed extends CallHomeAuthorization { - + private static final class ServerAllowed extends CallHomeAuthorization { private final String nodeId; private final String username; private final Set passwords; @@ -148,7 +144,7 @@ public abstract class CallHomeAuthorization { final Collection clientKeyPairs) { this.username = requireNonNull(username); this.passwords = ImmutableSet.copyOf(passwords); - this.clientKeyPair = ImmutableSet.copyOf(clientKeyPairs); + clientKeyPair = ImmutableSet.copyOf(clientKeyPairs); this.nodeId = requireNonNull(nodeId); } diff --git a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerBuilder.java b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerBuilder.java index 19d0c933a9..2b14b76302 100644 --- a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerBuilder.java +++ b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerBuilder.java @@ -13,13 +13,11 @@ import io.netty.util.HashedWheelTimer; import java.net.InetSocketAddress; import java.util.Optional; import java.util.concurrent.TimeUnit; -import org.opendaylight.netconf.callhome.protocol.CallHomeSessionContext.Factory; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.netconf.client.NetconfClientSessionNegotiatorFactory; import org.opendaylight.netconf.shaded.sshd.client.SshClient; -import org.opendaylight.yangtools.concepts.Builder; - -public class NetconfCallHomeServerBuilder implements Builder { +public class NetconfCallHomeServerBuilder { private static final long DEFAULT_SESSION_TIMEOUT_MILLIS = TimeUnit.SECONDS.toMillis(5); private static final int DEFAULT_CALL_HOME_PORT = 4334; @@ -39,11 +37,10 @@ public class NetconfCallHomeServerBuilder implements Builder> implements Builder { - @Override - public NormalizedNode build() { +final class NormalizedNodeFactory extends FutureDataFactory> { + @Nullable NormalizedNode build() { return result.orElse(null); } } diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ResponseFactory.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ResponseFactory.java index da153a4780..2ba598920b 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ResponseFactory.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ResponseFactory.java @@ -11,18 +11,17 @@ import java.net.URI; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.ResponseBuilder; import javax.ws.rs.core.Response.Status; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.common.api.CommitInfo; -import org.opendaylight.yangtools.concepts.Builder; - -final class ResponseFactory extends FutureDataFactory implements Builder { +final class ResponseFactory extends FutureDataFactory { private ResponseBuilder responseBuilder; ResponseFactory() { } ResponseFactory(final Status status) { - this.responseBuilder = Response.status(status); + responseBuilder = Response.status(status); } ResponseFactory status(final Status status) { @@ -35,11 +34,10 @@ final class ResponseFactory extends FutureDataFactory implements Bui return this; } - @Override - public Response build() { + public @NonNull Response build() { if (getFailureStatus()) { responseBuilder = responseBuilder.status(Response.Status.INTERNAL_SERVER_ERROR); } - return this.responseBuilder.build(); + return responseBuilder.build(); } }