Skip to content

Commit 4a18392

Browse files
kenuiuckenuiuc
committed
rm EMBatchMetadata
1 parent 1223090 commit 4a18392

File tree

6 files changed

+34
-54
lines changed

6 files changed

+34
-54
lines changed

‎im-sdk-core/src/integration-test/java/com/easemob/im/server/api/metadata/MetadataIT.java‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.easemob.im.server.api.metadata;
22

33
import com.easemob.im.server.api.AbstractIT;
4-
import com.easemob.im.server.model.EMBatchMetadata;
4+
import com.easemob.im.server.model.EMMetadata;
55
import org.junit.jupiter.api.Test;
66

77
import java.time.Duration;
@@ -31,11 +31,11 @@ public void testMetadataSet() {
3131
ThreadLocalRandom.current().nextInt(100000000));
3232
String randomPassword = randomUsername;
3333
assertDoesNotThrow(() -> this.service.user().create(randomUsername, randomPassword)
34-
.block(Duration.ofSeconds(3)));
34+
.block(Duration.ofSeconds(10)));
3535
assertDoesNotThrow(() -> this.service.metadata().setMetadataToUser(randomUsername, map)
36-
.block(Duration.ofSeconds(3)));
36+
.block(Duration.ofSeconds(10)));
3737
assertDoesNotThrow(
38-
() -> this.service.user().delete(randomUsername).block(Duration.ofSeconds(3)));
38+
() -> this.service.user().delete(randomUsername).block(Duration.ofSeconds(10)));
3939
}
4040

4141
@Test
@@ -49,13 +49,13 @@ public void testMetadataGet() {
4949
ThreadLocalRandom.current().nextInt(100000000));
5050
String randomPassword = randomUsername;
5151
assertDoesNotThrow(() -> this.service.user().create(randomUsername, randomPassword)
52-
.block(Duration.ofSeconds(3)));
52+
.block(Duration.ofSeconds(10)));
5353
assertDoesNotThrow(() -> this.service.metadata().setMetadataToUser(randomUsername, map)
54-
.block(Duration.ofSeconds(3)));
54+
.block(Duration.ofSeconds(10)));
5555
assertDoesNotThrow(() -> this.service.metadata().getMetadataFromUser(randomUsername)
56-
.block(Duration.ofSeconds(3)));
56+
.block(Duration.ofSeconds(10)));
5757
assertDoesNotThrow(
58-
() -> this.service.user().delete(randomUsername).block(Duration.ofSeconds(3)));
58+
() -> this.service.user().delete(randomUsername).block(Duration.ofSeconds(10)));
5959
}
6060

6161
@Test
@@ -92,20 +92,19 @@ public void testMetadataBatchGet() {
9292
.block(Duration.ofSeconds(30)));
9393

9494
// batch get metadata from users
95-
EMBatchMetadata batchMetadata =
95+
Map<String, EMMetadata> metadataMap =
9696
assertDoesNotThrow(() -> this.service.metadata().getMetadataFromUsers(
9797
Arrays.asList(aliceName, bobName),
9898
Arrays.asList("name", "title", "zip")).block(Duration.ofSeconds(30)));
99-
Map<String, Map<String, String>> data = batchMetadata.getData();
100-
assertEquals(2, data.size());
99+
assertEquals(2, metadataMap.size());
101100

102101
// check results
103-
Map<String, String> aliceMetadata = data.get(aliceName);
102+
Map<String, String> aliceMetadata = metadataMap.get(aliceName).getData();
104103
assertEquals(2, aliceMetadata.size());
105104
assertEquals("alice", aliceMetadata.get("name"));
106105
assertEquals("java", aliceMetadata.get("title"));
107106

108-
Map<String, String> bobMetadata = data.get(bobName);
107+
Map<String, String> bobMetadata = metadataMap.get(bobName).getData();
109108
assertEquals(2, bobMetadata.size());
110109
assertEquals("bob", bobMetadata.get("name"));
111110
assertEquals("61801", bobMetadata.get("zip"));
@@ -119,7 +118,7 @@ public void testMetadataBatchGet() {
119118

120119
@Test
121120
public void testMetadataGetUsage() {
122-
assertDoesNotThrow(() -> this.service.metadata().getUsage().block(Duration.ofSeconds(3)));
121+
assertDoesNotThrow(() -> this.service.metadata().getUsage().block(Duration.ofSeconds(10)));
123122
}
124123

125124
@Test
@@ -133,15 +132,15 @@ public void testMetadataDelete() {
133132
ThreadLocalRandom.current().nextInt(100000000));
134133
String randomPassword = randomUsername;
135134
assertDoesNotThrow(() -> this.service.user().create(randomUsername, randomPassword)
136-
.block(Duration.ofSeconds(3)));
135+
.block(Duration.ofSeconds(10)));
137136
assertDoesNotThrow(() -> this.service.metadata().setMetadataToUser(randomUsername, map)
138-
.block(Duration.ofSeconds(3)));
137+
.block(Duration.ofSeconds(10)));
139138
assertDoesNotThrow(() -> this.service.metadata().getMetadataFromUser(randomUsername)
140-
.block(Duration.ofSeconds(3)));
139+
.block(Duration.ofSeconds(10)));
141140
assertDoesNotThrow(() -> this.service.metadata().deleteMetadataFromUser(randomUsername)
142-
.block(Duration.ofSeconds(3)));
141+
.block(Duration.ofSeconds(10)));
143142
assertDoesNotThrow(
144-
() -> this.service.user().delete(randomUsername).block(Duration.ofSeconds(3)));
143+
() -> this.service.user().delete(randomUsername).block(Duration.ofSeconds(10)));
145144
}
146145

147146
}

‎im-sdk-core/src/main/java/com/easemob/im/server/api/metadata/MetadataApi.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.easemob.im.server.api.metadata.user.delete.MetadataDelete;
66
import com.easemob.im.server.api.metadata.user.get.MetadataGet;
77
import com.easemob.im.server.api.metadata.user.set.MetadataSet;
8-
import com.easemob.im.server.model.EMBatchMetadata;
98
import com.easemob.im.server.model.EMMetadata;
109
import com.easemob.im.server.model.EMMetadataUsage;
1110
import reactor.core.publisher.Mono;
@@ -56,7 +55,7 @@ public Mono<EMMetadata> getMetadataFromUser(String username) {
5655
return this.metadataGet.fromUser(username);
5756
}
5857

59-
public Mono<EMBatchMetadata> getMetadataFromUsers(List<String> userNames, List<String> propertyNames) {
58+
public Mono<Map<String, EMMetadata>> getMetadataFromUsers(List<String> userNames, List<String> propertyNames) {
6059
return this.metadataGet.fromUsers(userNames, propertyNames);
6160
}
6261

‎im-sdk-core/src/main/java/com/easemob/im/server/api/metadata/user/get/MetadataGet.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.easemob.im.server.api.metadata.user.get;
22

33
import com.easemob.im.server.api.Context;
4-
import com.easemob.im.server.model.EMBatchMetadata;
54
import com.easemob.im.server.model.EMMetadata;
65
import reactor.core.publisher.Mono;
76

87
import java.util.List;
8+
import java.util.Map;
99

1010
public class MetadataGet {
1111
private Context context;
@@ -24,7 +24,7 @@ public Mono<EMMetadata> fromUser(String username) {
2424
.map(MetadataGetUserResponse::toMetadata);
2525
}
2626

27-
public Mono<EMBatchMetadata> fromUsers(List<String> userNames, List<String> propertyNames) {
27+
public Mono<Map<String, EMMetadata>> fromUsers(List<String> userNames, List<String> propertyNames) {
2828
return this.context.getHttpClient()
2929
.flatMap(httpClient -> httpClient
3030
.headers(headers -> headers.set("Content-Type", "application/json"))
@@ -36,6 +36,6 @@ public Mono<EMBatchMetadata> fromUsers(List<String> userNames, List<String> prop
3636
(rsp, buf) -> this.context.getErrorMapper().apply(rsp).then(buf))
3737
)
3838
.map(buf -> this.context.getCodec().decode(buf, MetadataGetUsersResponse.class))
39-
.map(MetadataGetUsersResponse::toBatchMetadata);
39+
.map(MetadataGetUsersResponse::toMetadataMap);
4040
}
4141
}

‎im-sdk-core/src/main/java/com/easemob/im/server/api/metadata/user/get/MetadataGetUsersResponse.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package com.easemob.im.server.api.metadata.user.get;
22

3-
import com.easemob.im.server.model.EMBatchMetadata;
3+
import com.easemob.im.server.model.EMMetadata;
44
import com.fasterxml.jackson.annotation.JsonCreator;
55
import com.fasterxml.jackson.annotation.JsonProperty;
66

7+
import java.util.HashMap;
78
import java.util.Map;
89

910
public class MetadataGetUsersResponse {
@@ -19,8 +20,12 @@ public Map<String, Map<String, String>> getData() {
1920
return data;
2021
}
2122

22-
public EMBatchMetadata toBatchMetadata() {
23-
return new EMBatchMetadata(this.data);
23+
public Map<String, EMMetadata> toMetadataMap() {
24+
Map<String, EMMetadata> map = new HashMap<>();
25+
data.forEach((userName, metadata) -> {
26+
map.put(userName, new EMMetadata(metadata));
27+
});
28+
return map;
2429
}
2530

2631
@Override

‎im-sdk-core/src/main/java/com/easemob/im/server/model/EMBatchMetadata.java‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎im-sdk-core/src/test/java/com/easemob/im/server/api/metadata/user/get/MetadataGetTest.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.easemob.im.server.api.metadata.user.get;
22

33
import com.easemob.im.server.api.AbstractApiTest;
4-
import com.easemob.im.server.model.EMBatchMetadata;
4+
import com.easemob.im.server.model.EMMetadata;
55
import com.fasterxml.jackson.databind.JsonNode;
66
import com.fasterxml.jackson.databind.node.ObjectNode;
77
import org.junit.jupiter.api.Test;
@@ -27,15 +27,14 @@ public void testMetadataGet() {
2727

2828
@Test
2929
public void testMetadataBatchGet() {
30-
EMBatchMetadata batchMetadata =
30+
Map<String, EMMetadata> metadataMap =
3131
assertDoesNotThrow(() -> this.metadataGet.fromUsers(
3232
Arrays.asList("alice", "bob"),
3333
Arrays.asList("title", "employer", "gender", "name"))
3434
.block(Duration.ofSeconds(3)));
3535

36-
Map<String, Map<String, String>> data = batchMetadata.getData();
37-
Map<String, String> aliceMetadata = data.get("alice");
38-
Map<String, String> bobMetadata = data.get("bob");
36+
Map<String, String> aliceMetadata = metadataMap.get("alice").getData();
37+
Map<String, String> bobMetadata = metadataMap.get("bob").getData();
3938
assertEquals("java_developer", aliceMetadata.get("title"));
4039
assertEquals("alice wang", aliceMetadata.get("name"));
4140
assertEquals("easemob", bobMetadata.get("employer"));

0 commit comments

Comments
 (0)