Merge pull request #166 from yutaipu/master

支持解绑设备与别名的绑定关系
jpush · Jul 30, 2020 · b0a064e · b0a064e
2 parents c9d1b4e + 9674cd1
commit b0a064e
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
  <groupId>cn.jpush.api</groupId>
  <artifactId>jpush-client</artifactId>
- <version>3.4.4</version>
+ <version>3.4.6-SNAPSHOT</version>
  <packaging>jar</packaging>
  <url>https://github.com/jpush/jpush-api-java-client</url>
  <name>JPush API Java Client</name>

diff --git a/src/main/java/cn/jpush/api/JPushClient.java b/src/main/java/cn/jpush/api/JPushClient.java
@@ -900,6 +900,11 @@ public DefaultResult deleteAlias(String alias, String platform)
  return _deviceClient.deleteAlias(alias, platform);
  }
 
+ public DefaultResult removeDevicesFromAlias(String alias, Set<String> toRemoveDevice)
+ throws APIConnectionException, APIRequestException {
+ return _deviceClient.removeDevicesFromAlias(alias, toRemoveDevice);
+ }
+
  public Map<String, OnlineStatus> getUserOnlineStatus(String... registrationIds)
  throws APIConnectionException, APIRequestException
  {

diff --git a/src/main/java/cn/jpush/api/device/DeviceClient.java b/src/main/java/cn/jpush/api/device/DeviceClient.java
@@ -245,6 +245,27 @@ public DefaultResult deleteAlias(String alias, String platform) throws APIConnec
  return DefaultResult.fromResponse(response);
  }
 
+ public DefaultResult removeDevicesFromAlias(String alias, Set<String> toRemoveDevice) throws APIConnectionException, APIRequestException {
+ String url = hostName + aliasesPath + "/" + alias;
+
+ JsonObject top = new JsonObject();
+ JsonObject registrationIds = new JsonObject();
+
+ if (null != toRemoveDevice && toRemoveDevice.size() > 0) {
+ JsonArray array = new JsonArray();
+ for (String device : toRemoveDevice) {
+ array.add(new JsonPrimitive(device));
+ }
+ registrationIds.add("remove", array);
+ }
+
+ top.add("registration_ids", registrationIds);
+
+ ResponseWrapper response = _httpClient.sendPost(url, top.toString());
+
+ return DefaultResult.fromResponse(response);
+ }
+
  // -------------- devices status
 
  public Map<String, OnlineStatus> getUserOnlineStatus(String... registrationIds)

diff --git a/src/test/java/cn/jpush/api/device/DeviceNormalRemoteTest.java b/src/test/java/cn/jpush/api/device/DeviceNormalRemoteTest.java
@@ -74,8 +74,8 @@ public void testGetDeviceTagAlias_cleard() throws Exception {
  assertEquals("tags cleared", 0, result.tags.size());
  }
 
- 
- 
+
+
  // ------------------ tags
 
  @Test
@@ -197,4 +197,13 @@ public void testBindMobile_empty() throws APIConnectionException, APIRequestExce
  assertTrue(result.isResultOK());
  }
 
+ @Test
+ @TestOrder(order = 330)
+ public void testRemoveDevicesFromAlias() throws APIConnectionException, APIRequestException {
+ Set<String> toRemoveDevice = new HashSet<>();
+ toRemoveDevice.add(REGISTRATION_ID1);
+ DefaultResult result = jpushClient.removeDevicesFromAlias("alias1", toRemoveDevice);
+ assertTrue(result.isResultOK());
+ }
+
 }