From 95fec5ffd5bab1211743d9482eb7daf407f8ecbd Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 2 Mar 2023 09:37:53 +0100
Subject: [PATCH] Remove atomix.utils.Builder

There are only two classes implementing this interface and nothing else
relies on it. Remove it.

JIRA: CONTROLLER-2071
Change-Id: I7bec6addac3a9ee67fe7b7647beb0071744aec9f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../storage/journal/SegmentedJournal.java     |  8 +++-
 .../main/java/io/atomix/utils/Builder.java    | 37 -------------------
 .../utils/serializer/SerializerBuilder.java   | 10 +++--
 3 files changed, 12 insertions(+), 43 deletions(-)
 delete mode 100644 third-party/atomix/utils/src/main/java/io/atomix/utils/Builder.java

diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java
index 74923f6026..fb79665033 100644
--- a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java
+++ b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java
@@ -667,7 +667,7 @@ public class SegmentedJournal<E> implements Journal<E> {
   /**
    * Raft log builder.
    */
-  public static class Builder<E> implements io.atomix.utils.Builder<SegmentedJournal<E>> {
+  public static class Builder<E> {
     private static final boolean DEFAULT_FLUSH_ON_COMMIT = false;
     private static final String DEFAULT_NAME = "atomix";
     private static final String DEFAULT_DIRECTORY = System.getProperty("user.dir");
@@ -868,7 +868,11 @@ public class SegmentedJournal<E> implements Journal<E> {
       return this;
     }
 
-    @Override
+    /**
+     * Build the {@link SegmentedJournal}.
+     *
+     * @return A new {@link SegmentedJournal}.
+     */
     public SegmentedJournal<E> build() {
       return new SegmentedJournal<>(
           name,
diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/Builder.java b/third-party/atomix/utils/src/main/java/io/atomix/utils/Builder.java
deleted file mode 100644
index 1d44c7929b..0000000000
--- a/third-party/atomix/utils/src/main/java/io/atomix/utils/Builder.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2017-present Open Networking 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 io.atomix.utils;
-
-/**
- * Object builder.
- * <p>
- * This is a base interface for building objects in Catalyst.
- *
- * @param <T> type to build
- */
-public interface Builder<T> {
-
-  /**
-   * Builds the object.
-   * <p>
-   * The returned object may be a new instance of the built class or a recycled instance, depending on the semantics
-   * of the builder implementation. Users should never assume that a builder allocates a new instance.
-   *
-   * @return The built object.
-   */
-  T build();
-
-}
diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/SerializerBuilder.java b/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/SerializerBuilder.java
index 0d9c7489ee..074446bc96 100644
--- a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/SerializerBuilder.java
+++ b/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/SerializerBuilder.java
@@ -15,12 +15,10 @@
  */
 package io.atomix.utils.serializer;
 
-import io.atomix.utils.Builder;
-
 /**
  * Serializer builder.
  */
-public class SerializerBuilder implements Builder<Serializer> {
+public class SerializerBuilder {
   private final String name;
   private final Namespace.Builder namespaceBuilder = Namespace.builder()
       .register(Namespaces.BASIC)
@@ -119,7 +117,11 @@ public class SerializerBuilder implements Builder<Serializer> {
     return this;
   }
 
-  @Override
+  /**
+   * Build the {@link Serializer}.
+   *
+   * @return A new {@link Serializer}.
+   */
   public Serializer build() {
     return Serializer.using(name != null ? namespaceBuilder.build(name) : namespaceBuilder.build());
   }
-- 
2.36.6