Remove use of yangtools.concepts.Builder

This concept has been deprecated, let's not use it.

Change-Id: I25abbedb5bf9530d517e976c4e1bc1cded65d724
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 51f02601bec136c0ae240311d6873afa7f93cecd..5d0e48d7eb9939a155cc83dbaece0a09c7ccbefe 100644 (file)
--- 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.
      *
      * <p>
-     * 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<CallHomeAuthorization> {
-
+    public static class Builder {
         private final String nodeId;
         private final String username;
         private final Set<String> 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<String> passwords;
@@ -148,7 +144,7 @@ public abstract class CallHomeAuthorization {
                       final Collection<KeyPair> 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 19d0c933a9841a55eb6120cc4554fa17582dbd60..2b14b76302f573d4cf0653a1a4fe8dd82d3900dc 100644 (file)
--- 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<NetconfCallHomeServer> {
 
+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<NetconfCallHomeServ
         this.recorder = recorder;
     }
 
-    @Override
-    public NetconfCallHomeServer build() {
-        Factory factory =
-                new CallHomeSessionContext.Factory(nettyGroup(), negotiatorFactory(), subsystemListener());
-        return new NetconfCallHomeServer(sshClient(), authProvider(), factory, bindAddress(), this.recorder);
+    public @NonNull NetconfCallHomeServer build() {
+        return new NetconfCallHomeServer(sshClient(), authProvider(),
+            new CallHomeSessionContext.Factory(nettyGroup(), negotiatorFactory(), subsystemListener()),
+            bindAddress(), recorder);
     }
 
     public SshClient getSshClient() {

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/NormalizedNodeFactory.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/NormalizedNodeFactory.java
index 7f4ccb8da9805d6b27d70a113e6b89fa3394b668..71dca3ecdb817a3be7c6f7cbb5bc3fd588f198a9 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/NormalizedNodeFactory.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/NormalizedNodeFactory.java
@@ -8,12 +8,11 @@
 package org.opendaylight.restconf.nb.rfc8040.rests.utils;
 
 import java.util.Optional;
-import org.opendaylight.yangtools.concepts.Builder;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
-class NormalizedNodeFactory extends FutureDataFactory<Optional<NormalizedNode>> implements Builder<NormalizedNode> {
-    @Override
-    public NormalizedNode build() {
+final class NormalizedNodeFactory extends FutureDataFactory<Optional<NormalizedNode>> {
+    @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 da153a47806052a8891740dc0fdcb1c95148ceb6..2ba598920b8297b9f43309f7026272697d83cd8e 100644 (file)
--- 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<CommitInfo> implements Builder<Response> {
 
+final class ResponseFactory extends FutureDataFactory<CommitInfo> {
     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<CommitInfo> 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();
     }
 }