Skip to content

Commit 9d0078b

Browse files
committed
Removed service-groups; updated toString()s
1 parent 78e66a2 commit 9d0078b

File tree

7 files changed

+36
-49
lines changed

7 files changed

+36
-49
lines changed

services-api/src/main/java/io/scalecube/services/ServiceInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public Authenticator authenticator() {
5757
public String toString() {
5858
return new StringJoiner(", ", ServiceInfo.class.getSimpleName() + "[", "]")
5959
.add("serviceInstance=" + serviceInstance)
60-
.add("tags=" + tags)
60+
.add("tags(" + tags.size() + ")")
6161
.add("errorMapper=" + errorMapper)
6262
.add("dataDecoder=" + dataDecoder)
6363
.add("authenticator=" + authenticator)

services-api/src/main/java/io/scalecube/services/ServiceMethodDefinition.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.Collections;
44
import java.util.Map;
5+
import java.util.StringJoiner;
56

67
/**
78
* A Service Method Definition is a single method definition of a service inside service
@@ -76,14 +77,10 @@ public ServiceMethodDefinition setAuth(boolean auth) {
7677

7778
@Override
7879
public String toString() {
79-
return "ServiceMethodDefinition{"
80-
+ "action='"
81-
+ action
82-
+ '\''
83-
+ ", tags="
84-
+ tags
85-
+ ", auth="
86-
+ auth
87-
+ '}';
80+
return new StringJoiner(", ", ServiceMethodDefinition.class.getSimpleName() + "[", "]")
81+
.add("action=" + action)
82+
.add("tags(" + tags.size() + ")")
83+
.add("auth=" + auth)
84+
.toString();
8885
}
8986
}

services-api/src/main/java/io/scalecube/services/ServiceReference.java

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.HashMap;
77
import java.util.Map;
88
import java.util.Set;
9+
import java.util.StringJoiner;
910

1011
/**
1112
* Service reference. This is merge of service method information together with service registration
@@ -88,30 +89,13 @@ private Map<String, String> mergeTags(
8889

8990
@Override
9091
public String toString() {
91-
return "ServiceReference{"
92-
+ "qualifier='"
93-
+ qualifier
94-
+ '\''
95-
+ ", endpointId='"
96-
+ endpointId
97-
+ '\''
98-
+ ", address='"
99-
+ address
100-
+ '\''
101-
+ ", namespace='"
102-
+ namespace
103-
+ '\''
104-
+ ", contentTypes='"
105-
+ contentTypes
106-
+ '\''
107-
+ ", tags="
108-
+ tags
109-
+ ", action='"
110-
+ action
111-
+ '\''
112-
+ ", auth='"
113-
+ auth
114-
+ '\''
115-
+ '}';
92+
return new StringJoiner(", ", ServiceReference.class.getSimpleName() + "[", "]")
93+
.add("endpointId=" + endpointId)
94+
.add("address=" + address)
95+
.add("qualifier=" + qualifier)
96+
.add("contentTypes=" + contentTypes)
97+
.add("tags(" + tags.size() + ")")
98+
.add("auth=" + auth)
99+
.toString();
116100
}
117101
}

services-api/src/main/java/io/scalecube/services/ServiceRegistration.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.Collection;
44
import java.util.Map;
5+
import java.util.StringJoiner;
56

67
public class ServiceRegistration {
78

@@ -49,14 +50,10 @@ public ServiceRegistration setTags(Map<String, String> tags) {
4950

5051
@Override
5152
public String toString() {
52-
return "ServiceRegistration{"
53-
+ "namespace='"
54-
+ namespace
55-
+ '\''
56-
+ ", tags="
57-
+ tags
58-
+ ", methods="
59-
+ methods
60-
+ '}';
53+
return new StringJoiner(", ", ServiceRegistration.class.getSimpleName() + "[", "]")
54+
.add("namespace=" + namespace)
55+
.add("tags(" + tags.size() + ")")
56+
.add("methods(" + methods.size() + ")")
57+
.toString();
6158
}
6259
}

services-api/src/main/java/io/scalecube/services/api/ErrorData.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.scalecube.services.api;
22

3+
import java.util.StringJoiner;
4+
35
public final class ErrorData {
46

57
private int errorCode;
@@ -33,6 +35,9 @@ public String getErrorMessage() {
3335

3436
@Override
3537
public String toString() {
36-
return "ErrorData{" + "errorCode=" + errorCode + ", errorMessage='" + errorMessage + '\'' + '}';
38+
return new StringJoiner(", ", ErrorData.class.getSimpleName() + "[", "]")
39+
.add("errorCode=" + errorCode)
40+
.add("errorMessage=" + errorMessage)
41+
.toString();
3742
}
3843
}

services-api/src/main/java/io/scalecube/services/api/ServiceMessage.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.Map;
66
import java.util.Objects;
77
import java.util.Optional;
8+
import java.util.StringJoiner;
89

910
public final class ServiceMessage {
1011

@@ -184,7 +185,10 @@ public int errorType() {
184185

185186
@Override
186187
public String toString() {
187-
return "ServiceMessage {headers: " + headers + ", data: " + data + '}';
188+
return new StringJoiner(", ", ServiceMessage.class.getSimpleName() + "[", "]")
189+
.add("headers(" + headers.size() + ")")
190+
.add("data=" + (data != null ? data.getClass().getName() : null))
191+
.toString();
188192
}
189193

190194
public static class Builder {

services-api/src/main/java/io/scalecube/services/methods/MethodInfo.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ public boolean isAuth() {
101101
@Override
102102
public String toString() {
103103
return new StringJoiner(", ", MethodInfo.class.getSimpleName() + "[", "]")
104-
.add("serviceName='" + serviceName + "'")
105-
.add("methodName='" + methodName + "'")
106-
.add("qualifier='" + qualifier + "'")
104+
.add("serviceName=" + serviceName)
105+
.add("methodName=" + methodName)
106+
.add("qualifier=" + qualifier)
107107
.add("parameterizedReturnType=" + parameterizedReturnType)
108108
.add("isReturnTypeServiceMessage=" + isReturnTypeServiceMessage)
109109
.add("communicationMode=" + communicationMode)

0 commit comments

Comments
 (0)