Simplify resource option/configuration APIs.

collections/src/main/java/io/atomix/collections/DistributedMap.java

@@ -47,7 +47,25 @@
  * @author <a href="http://github.com/kuujo">Jordan Halterman</a>
  */
 @ResourceTypeInfo(id=-11, stateMachine=MapState.class, typeResolver=MapCommands.TypeResolver.class)
-public class DistributedMap<K, V> extends Resource<DistributedMap<K, V>, Resource.Options> {
+public class DistributedMap<K, V> extends Resource<DistributedMap<K, V>> {
+
+  /**
+   * Returns new map options.
+   *
+   * @return New map options.
+   */
+  public static Options options() {
+    return new Options();
+  }
+
+  /**
+   * Returns a new map configuration.
+   *
+   * @return A new map configuration.
+   */
+  public static Config config() {
+    return new Config();
+  }
 
   public DistributedMap(CopycatClient client, Resource.Options options) {
     super(client, options);

collections/src/main/java/io/atomix/collections/DistributedMultiMap.java

@@ -31,7 +31,25 @@
  * @author <a href="http://github.com/kuujo>Jordan Halterman</a>
  */
 @ResourceTypeInfo(id=-12, stateMachine=MultiMapState.class, typeResolver=MultiMapCommands.TypeResolver.class)
-public class DistributedMultiMap<K, V> extends Resource<DistributedMultiMap<K, V>, Resource.Options> {
+public class DistributedMultiMap<K, V> extends Resource<DistributedMultiMap<K, V>> {
+
+  /**
+   * Returns new multimap options.
+   *
+   * @return New multimap options.
+   */
+  public static Options options() {
+    return new Options();
+  }
+
+  /**
+   * Returns a new multimap configuration.
+   *
+   * @return A new multimap configuration.
+   */
+  public static Config config() {
+    return new Config();
+  }
 
   public DistributedMultiMap(CopycatClient client, Resource.Options options) {
     super(client, options);

collections/src/main/java/io/atomix/collections/DistributedQueue.java

@@ -30,7 +30,25 @@
  * @author <a href="http://github.com/kuujo">Jordan Halterman</a>
  */
 @ResourceTypeInfo(id=-14, stateMachine=QueueState.class, typeResolver=QueueCommands.TypeResolver.class)
-public class DistributedQueue<T> extends Resource<DistributedQueue<T>, Resource.Options> {
+public class DistributedQueue<T> extends Resource<DistributedQueue<T>> {
+
+  /**
+   * Returns new queue options.
+   *
+   * @return New queue options.
+   */
+  public static Options options() {
+    return new Options();
+  }
+
+  /**
+   * Returns a new queue configuration.
+   *
+   * @return A new queue configuration.
+   */
+  public static Config config() {
+    return new Config();
+  }
 
   public DistributedQueue(CopycatClient client, Resource.Options options) {
     super(client, options);

collections/src/main/java/io/atomix/collections/DistributedSet.java

@@ -31,7 +31,25 @@
  * @author <a href="http://github.com/kuujo">Jordan Halterman</a>
  */
 @ResourceTypeInfo(id=-13, stateMachine=SetState.class, typeResolver=SetCommands.TypeResolver.class)
-public class DistributedSet<T> extends Resource<DistributedSet<T>, Resource.Options> {
+public class DistributedSet<T> extends Resource<DistributedSet<T>> {
+
+  /**
+   * Returns new set options.
+   *
+   * @return New set options.
+   */
+  public static Options options() {
+    return new Options();
+  }
+
+  /**
+   * Returns a new set configuration.
+   *
+   * @return A new set configuration.
+   */
+  public static Config config() {
+    return new Config();
+  }
 
   public DistributedSet(CopycatClient client, Resource.Options options) {
     super(client, options);

coordination/src/main/java/io/atomix/coordination/DistributedGroup.java

@@ -92,7 +92,26 @@
  * @author <a href="http://github.com/kuujo>Jordan Halterman</a>
  */
 @ResourceTypeInfo(id=-20, stateMachine=GroupState.class, typeResolver=GroupCommands.TypeResolver.class)
-public class DistributedGroup extends Resource<DistributedGroup, Resource.Options> {
+public class DistributedGroup extends Resource<DistributedGroup> {
+
+  /**
+   * Returns new group options.
+   *
+   * @return New group options.
+   */
+  public static Options options() {
+    return new Options();
+  }
+
+  /**
+   * Returns a new group configuration.
+   *
+   * @return A new group configuration.
+   */
+  public static Config config() {
+    return new Config();
+  }
+
   private final Listeners<GroupMember> joinListeners = new Listeners<>();
   private final Listeners<GroupMember> leaveListeners = new Listeners<>();
   private final Listeners<Long> termListeners = new Listeners<>();

coordination/src/main/java/io/atomix/coordination/DistributedLock.java

@@ -78,7 +78,26 @@
  * @author <a href="http://github.com/kuujo">Jordan Halterman</a>
  */
 @ResourceTypeInfo(id=-22, stateMachine=LockState.class, typeResolver=LockCommands.TypeResolver.class)
-public class DistributedLock extends Resource<DistributedLock, Resource.Options> {
+public class DistributedLock extends Resource<DistributedLock> {
+
+  /**
+   * Returns new lock options.
+   *
+   * @return New lock options.
+   */
+  public static Options options() {
+    return new Options();
+  }
+
+  /**
+   * Returns a new lock configuration.
+   *
+   * @return A new lock configuration.
+   */
+  public static Config config() {
+    return new Config();
+  }
+
   private final Queue<Consumer<Long>> queue = new ConcurrentLinkedQueue<>();
 
   public DistributedLock(CopycatClient client, Resource.Options options) {