rdev/gossip-revisited
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebase

Browse Source
This commit is contained in:
Edward Capriolo
2016-06-07 22:55:48 -04:00
parent 900bfda955 5532585e67
commit 496f299d01
2 changed files with 0 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/apache/gossip/GossipService.java
View File

@ -60,10 +60,6 @@ public class GossipService {
public GossipService(String cluster, URI uri, String id, public GossipService(String cluster, URI uri, String id,
List<GossipMember> gossipMembers, GossipSettings settings, GossipListener listener) List<GossipMember> gossipMembers, GossipSettings settings, GossipListener listener)
throws InterruptedException, UnknownHostException { throws InterruptedException, UnknownHostException {
<<<<<<< HEAD
gossipManager = new RandomGossipManager(cluster, uri, id, settings, gossipMembers,
listener);
=======
gossipManager = RandomGossipManager.newBuilder() gossipManager = RandomGossipManager.newBuilder()
.withId(id) .withId(id)
.cluster(cluster) .cluster(cluster)
@ -73,7 +69,6 @@ public class GossipService {
.gossipMembers(gossipMembers) .gossipMembers(gossipMembers)
.listener(listener) .listener(listener)
.build(); .build();
>>>>>>> fe196cd... GOSSIP-4: Use builder to create RandomGossipManager (Jaideep Dhok via EGC)
} }
public void start() { public void start() {

78
src/main/java/org/apache/gossip/manager/random/RandomGossipManager.java
View File

@ -23,89 +23,11 @@ import org.apache.gossip.event.GossipListener;
import org.apache.gossip.manager.GossipManager; import org.apache.gossip.manager.GossipManager;
import org.apache.gossip.manager.impl.OnlyProcessReceivedPassiveGossipThread; import org.apache.gossip.manager.impl.OnlyProcessReceivedPassiveGossipThread;
<<<<<<< HEAD
import java.net.URI; import java.net.URI;
import java.util.List; import java.util.List;
public class RandomGossipManager extends GossipManager { public class RandomGossipManager extends GossipManager {
public RandomGossipManager(String cluster, URI uri, String id, public RandomGossipManager(String cluster, URI uri, String id,
=======
import java.util.ArrayList;
import java.util.List;
public class RandomGossipManager extends GossipManager {
public static ManagerBuilder newBuilder() {
return new ManagerBuilder();
}
public static final class ManagerBuilder {
private String cluster;
private String address;
private int port;
private String id;
private GossipSettings settings;
private List<GossipMember> gossipMembers;
private GossipListener listener;
private ManagerBuilder() {}
private void checkArgument(boolean check, String msg) {
if (!check) {
throw new IllegalArgumentException(msg);
}
}
public ManagerBuilder cluster(String cluster) {
this.cluster = cluster;
return this;
}
public ManagerBuilder address(String address) {
this.address = address;
return this;
}
public ManagerBuilder port(int port) {
this.port = port;
return this;
}
public ManagerBuilder withId(String id) {
this.id = id;
return this;
}
public ManagerBuilder settings(GossipSettings settings) {
this.settings = settings;
return this;
}
public ManagerBuilder gossipMembers(List<GossipMember> members) {
this.gossipMembers = members;
return this;
}
public ManagerBuilder listener(GossipListener listener) {
this.listener = listener;
return this;
}
public RandomGossipManager build() {
checkArgument(id != null, "You must specify an id");
checkArgument(cluster != null, "You must specify a cluster name");
checkArgument(settings != null, "You must specify gossip settings");
if (this.gossipMembers == null) {
this.gossipMembers = new ArrayList<>();
}
return new RandomGossipManager(cluster, address, port, id, settings, gossipMembers, listener);
}
}
private RandomGossipManager(String cluster, String address, int port, String id,
>>>>>>> fe196cd... GOSSIP-4: Use builder to create RandomGossipManager (Jaideep Dhok via EGC)
GossipSettings settings, List<GossipMember> gossipMembers, GossipListener listener) { GossipSettings settings, List<GossipMember> gossipMembers, GossipListener listener) {
super(OnlyProcessReceivedPassiveGossipThread.class, RandomActiveGossipThread.class, cluster, super(OnlyProcessReceivedPassiveGossipThread.class, RandomActiveGossipThread.class, cluster,
uri, id, settings, gossipMembers, listener); uri, id, settings, gossipMembers, listener);