Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cluster-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.scalecube</groupId>
<artifactId>scalecube-cluster-parent</artifactId>
<version>2.4.2</version>
<version>2.4.3-SNAPSHOT</version>
</parent>

<artifactId>scalecube-cluster-api</artifactId>
Expand Down
56 changes: 32 additions & 24 deletions cluster-api/src/main/java/io/scalecube/cluster/ClusterConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import io.scalecube.cluster.metadata.MetadataEncoder;
import io.scalecube.cluster.transport.api.TransportConfig;
import java.util.Optional;
import java.util.StringJoiner;
import java.util.function.UnaryOperator;
import reactor.core.Exceptions;

Expand Down Expand Up @@ -34,6 +35,7 @@ public final class ClusterConfig implements Cloneable {
private MetadataEncoder metadataEncoder = MetadataEncoder.INSTANCE;
private MetadataDecoder metadataDecoder = MetadataDecoder.INSTANCE;

private String memberId;
private String memberHost;
private Integer memberPort;

Expand Down Expand Up @@ -158,14 +160,30 @@ public String memberHost() {
* Sets a memberHost.
*
* @param memberHost member host
* @return new {@code ClusterConfig} instance@return
* @return new {@code ClusterConfig} instance
*/
public ClusterConfig memberHost(String memberHost) {
ClusterConfig c = clone();
c.memberHost = memberHost;
return c;
}

public String memberId() {
return memberId;
}

/**
* Sets a memberId.
*
* @param memberId member id
* @return new {@code ClusterConfig} instance
*/
public ClusterConfig memberId(String memberId) {
ClusterConfig c = clone();
c.memberId = memberId;
return c;
}

public Integer memberPort() {
return memberPort;
}
Expand Down Expand Up @@ -262,29 +280,19 @@ public ClusterConfig clone() {

@Override
public String toString() {
return "ClusterConfig{"
+ "metadata="
+ metadataAsString()
+ ", metadataTimeout="
+ metadataTimeout
+ ", metadataEncoder="
+ metadataEncoder
+ ", metadataDecoder="
+ metadataDecoder
+ ", memberHost='"
+ memberHost
+ '\''
+ ", memberPort="
+ memberPort
+ ", transportConfig="
+ transportConfig
+ ", failureDetectorConfig="
+ failureDetectorConfig
+ ", gossipConfig="
+ gossipConfig
+ ", membershipConfig="
+ membershipConfig
+ '}';
return new StringJoiner(", ", ClusterConfig.class.getSimpleName() + "[", "]")
.add("metadata=" + metadataAsString())
.add("metadataTimeout=" + metadataTimeout)
.add("metadataEncoder=" + metadataEncoder)
.add("metadataDecoder=" + metadataDecoder)
.add("memberId='" + memberId + "'")
.add("memberHost='" + memberHost + "'")
.add("memberPort=" + memberPort)
.add("transportConfig=" + transportConfig)
.add("failureDetectorConfig=" + failureDetectorConfig)
.add("gossipConfig=" + gossipConfig)
.add("membershipConfig=" + membershipConfig)
.toString();
}

private String metadataAsString() {
Expand Down
2 changes: 1 addition & 1 deletion cluster-api/src/main/java/io/scalecube/cluster/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ public int hashCode() {

@Override
public String toString() {
return id + "@" + address;
return id + ":" + address.port();
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.scalecube.cluster.fdetector;

import java.util.StringJoiner;
import reactor.core.Exceptions;

public final class FailureDetectorConfig implements Cloneable {
Expand Down Expand Up @@ -121,13 +122,10 @@ public FailureDetectorConfig clone() {

@Override
public String toString() {
return "FailureDetectorConfig{"
+ "pingInterval="
+ pingInterval
+ ", pingTimeout="
+ pingTimeout
+ ", pingReqMembers="
+ pingReqMembers
+ '}';
return new StringJoiner(", ", FailureDetectorConfig.class.getSimpleName() + "[", "]")
.add("pingInterval=" + pingInterval)
.add("pingTimeout=" + pingTimeout)
.add("pingReqMembers=" + pingReqMembers)
.toString();
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.scalecube.cluster.gossip;

import java.util.StringJoiner;
import reactor.core.Exceptions;

public final class GossipConfig implements Cloneable {
Expand Down Expand Up @@ -115,13 +116,10 @@ public GossipConfig clone() {

@Override
public String toString() {
return "GossipConfig{"
+ "gossipFanout="
+ gossipFanout
+ ", gossipInterval="
+ gossipInterval
+ ", gossipRepeatMult="
+ gossipRepeatMult
+ '}';
return new StringJoiner(", ", GossipConfig.class.getSimpleName() + "[", "]")
.add("gossipFanout=" + gossipFanout)
.add("gossipInterval=" + gossipInterval)
.add("gossipRepeatMult=" + gossipRepeatMult)
.toString();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.StringJoiner;
import reactor.core.Exceptions;

public final class MembershipConfig implements Cloneable {
Expand Down Expand Up @@ -167,18 +168,12 @@ public MembershipConfig clone() {

@Override
public String toString() {
return "MembershipConfig{"
+ "seedMembers="
+ seedMembers
+ ", syncInterval="
+ syncInterval
+ ", syncTimeout="
+ syncTimeout
+ ", suspicionMult="
+ suspicionMult
+ ", syncGroup='"
+ syncGroup
+ '\''
+ '}';
return new StringJoiner(", ", MembershipConfig.class.getSimpleName() + "[", "]")
.add("seedMembers=" + seedMembers)
.add("syncInterval=" + syncInterval)
.add("syncTimeout=" + syncTimeout)
.add("suspicionMult=" + suspicionMult)
.add("syncGroup='" + syncGroup + "'")
.toString();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import io.scalecube.cluster.Member;
import java.nio.ByteBuffer;
import java.util.Objects;
import java.util.StringJoiner;

/**
* Event which is emitted on cluster membership changes when new member added, updated in the
Expand Down Expand Up @@ -97,15 +98,12 @@ public ByteBuffer newMetadata() {

@Override
public String toString() {
return "MembershipEvent{type="
+ type
+ ", member="
+ member
+ ", newMetadata="
+ metadataAsString(newMetadata)
+ ", oldMetadata="
+ metadataAsString(oldMetadata)
+ '}';
return new StringJoiner(", ", MembershipEvent.class.getSimpleName() + "[", "]")
.add("type=" + type)
.add("member=" + member)
.add("oldMetadata=" + metadataAsString(oldMetadata))
.add("newMetadata=" + metadataAsString(newMetadata))
.toString();
}

private String metadataAsString(ByteBuffer metadata) {
Expand Down
2 changes: 1 addition & 1 deletion cluster-testlib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>scalecube-cluster-parent</artifactId>
<groupId>io.scalecube</groupId>
<version>2.4.2</version>
<version>2.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.Map;
import java.util.StringJoiner;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicLong;
Expand Down Expand Up @@ -369,7 +370,10 @@ public long evaluateDelay() {

@Override
public String toString() {
return "OutboundSettings{loss=" + lossPercent + ", delay=" + meanDelay + '}';
return new StringJoiner(", ", OutboundSettings.class.getSimpleName() + "[", "]")
.add("lossPercent=" + lossPercent)
.add("meanDelay=" + meanDelay)
.toString();
}
}

Expand Down Expand Up @@ -405,7 +409,9 @@ public boolean shallPass() {

@Override
public String toString() {
return "InboundSettings{shallPass=" + shallPass + '}';
return new StringJoiner(", ", InboundSettings.class.getSimpleName() + "[", "]")
.add("shallPass=" + shallPass)
.toString();
}
}
}
2 changes: 1 addition & 1 deletion cluster/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.scalecube</groupId>
<artifactId>scalecube-cluster-parent</artifactId>
<version>2.4.2</version>
<version>2.4.3-SNAPSHOT</version>
</parent>

<artifactId>scalecube-cluster</artifactId>
Expand Down
Loading