From 5360b07bd36e6b3479c1bb3f911bb34f8d661b1f Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 21 Sep 2016 15:15:44 +0000
Subject: [PATCH] OPENDJ-2413 Apply PR comments: remove builders in parameters classes, simplify configuration retrieval Include also other minor changes and renaming

---
 opendj-server-legacy/src/main/java/org/opends/server/util/embedded/ImportParameters.java |   81 +++++++++++++---------------------------
 1 files changed, 26 insertions(+), 55 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/embedded/ImportParameters.java b/opendj-server-legacy/src/main/java/org/opends/server/util/embedded/ImportParameters.java
index 2449d96..e65aa6c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/embedded/ImportParameters.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/embedded/ImportParameters.java
@@ -15,9 +15,7 @@
  */
 package org.opends.server.util.embedded;
 
-/**
- * Parameters to import LDIF data to a directory server.
- */
+/** Parameters to import LDIF data to a directory server. */
 public final class ImportParameters
 {
   private String backendID;
@@ -25,17 +23,17 @@
 
   private ImportParameters()
   {
-    // private constructor to force usage of the associated Builder
+    // prefer usage of static method for creation
   }
 
   /**
-   * Creates a builder for the import parameters.
+   * Creates the import parameters.
    *
-   * @return a builder
+   * @return parameters
    */
-  public static Builder importParams()
+  public static ImportParameters importParams()
   {
-    return new Builder();
+    return new ImportParameters();
   }
 
   /**
@@ -62,55 +60,28 @@
   }
 
   /**
-   * Builder for this class.
+   * Sets the backend id of the backend to import.
+   *
+   * @param id
+   *          the backend id
+   * @return this builder
    */
-  public static final class Builder
+  public ImportParameters backendId(String id)
   {
-    private ImportParameters params;
+    backendID = id;
+    return this;
+  }
 
-    private Builder()
-    {
-      params = new ImportParameters();
-    }
-
-    /**
-     * Generates the parameters from this builder.
-     * <p>
-     * After this call, the builder is reset and can be used to generate other parameters.
-     *
-     * @return the replication parameters
-     */
-    public ImportParameters toParams()
-    {
-      ImportParameters p = params;
-      this.params = new ImportParameters();
-      return p;
-    }
-
-    /**
-     * Sets the backend id of the backend to import.
-     *
-     * @param id
-     *          the backend id
-     * @return this builder
-     */
-    public Builder backendId(String id)
-    {
-      params.backendID = id;
-      return this;
-    }
-
-    /**
-     * Sets the path to the LDIF file to be imported.
-     *
-     * @param ldifFile
-     *          The path to the LDIF file
-     * @return this builder
-     */
-    public Builder ldifFile(String ldifFile)
-    {
-      params.ldifFile = ldifFile;
-      return this;
-    }
+  /**
+   * Sets the path to the LDIF file to be imported.
+   *
+   * @param ldifFile
+   *          The path to the LDIF file
+   * @return this builder
+   */
+  public ImportParameters ldifFile(String ldifFile)
+  {
+    this.ldifFile = ldifFile;
+    return this;
   }
 }

--
Gitblit v1.10.0