Skip to content

Commit

Permalink
Removed redundant modifiers on AccumuloClient interface (#661)
Browse files Browse the repository at this point in the history
* Removed redundant use of public and abstract
  • Loading branch information
mikewalch committed Sep 25, 2018
1 parent 481f68e commit 4233b8c
Showing 1 changed file with 29 additions and 29 deletions.
Expand Up @@ -58,7 +58,7 @@ public interface AccumuloClient {
* @throws TableNotFoundException
* when the specified table doesn't exist
*/
public BatchScanner createBatchScanner(String tableName, Authorizations authorizations,
BatchScanner createBatchScanner(String tableName, Authorizations authorizations,
int numQueryThreads) throws TableNotFoundException;

/**
Expand All @@ -78,7 +78,7 @@ public BatchScanner createBatchScanner(String tableName, Authorizations authoriz
* @throws TableNotFoundException
* when the specified table doesn't exist
*/
public BatchScanner createBatchScanner(String tableName, Authorizations authorizations)
BatchScanner createBatchScanner(String tableName, Authorizations authorizations)
throws TableNotFoundException;

/**
Expand All @@ -101,7 +101,7 @@ public BatchScanner createBatchScanner(String tableName, Authorizations authoriz
* @return BatchDeleter object for configuring and deleting
*/

public BatchDeleter createBatchDeleter(String tableName, Authorizations authorizations,
BatchDeleter createBatchDeleter(String tableName, Authorizations authorizations,
int numQueryThreads, BatchWriterConfig config) throws TableNotFoundException;

/**
Expand All @@ -121,7 +121,7 @@ public BatchDeleter createBatchDeleter(String tableName, Authorizations authoriz
* @throws TableNotFoundException
* if table not found
*/
public BatchDeleter createBatchDeleter(String tableName, Authorizations authorizations,
BatchDeleter createBatchDeleter(String tableName, Authorizations authorizations,
int numQueryThreads) throws TableNotFoundException;

/**
Expand All @@ -135,7 +135,7 @@ public BatchDeleter createBatchDeleter(String tableName, Authorizations authoriz
* was set during AccumuloClient creation, BatchWriterConfig defaults will be used.
* @return BatchWriter object for configuring and writing data to
*/
public BatchWriter createBatchWriter(String tableName, BatchWriterConfig config)
BatchWriter createBatchWriter(String tableName, BatchWriterConfig config)
throws TableNotFoundException;

/**
Expand All @@ -148,7 +148,7 @@ public BatchWriter createBatchWriter(String tableName, BatchWriterConfig config)
* @throws TableNotFoundException
* if table not found
*/
public BatchWriter createBatchWriter(String tableName) throws TableNotFoundException;
BatchWriter createBatchWriter(String tableName) throws TableNotFoundException;

/**
* Factory method to create a Multi-Table BatchWriter connected to Accumulo. Multi-table batch
Expand All @@ -163,15 +163,15 @@ public BatchWriter createBatchWriter(String tableName, BatchWriterConfig config)
* defaults will be used.
* @return MultiTableBatchWriter object for configuring and writing data to
*/
public MultiTableBatchWriter createMultiTableBatchWriter(BatchWriterConfig config);
MultiTableBatchWriter createMultiTableBatchWriter(BatchWriterConfig config);

/**
* Factory method to create a Multi-Table BatchWriter. This method uses BatchWriterConfig set when
* AccumuloClient was created. If none was set, BatchWriterConfig defaults will be used.
*
* @return MultiTableBatchWriter object
*/
public MultiTableBatchWriter createMultiTableBatchWriter();
MultiTableBatchWriter createMultiTableBatchWriter();

/**
* Factory method to create a Scanner connected to Accumulo.
Expand All @@ -190,7 +190,7 @@ public BatchWriter createBatchWriter(String tableName, BatchWriterConfig config)
*
* @see IsolatedScanner
*/
public Scanner createScanner(String tableName, Authorizations authorizations)
Scanner createScanner(String tableName, Authorizations authorizations)
throws TableNotFoundException;

/**
Expand All @@ -205,64 +205,64 @@ public Scanner createScanner(String tableName, Authorizations authorizations)
* @throws TableNotFoundException
* when the specified table doesn't exist
*/
public ConditionalWriter createConditionalWriter(String tableName, ConditionalWriterConfig config)
ConditionalWriter createConditionalWriter(String tableName, ConditionalWriterConfig config)
throws TableNotFoundException;

/**
* Get the current user for this AccumuloClient
*
* @return the user name
*/
public String whoami();
String whoami();

/**
* Returns a unique string that identifies this instance of accumulo.
*
* @return a UUID
*/
public String getInstanceID();
String getInstanceID();

/**
* Retrieves a TableOperations object to perform table functions, such as create and delete.
*
* @return an object to manipulate tables
*/
public abstract TableOperations tableOperations();
TableOperations tableOperations();

/**
* Retrieves a NamespaceOperations object to perform namespace functions, such as create and
* delete.
*
* @return an object to manipulate namespaces
*/
public NamespaceOperations namespaceOperations();
NamespaceOperations namespaceOperations();

/**
* Retrieves a SecurityOperations object to perform user security operations, such as creating
* users.
*
* @return an object to modify users and permissions
*/
public SecurityOperations securityOperations();
SecurityOperations securityOperations();

/**
* Retrieves an InstanceOperations object to modify instance configuration.
*
* @return an object to modify instance configuration
*/
public InstanceOperations instanceOperations();
InstanceOperations instanceOperations();

/**
* Retrieves a ReplicationOperations object to manage replication configuration.
*
* @return an object to modify replication configuration
*/
public ReplicationOperations replicationOperations();
ReplicationOperations replicationOperations();

/**
* @return {@link ClientInfo} which contains information about client connection to Accumulo
*/
public abstract ClientInfo info();
ClientInfo info();

/**
* Change user
Expand All @@ -273,13 +273,13 @@ public ConditionalWriter createConditionalWriter(String tableName, ConditionalWr
* Authentication token
* @return {@link AccumuloClient} for new user
*/
public abstract AccumuloClient changeUser(String principal, AuthenticationToken token)
AccumuloClient changeUser(String principal, AuthenticationToken token)
throws AccumuloSecurityException, AccumuloException;

/**
* Builds ClientInfo after all options have been specified
*/
public interface ClientInfoFactory {
interface ClientInfoFactory {

/**
* Builds ClientInfo after all options have been specified
Expand All @@ -292,7 +292,7 @@ public interface ClientInfoFactory {
/**
* Builds AccumuloClient
*/
public interface AccumuloClientFactory extends ClientInfoFactory {
interface AccumuloClientFactory extends ClientInfoFactory {

/**
* Builds AccumuloClient after all options have been specified
Expand All @@ -306,14 +306,14 @@ public interface AccumuloClientFactory extends ClientInfoFactory {
/**
* Builder method for setting Accumulo instance and zookeepers
*/
public interface InstanceArgs {
interface InstanceArgs {
AuthenticationArgs forInstance(String instanceName, String zookeepers);
}

/**
* Builder methods for creating AccumuloClient using properties
*/
public interface PropertyOptions extends InstanceArgs {
interface PropertyOptions extends InstanceArgs {

/**
* Build using properties file. An example properties file can be found at
Expand All @@ -337,7 +337,7 @@ public interface PropertyOptions extends InstanceArgs {
AccumuloClientFactory usingProperties(Properties properties);
}

public interface ClientInfoOptions extends PropertyOptions {
interface ClientInfoOptions extends PropertyOptions {

/**
* Build using Accumulo client information
Expand All @@ -352,7 +352,7 @@ public interface ClientInfoOptions extends PropertyOptions {
/**
* Build methods for authentication
*/
public interface AuthenticationArgs {
interface AuthenticationArgs {

/**
* Build using password-based credentials
Expand Down Expand Up @@ -391,7 +391,7 @@ public interface AuthenticationArgs {
/**
* Build methods for SSL/TLS
*/
public interface SslOptions extends AccumuloClientFactory {
interface SslOptions extends AccumuloClientFactory {

/**
* Build with SSL trust store
Expand Down Expand Up @@ -448,7 +448,7 @@ public interface SslOptions extends AccumuloClientFactory {
/**
* Build methods for SASL
*/
public interface SaslOptions extends AccumuloClientFactory {
interface SaslOptions extends AccumuloClientFactory {

/**
* Build with Kerberos Server Primary
Expand All @@ -472,7 +472,7 @@ public interface SaslOptions extends AccumuloClientFactory {
/**
* Build methods for connection options
*/
public interface ConnectionOptions extends AccumuloClientFactory {
interface ConnectionOptions extends AccumuloClientFactory {

/**
* Build using Zookeeper timeout
Expand Down Expand Up @@ -518,7 +518,7 @@ public interface ConnectionOptions extends AccumuloClientFactory {
ConnectionOptions withScannerBatchSize(int batchSize);
}

public interface FromOptions extends ConnectionOptions, PropertyOptions, AuthenticationArgs {
interface FromOptions extends ConnectionOptions, PropertyOptions, AuthenticationArgs {

}
}

0 comments on commit 4233b8c

Please sign in to comment.