/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You 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 org.apache.accumulo.core.client;

import java.util.Properties;

import org.apache.accumulo.core.client.lexicoder.Lexicoder;
import org.apache.accumulo.core.client.rfile.RFile;
import org.apache.accumulo.core.clientImpl.ClientContext;

/**
 * This class contains all API entry points created in 2.0.0 or later. The majority of the API is
 * accessible indirectly via methods in this class. Below are a list of APIs entry points that are
 * not accessible from here.
 *
 * <UL>
 * <LI>Hadoop input, output formats and partitioners in {@code org.apache.accumulo.hadoop.mapred}
 * and {@code org.apache.accumulo.hadoop.mapreduce} packages.
 * <LI>{@code org.apache.accumulo.minicluster.MiniAccumuloCluster} Not linkable by javadoc, because
 * in a separate module.
 * <LI>{@link Lexicoder} and all of its implementations in the same package.
 * <LI>{@link RFile}
 * </UL>
 *
 * @see <a href="http://accumulo.apache.org/">Accumulo Website</a>
 * @see <a href="http://accumulo.apache.org/api">Accumulo Public API</a>
 * @see <a href="http://semver.org/spec/v2.0.0">Semver 2.0</a>
 * @since 2.0.0
 */
// CHECKSTYLE:ON
public final class Accumulo {

  private Accumulo() {}

  /**
   * Fluent entry point for creating an {@link AccumuloClient}. For example:
   *
   * <pre>
   * <code>
   * try (AccumuloClient client = Accumulo.newClient()
   *        .to(instanceName, zookeepers)
   *        .as(user, password).build())
   * {
   *   // use the client
   * }
   * </code>
   * </pre>
   *
   * @return a builder object for Accumulo clients
   */
  public static AccumuloClient.PropertyOptions<AccumuloClient> newClient() {
    return new ClientContext.ClientBuilderImpl<>(ClientContext.ClientBuilderImpl::buildClient);
  }

  /**
   * Fluent entry point for creating client {@link Properties}. For example:
   *
   * <pre>
   * <code>
   * Properties clientProperties = Accumulo.newClientProperties()
   *              .to(instanceName, zookeepers)
   *              .as(user, password).build())
   * </code>
   * </pre>
   *
   * @return a builder object for client Properties
   */
  public static AccumuloClient.PropertyOptions<Properties> newClientProperties() {
    return new ClientContext.ClientBuilderImpl<>(ClientContext.ClientBuilderImpl::buildProps);
  }
}

@@ -2077,24 +2077,83 @@
    * %3Ccode%3E%0A
+   * // Create client directly from connection information%0A
    * try (Ac
@@ -2296,57 +2296,478 @@
 *   
-// use the client%0A   * %7D%0A   * %3C/code%3E%0A   * %3C/pre%3E
+ // use the client%0A   * %7D%0A   *%0A   * // Create client using the instance name, zookeeper, and credentials from java properties or properties file%0A   * try (AccumuloClient client = Accumulo.newClient()%0A   *        .from(properties).build())%0A   * %7B%0A   *    // use the client%0A   * %7D%0A   * %3C/code%3E%0A   * %3C/pre%3E%0A   *%0A   * For a list of all client properties see the documentation on the Accumulo website:%0A   * https://accumulo.apache.org/docs/2.x/configuration/client-properties
 %0A   
@@ -3301,24 +3301,191 @@
 %3C/pre%3E%0A   *%0A
+   * For a list of all client properties see the documentation on the Accumulo website:%0A   * https://accumulo.apache.org/docs/2.x/configuration/client-properties%0A   *%0A
    * @return

Add example of client to javadoc (#1404)