Skip to content

Commit

Permalink
Rename base DistributedPrimitiveBuilder to PrimitiveBuilder with cons…
Browse files Browse the repository at this point in the history
…istency with other primitive-related class names.
  • Loading branch information
kuujo committed Jul 5, 2018
1 parent ad116d2 commit ab20746
Show file tree
Hide file tree
Showing 34 changed files with 67 additions and 67 deletions.
4 changes: 2 additions & 2 deletions core/src/main/java/io/atomix/core/Atomix.java
Expand Up @@ -47,7 +47,7 @@
import io.atomix.core.value.AtomicValue;
import io.atomix.core.workqueue.WorkQueue;
import io.atomix.primitive.DistributedPrimitive;
import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveInfo;
import io.atomix.primitive.PrimitiveType;
import io.atomix.primitive.config.ConfigService;
Expand Down Expand Up @@ -338,7 +338,7 @@ public TransactionBuilder transactionBuilder(String name) {
}

@Override
public <B extends DistributedPrimitiveBuilder<B, C, P>, C extends PrimitiveConfig<C>, P extends DistributedPrimitive> B primitiveBuilder(
public <B extends PrimitiveBuilder<B, C, P>, C extends PrimitiveConfig<C>, P extends DistributedPrimitive> B primitiveBuilder(
String name,
PrimitiveType<B, C, P> primitiveType) {
return primitives.primitiveBuilder(name, primitiveType);
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/io/atomix/core/PrimitivesService.java
Expand Up @@ -71,7 +71,7 @@
import io.atomix.core.workqueue.WorkQueueType;
import io.atomix.core.transaction.TransactionBuilder;
import io.atomix.primitive.DistributedPrimitive;
import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveInfo;
import io.atomix.primitive.PrimitiveType;
import io.atomix.primitive.config.PrimitiveConfig;
Expand Down Expand Up @@ -705,7 +705,7 @@ <C extends PrimitiveConfig<C>, P extends DistributedPrimitive> P getPrimitive(
* @param <P> the primitive type
* @return the primitive builder
*/
<B extends DistributedPrimitiveBuilder<B, C, P>, C extends PrimitiveConfig<C>, P extends DistributedPrimitive> B primitiveBuilder(
<B extends PrimitiveBuilder<B, C, P>, C extends PrimitiveConfig<C>, P extends DistributedPrimitive> B primitiveBuilder(
String name,
PrimitiveType<B, C, P> primitiveType);

Expand All @@ -719,7 +719,7 @@ <B extends DistributedPrimitiveBuilder<B, C, P>, C extends PrimitiveConfig<C>, P
* @param <P> the primitive type
* @return the primitive builder
*/
default <B extends DistributedPrimitiveBuilder<B, C, P>, C extends PrimitiveConfig<C>, P extends DistributedPrimitive> B primitiveBuilder(
default <B extends PrimitiveBuilder<B, C, P>, C extends PrimitiveConfig<C>, P extends DistributedPrimitive> B primitiveBuilder(
String name,
PrimitiveType<B, C, P> primitiveType,
PrimitiveProtocol protocol) {
Expand Down
Expand Up @@ -15,7 +15,7 @@
*/
package io.atomix.core.barrier;

import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveManagementService;

import static com.google.common.base.Preconditions.checkNotNull;
Expand All @@ -24,7 +24,7 @@
* Distributed cyclic barrier builder.
*/
public abstract class DistributedCyclicBarrierBuilder
extends DistributedPrimitiveBuilder<DistributedCyclicBarrierBuilder, DistributedCyclicBarrierConfig, DistributedCyclicBarrier> {
extends PrimitiveBuilder<DistributedCyclicBarrierBuilder, DistributedCyclicBarrierConfig, DistributedCyclicBarrier> {

protected Runnable barrierAction = () -> {};

Expand Down
Expand Up @@ -15,14 +15,14 @@
*/
package io.atomix.core.counter;

import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveManagementService;

/**
* Builder for AtomicCounter.
*/
public abstract class AtomicCounterBuilder
extends DistributedPrimitiveBuilder<AtomicCounterBuilder, AtomicCounterConfig, AtomicCounter> {
extends PrimitiveBuilder<AtomicCounterBuilder, AtomicCounterConfig, AtomicCounter> {
public AtomicCounterBuilder(String name, AtomicCounterConfig config, PrimitiveManagementService managementService) {
super(AtomicCounterType.instance(), name, config, managementService);
}
Expand Down
Expand Up @@ -16,14 +16,14 @@
package io.atomix.core.countermap;

import io.atomix.core.counter.AtomicCounterMap;
import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveManagementService;

/**
* Builder for AtomicCounterMap.
*/
public abstract class AtomicCounterMapBuilder<K>
extends DistributedPrimitiveBuilder<AtomicCounterMapBuilder<K>, AtomicCounterMapConfig, AtomicCounterMap<K>> {
extends PrimitiveBuilder<AtomicCounterMapBuilder<K>, AtomicCounterMapConfig, AtomicCounterMap<K>> {
public AtomicCounterMapBuilder(String name, AtomicCounterMapConfig config, PrimitiveManagementService managementService) {
super(AtomicCounterMapType.instance(), name, config, managementService);
}
Expand Down
Expand Up @@ -15,14 +15,14 @@
*/
package io.atomix.core.idgenerator;

import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveManagementService;

/**
* Builder for AtomicIdGenerator.
*/
public abstract class AtomicIdGeneratorBuilder
extends DistributedPrimitiveBuilder<AtomicIdGeneratorBuilder, AtomicIdGeneratorConfig, AtomicIdGenerator> {
extends PrimitiveBuilder<AtomicIdGeneratorBuilder, AtomicIdGeneratorConfig, AtomicIdGenerator> {
protected AtomicIdGeneratorBuilder(String name, AtomicIdGeneratorConfig config, PrimitiveManagementService managementService) {
super(AtomicIdGeneratorType.instance(), name, config, managementService);
}
Expand Down
Expand Up @@ -65,7 +65,7 @@
import io.atomix.core.workqueue.WorkQueue;
import io.atomix.core.workqueue.WorkQueueType;
import io.atomix.primitive.DistributedPrimitive;
import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.ManagedPrimitiveRegistry;
import io.atomix.primitive.PrimitiveInfo;
import io.atomix.primitive.PrimitiveManagementService;
Expand Down Expand Up @@ -234,7 +234,7 @@ public <E> WorkQueue<E> getWorkQueue(String name) {
}

@Override
public <B extends DistributedPrimitiveBuilder<B, C, P>, C extends PrimitiveConfig<C>, P extends DistributedPrimitive> B primitiveBuilder(
public <B extends PrimitiveBuilder<B, C, P>, C extends PrimitiveConfig<C>, P extends DistributedPrimitive> B primitiveBuilder(
String name, PrimitiveType<B, C, P> primitiveType) {
return primitiveType.newBuilder(name, primitiveType.newConfig(), managementService);
}
Expand Down
Expand Up @@ -16,7 +16,7 @@
package io.atomix.core.leadership;

import io.atomix.cluster.MemberId;
import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveManagementService;
import io.atomix.utils.serializer.Namespace;
import io.atomix.utils.serializer.NamespaceConfig;
Expand All @@ -27,7 +27,7 @@
* Builder for constructing new {@link AsyncLeaderElection} instances.
*/
public abstract class LeaderElectionBuilder<T>
extends DistributedPrimitiveBuilder<LeaderElectionBuilder<T>, LeaderElectionConfig, LeaderElection<T>> {
extends PrimitiveBuilder<LeaderElectionBuilder<T>, LeaderElectionConfig, LeaderElection<T>> {

public LeaderElectionBuilder(String name, LeaderElectionConfig config, PrimitiveManagementService managementService) {
super(LeaderElectionType.instance(), name, config, managementService);
Expand Down
Expand Up @@ -16,7 +16,7 @@
package io.atomix.core.leadership;

import io.atomix.cluster.MemberId;
import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveManagementService;
import io.atomix.utils.serializer.Namespace;
import io.atomix.utils.serializer.NamespaceConfig;
Expand All @@ -27,7 +27,7 @@
* Builder for constructing new {@link AsyncLeaderElector} instances.
*/
public abstract class LeaderElectorBuilder<T>
extends DistributedPrimitiveBuilder<LeaderElectorBuilder<T>, LeaderElectorConfig, LeaderElector<T>> {
extends PrimitiveBuilder<LeaderElectorBuilder<T>, LeaderElectorConfig, LeaderElector<T>> {
public LeaderElectorBuilder(String name, LeaderElectorConfig config, PrimitiveManagementService managementService) {
super(LeaderElectorType.instance(), name, config, managementService);
}
Expand Down
Expand Up @@ -15,15 +15,15 @@
*/
package io.atomix.core.list;

import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveManagementService;

/**
* Builder for distributed queue.
*
* @param <E> queue element type
*/
public abstract class DistributedListBuilder<E> extends DistributedPrimitiveBuilder<DistributedListBuilder<E>, DistributedListConfig, DistributedList<E>> {
public abstract class DistributedListBuilder<E> extends PrimitiveBuilder<DistributedListBuilder<E>, DistributedListConfig, DistributedList<E>> {
public DistributedListBuilder(String name, DistributedListConfig config, PrimitiveManagementService managementService) {
super(DistributedListType.instance(), name, config, managementService);
}
Expand Down
Expand Up @@ -15,14 +15,14 @@
*/
package io.atomix.core.lock;

import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveManagementService;

/**
* Builder for AtomicIdGenerator.
*/
public abstract class DistributedLockBuilder
extends DistributedPrimitiveBuilder<DistributedLockBuilder, DistributedLockConfig, DistributedLock> {
extends PrimitiveBuilder<DistributedLockBuilder, DistributedLockConfig, DistributedLock> {
public DistributedLockBuilder(String name, DistributedLockConfig config, PrimitiveManagementService managementService) {
super(DistributedLockType.instance(), name, config, managementService);
}
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/io/atomix/core/map/AtomicMapBuilder.java
Expand Up @@ -15,7 +15,7 @@
*/
package io.atomix.core.map;

import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveManagementService;

/**
Expand All @@ -25,7 +25,7 @@
* @param <V> type for map value
*/
public abstract class AtomicMapBuilder<K, V>
extends DistributedPrimitiveBuilder<AtomicMapBuilder<K, V>, AtomicMapConfig, AtomicMap<K, V>> {
extends PrimitiveBuilder<AtomicMapBuilder<K, V>, AtomicMapConfig, AtomicMap<K, V>> {

public AtomicMapBuilder(String name, AtomicMapConfig config, PrimitiveManagementService managementService) {
super(AtomicMapType.instance(), name, config, managementService);
Expand Down
Expand Up @@ -16,14 +16,14 @@

package io.atomix.core.multimap;

import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveManagementService;

/**
* A builder class for {@code AsyncConsistentMultimap}.
*/
public abstract class AtomicMultimapBuilder<K, V>
extends DistributedPrimitiveBuilder<AtomicMultimapBuilder<K, V>, AtomicMultimapConfig, AtomicMultimap<K, V>> {
extends PrimitiveBuilder<AtomicMultimapBuilder<K, V>, AtomicMultimapConfig, AtomicMultimap<K, V>> {
public AtomicMultimapBuilder(String name, AtomicMultimapConfig config, PrimitiveManagementService managementService) {
super(AtomicMultimapType.instance(), name, config, managementService);
}
Expand Down
Expand Up @@ -15,15 +15,15 @@
*/
package io.atomix.core.multiset;

import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveManagementService;

/**
* Builder for distributed multiset.
*
* @param <E> multiset element type
*/
public abstract class DistributedMultisetBuilder<E> extends DistributedPrimitiveBuilder<DistributedMultisetBuilder<E>, DistributedMultisetConfig, DistributedMultiset<E>> {
public abstract class DistributedMultisetBuilder<E> extends PrimitiveBuilder<DistributedMultisetBuilder<E>, DistributedMultisetConfig, DistributedMultiset<E>> {
public DistributedMultisetBuilder(String name, DistributedMultisetConfig config, PrimitiveManagementService managementService) {
super(DistributedMultisetType.instance(), name, config, managementService);
}
Expand Down
Expand Up @@ -15,15 +15,15 @@
*/
package io.atomix.core.queue;

import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveManagementService;

/**
* Builder for distributed queue.
*
* @param <E> queue element type
*/
public abstract class DistributedQueueBuilder<E> extends DistributedPrimitiveBuilder<DistributedQueueBuilder<E>, DistributedQueueConfig, DistributedQueue<E>> {
public abstract class DistributedQueueBuilder<E> extends PrimitiveBuilder<DistributedQueueBuilder<E>, DistributedQueueConfig, DistributedQueue<E>> {
public DistributedQueueBuilder(String name, DistributedQueueConfig config, PrimitiveManagementService managementService) {
super(DistributedQueueType.instance(), name, config, managementService);
}
Expand Down
Expand Up @@ -15,11 +15,11 @@
*/
package io.atomix.core.semaphore;

import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveManagementService;

public abstract class DistributedSemaphoreBuilder
extends DistributedPrimitiveBuilder<DistributedSemaphoreBuilder, DistributedSemaphoreConfig, DistributedSemaphore> {
extends PrimitiveBuilder<DistributedSemaphoreBuilder, DistributedSemaphoreConfig, DistributedSemaphore> {
public DistributedSemaphoreBuilder(String name, DistributedSemaphoreConfig config, PrimitiveManagementService managementService) {
super(DistributedSemaphoreType.instance(), name, config, managementService);
}
Expand Down
Expand Up @@ -15,15 +15,15 @@
*/
package io.atomix.core.set;

import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveManagementService;

/**
* Builder for distributed set.
*
* @param <E> type set elements.
*/
public abstract class DistributedSetBuilder<E> extends DistributedPrimitiveBuilder<DistributedSetBuilder<E>, DistributedSetConfig, DistributedSet<E>> {
public abstract class DistributedSetBuilder<E> extends PrimitiveBuilder<DistributedSetBuilder<E>, DistributedSetConfig, DistributedSet<E>> {
public DistributedSetBuilder(String name, DistributedSetConfig config, PrimitiveManagementService managementService) {
super(DistributedSetType.instance(), name, config, managementService);
}
Expand Down
Expand Up @@ -15,13 +15,13 @@
*/
package io.atomix.core.transaction;

import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveManagementService;

/**
* Transaction builder.
*/
public abstract class TransactionBuilder extends DistributedPrimitiveBuilder<TransactionBuilder, TransactionConfig, Transaction> {
public abstract class TransactionBuilder extends PrimitiveBuilder<TransactionBuilder, TransactionConfig, Transaction> {
protected TransactionBuilder(String name, TransactionConfig config, PrimitiveManagementService managementService) {
super(TransactionType.instance(), name, config, managementService);
}
Expand Down
Expand Up @@ -16,14 +16,14 @@
package io.atomix.core.transaction;

import io.atomix.core.map.AtomicMapType;
import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveManagementService;

/**
* Transactional map builder.
*/
public abstract class TransactionalMapBuilder<K, V>
extends DistributedPrimitiveBuilder<TransactionalMapBuilder<K, V>, TransactionalMapConfig, TransactionalMap<K, V>> {
extends PrimitiveBuilder<TransactionalMapBuilder<K, V>, TransactionalMapConfig, TransactionalMap<K, V>> {
protected TransactionalMapBuilder(String name, TransactionalMapConfig config, PrimitiveManagementService managementService) {
super(AtomicMapType.instance(), name, config, managementService);
}
Expand Down
Expand Up @@ -16,14 +16,14 @@
package io.atomix.core.transaction;

import io.atomix.core.set.DistributedSetType;
import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveManagementService;

/**
* Transactional set builder.
*/
public abstract class TransactionalSetBuilder<E>
extends DistributedPrimitiveBuilder<TransactionalSetBuilder<E>, TransactionalSetConfig, TransactionalSet<E>> {
extends PrimitiveBuilder<TransactionalSetBuilder<E>, TransactionalSetConfig, TransactionalSet<E>> {
protected TransactionalSetBuilder(String name, TransactionalSetConfig config, PrimitiveManagementService managementService) {
super(DistributedSetType.instance(), name, config, managementService);
}
Expand Down
Expand Up @@ -16,14 +16,14 @@

package io.atomix.core.tree;

import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveManagementService;

/**
* Builder for {@link AtomicDocumentTree}.
*/
public abstract class AtomicDocumentTreeBuilder<V>
extends DistributedPrimitiveBuilder<AtomicDocumentTreeBuilder<V>, AtomicDocumentTreeConfig, AtomicDocumentTree<V>> {
extends PrimitiveBuilder<AtomicDocumentTreeBuilder<V>, AtomicDocumentTreeConfig, AtomicDocumentTree<V>> {
protected AtomicDocumentTreeBuilder(String name, AtomicDocumentTreeConfig config, PrimitiveManagementService managementService) {
super(AtomicDocumentTreeType.instance(), name, config, managementService);
}
Expand Down
Expand Up @@ -16,14 +16,14 @@

package io.atomix.core.treemap;

import io.atomix.primitive.DistributedPrimitiveBuilder;
import io.atomix.primitive.PrimitiveBuilder;
import io.atomix.primitive.PrimitiveManagementService;

/**
* Builder for {@link AtomicTreeMap}.
*/
public abstract class AtomicTreeMapBuilder<V>
extends DistributedPrimitiveBuilder<AtomicTreeMapBuilder<V>, AtomicTreeMapConfig, AtomicTreeMap<V>> {
extends PrimitiveBuilder<AtomicTreeMapBuilder<V>, AtomicTreeMapConfig, AtomicTreeMap<V>> {
public AtomicTreeMapBuilder(String name, AtomicTreeMapConfig config, PrimitiveManagementService managementService) {
super(AtomicTreeMapType.instance(), name, config, managementService);
}
Expand Down

0 comments on commit ab20746

Please sign in to comment.