diff --git a/VERSION b/VERSION index 55504cd2..f6cea06d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.84-release +1.2.85-release diff --git a/examples/generic/pom.xml b/examples/generic/pom.xml index 33c1d799..d61d3822 100644 --- a/examples/generic/pom.xml +++ b/examples/generic/pom.xml @@ -7,7 +7,7 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 @@ -19,7 +19,7 @@ cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/examples/uhost/pom.xml b/examples/uhost/pom.xml index 2fcab651..48aa3c6c 100644 --- a/examples/uhost/pom.xml +++ b/examples/uhost/pom.xml @@ -7,7 +7,7 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 @@ -19,7 +19,7 @@ cn.ucloud ucloud-sdk-java-uhost - 1.2.84-release + 1.2.85-release diff --git a/pom.xml b/pom.xml index 6a4e2a71..111f8e41 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ cn.ucloud ucloud-sdk-java pom - 1.2.84-release + 1.2.85-release ucloud-sdk-java-common ucloud-sdk-java-cloudwatch diff --git a/ucloud-sdk-java-cloudwatch/pom.xml b/ucloud-sdk-java-cloudwatch/pom.xml index e7442824..1fd687c4 100644 --- a/ucloud-sdk-java-cloudwatch/pom.xml +++ b/ucloud-sdk-java-cloudwatch/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-cloudwatch ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-common/pom.xml b/ucloud-sdk-java-common/pom.xml index 360e8f1e..410c3dfd 100644 --- a/ucloud-sdk-java-common/pom.xml +++ b/ucloud-sdk-java-common/pom.xml @@ -7,13 +7,13 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-common ucloud-sdk-java - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-cube/pom.xml b/ucloud-sdk-java-cube/pom.xml index 3cb201db..0d5ec6d8 100644 --- a/ucloud-sdk-java-cube/pom.xml +++ b/ucloud-sdk-java-cube/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-cube ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-ipsecvpn/pom.xml b/ucloud-sdk-java-ipsecvpn/pom.xml index 833b7933..6dae8ec4 100644 --- a/ucloud-sdk-java-ipsecvpn/pom.xml +++ b/ucloud-sdk-java-ipsecvpn/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-ipsecvpn ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-label/pom.xml b/ucloud-sdk-java-label/pom.xml index 87a70100..abb61a12 100644 --- a/ucloud-sdk-java-label/pom.xml +++ b/ucloud-sdk-java-label/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-label ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-nlb/pom.xml b/ucloud-sdk-java-nlb/pom.xml index a6fe679f..3c86a582 100644 --- a/ucloud-sdk-java-nlb/pom.xml +++ b/ucloud-sdk-java-nlb/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-nlb ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-pathx/pom.xml b/ucloud-sdk-java-pathx/pom.xml index a064327b..5da16e4d 100644 --- a/ucloud-sdk-java-pathx/pom.xml +++ b/ucloud-sdk-java-pathx/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-pathx ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-sandbox/pom.xml b/ucloud-sdk-java-sandbox/pom.xml index 8b5da515..3165e728 100644 --- a/ucloud-sdk-java-sandbox/pom.xml +++ b/ucloud-sdk-java-sandbox/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-sandbox ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-sts/pom.xml b/ucloud-sdk-java-sts/pom.xml index cd8b7763..f707e0cc 100644 --- a/ucloud-sdk-java-sts/pom.xml +++ b/ucloud-sdk-java-sts/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-sts ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-tidb/pom.xml b/ucloud-sdk-java-tidb/pom.xml index 89a786c1..16975ac8 100644 --- a/ucloud-sdk-java-tidb/pom.xml +++ b/ucloud-sdk-java-tidb/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-tidb ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-uaccount/pom.xml b/ucloud-sdk-java-uaccount/pom.xml index 7ff58f94..c5901a66 100644 --- a/ucloud-sdk-java-uaccount/pom.xml +++ b/ucloud-sdk-java-uaccount/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-uaccount ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-uai_modelverse/pom.xml b/ucloud-sdk-java-uai_modelverse/pom.xml index f907af20..09608ec7 100644 --- a/ucloud-sdk-java-uai_modelverse/pom.xml +++ b/ucloud-sdk-java-uai_modelverse/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-uai_modelverse ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-uas/pom.xml b/ucloud-sdk-java-uas/pom.xml index 0946042a..2a512451 100644 --- a/ucloud-sdk-java-uas/pom.xml +++ b/ucloud-sdk-java-uas/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-uas ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-ubill/pom.xml b/ucloud-sdk-java-ubill/pom.xml index 6bcffd14..5c277494 100644 --- a/ucloud-sdk-java-ubill/pom.xml +++ b/ucloud-sdk-java-ubill/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-ubill ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-ucdn/pom.xml b/ucloud-sdk-java-ucdn/pom.xml index d7efb50e..13f2efb9 100644 --- a/ucloud-sdk-java-ucdn/pom.xml +++ b/ucloud-sdk-java-ucdn/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-ucdn ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-uclickhouse/pom.xml b/ucloud-sdk-java-uclickhouse/pom.xml index 8612e451..d9883537 100644 --- a/ucloud-sdk-java-uclickhouse/pom.xml +++ b/ucloud-sdk-java-uclickhouse/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-uclickhouse ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-ucompshare/pom.xml b/ucloud-sdk-java-ucompshare/pom.xml index 21e2d11e..c7df00f8 100644 --- a/ucloud-sdk-java-ucompshare/pom.xml +++ b/ucloud-sdk-java-ucompshare/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-ucompshare ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-udb/pom.xml b/ucloud-sdk-java-udb/pom.xml index ad7cd868..8d710930 100644 --- a/ucloud-sdk-java-udb/pom.xml +++ b/ucloud-sdk-java-udb/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-udb ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-udbproxy/pom.xml b/ucloud-sdk-java-udbproxy/pom.xml index 781a1087..d28920a3 100644 --- a/ucloud-sdk-java-udbproxy/pom.xml +++ b/ucloud-sdk-java-udbproxy/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-udbproxy ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-udi/pom.xml b/ucloud-sdk-java-udi/pom.xml index 6a25867d..2c7545b8 100644 --- a/ucloud-sdk-java-udi/pom.xml +++ b/ucloud-sdk-java-udi/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-udi ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-udisk/pom.xml b/ucloud-sdk-java-udisk/pom.xml index e1c5b2e6..dee606c9 100644 --- a/ucloud-sdk-java-udisk/pom.xml +++ b/ucloud-sdk-java-udisk/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-udisk ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-udns/pom.xml b/ucloud-sdk-java-udns/pom.xml index a9105bd0..479f3f31 100644 --- a/ucloud-sdk-java-udns/pom.xml +++ b/ucloud-sdk-java-udns/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-udns ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-udpn/pom.xml b/ucloud-sdk-java-udpn/pom.xml index 4666f812..299d01e4 100644 --- a/ucloud-sdk-java-udpn/pom.xml +++ b/ucloud-sdk-java-udpn/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-udpn ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-uec/pom.xml b/ucloud-sdk-java-uec/pom.xml index 97153eff..5ad8aaf4 100644 --- a/ucloud-sdk-java-uec/pom.xml +++ b/ucloud-sdk-java-uec/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-uec ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-ues/pom.xml b/ucloud-sdk-java-ues/pom.xml index eec084bc..3318ae08 100644 --- a/ucloud-sdk-java-ues/pom.xml +++ b/ucloud-sdk-java-ues/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-ues ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-uewaf/pom.xml b/ucloud-sdk-java-uewaf/pom.xml index 81811016..2da10240 100644 --- a/ucloud-sdk-java-uewaf/pom.xml +++ b/ucloud-sdk-java-uewaf/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-uewaf ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-ufile/pom.xml b/ucloud-sdk-java-ufile/pom.xml index d64035b3..100d8eb9 100644 --- a/ucloud-sdk-java-ufile/pom.xml +++ b/ucloud-sdk-java-ufile/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-ufile ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-ufs/pom.xml b/ucloud-sdk-java-ufs/pom.xml index e3725dae..ee3f41fd 100644 --- a/ucloud-sdk-java-ufs/pom.xml +++ b/ucloud-sdk-java-ufs/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-ufs ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-uhadoop/pom.xml b/ucloud-sdk-java-uhadoop/pom.xml index 5f612d0e..80283c3b 100644 --- a/ucloud-sdk-java-uhadoop/pom.xml +++ b/ucloud-sdk-java-uhadoop/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-uhadoop ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-uhids/pom.xml b/ucloud-sdk-java-uhids/pom.xml index f70c2d34..28c6b479 100644 --- a/ucloud-sdk-java-uhids/pom.xml +++ b/ucloud-sdk-java-uhids/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-uhids ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-uhost/pom.xml b/ucloud-sdk-java-uhost/pom.xml index 8bc15059..d281a3a2 100644 --- a/ucloud-sdk-java-uhost/pom.xml +++ b/ucloud-sdk-java-uhost/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-uhost ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-uk8s/pom.xml b/ucloud-sdk-java-uk8s/pom.xml index 3c49beff..cd18bcc4 100644 --- a/ucloud-sdk-java-uk8s/pom.xml +++ b/ucloud-sdk-java-uk8s/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-uk8s ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-ukafka/pom.xml b/ucloud-sdk-java-ukafka/pom.xml index a0fd5136..2f9f407c 100644 --- a/ucloud-sdk-java-ukafka/pom.xml +++ b/ucloud-sdk-java-ukafka/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-ukafka ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-ukms/pom.xml b/ucloud-sdk-java-ukms/pom.xml index f4da17db..13f26282 100644 --- a/ucloud-sdk-java-ukms/pom.xml +++ b/ucloud-sdk-java-ukms/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-ukms ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/client/UKMSClient.java b/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/client/UKMSClient.java index d1fd9bec..a47b12b7 100644 --- a/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/client/UKMSClient.java +++ b/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/client/UKMSClient.java @@ -59,8 +59,6 @@ import cn.ucloud.ukms.models.ListAliasesResponse; import cn.ucloud.ukms.models.ListKeysRequest; import cn.ucloud.ukms.models.ListKeysResponse; -import cn.ucloud.ukms.models.ListScheduleDeletionKeysRequest; -import cn.ucloud.ukms.models.ListScheduleDeletionKeysResponse; import cn.ucloud.ukms.models.RotateKeyOnDemandRequest; import cn.ucloud.ukms.models.RotateKeyOnDemandResponse; import cn.ucloud.ukms.models.ScheduleKeyDeletionRequest; @@ -326,19 +324,6 @@ public ListKeysResponse listKeys(ListKeysRequest request) throws UCloudException return (ListKeysResponse) this.invoke(request, ListKeysResponse.class); } - /** - * ListScheduleDeletionKeys - 获取计划删除密钥列表 - * - * @param request Request object - * @throws UCloudException Exception - */ - public ListScheduleDeletionKeysResponse listScheduleDeletionKeys( - ListScheduleDeletionKeysRequest request) throws UCloudException { - request.setAction("ListScheduleDeletionKeys"); - return (ListScheduleDeletionKeysResponse) - this.invoke(request, ListScheduleDeletionKeysResponse.class); - } - /** * RotateKeyOnDemand - 按需轮转密钥 * diff --git a/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/client/UKMSClientInterface.java b/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/client/UKMSClientInterface.java index 48b458dd..63004b47 100644 --- a/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/client/UKMSClientInterface.java +++ b/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/client/UKMSClientInterface.java @@ -57,8 +57,6 @@ import cn.ucloud.ukms.models.ListAliasesResponse; import cn.ucloud.ukms.models.ListKeysRequest; import cn.ucloud.ukms.models.ListKeysResponse; -import cn.ucloud.ukms.models.ListScheduleDeletionKeysRequest; -import cn.ucloud.ukms.models.ListScheduleDeletionKeysResponse; import cn.ucloud.ukms.models.RotateKeyOnDemandRequest; import cn.ucloud.ukms.models.RotateKeyOnDemandResponse; import cn.ucloud.ukms.models.ScheduleKeyDeletionRequest; @@ -254,15 +252,6 @@ public GetKeyRotationStatusResponse getKeyRotationStatus(GetKeyRotationStatusReq */ public ListKeysResponse listKeys(ListKeysRequest request) throws UCloudException; - /** - * ListScheduleDeletionKeys - 获取计划删除密钥列表 - * - * @param request Request object - * @throws UCloudException Exception - */ - public ListScheduleDeletionKeysResponse listScheduleDeletionKeys( - ListScheduleDeletionKeysRequest request) throws UCloudException; - /** * RotateKeyOnDemand - 按需轮转密钥 * diff --git a/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/DescribeKeyResponse.java b/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/DescribeKeyResponse.java index d4cce6dd..a9771ec0 100644 --- a/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/DescribeKeyResponse.java +++ b/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/DescribeKeyResponse.java @@ -89,10 +89,6 @@ public static class KeyMetadata extends Response { @SerializedName("DeletionDate") private Integer deletionDate; - /** 密钥所属组织的数字 ID,来源于密钥关联的资源交易记录。 */ - @SerializedName("OrganizationId") - private Integer organizationId; - public String getProjectId() { return projectId; } @@ -196,13 +192,5 @@ public Integer getDeletionDate() { public void setDeletionDate(Integer deletionDate) { this.deletionDate = deletionDate; } - - public Integer getOrganizationId() { - return organizationId; - } - - public void setOrganizationId(Integer organizationId) { - this.organizationId = organizationId; - } } } diff --git a/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/GenerateDataKeyPairResponse.java b/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/GenerateDataKeyPairResponse.java index ba825f73..9697080f 100644 --- a/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/GenerateDataKeyPairResponse.java +++ b/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/GenerateDataKeyPairResponse.java @@ -14,7 +14,69 @@ package cn.ucloud.ukms.models; - import cn.ucloud.common.response.Response; -public class GenerateDataKeyPairResponse extends Response {} +import com.google.gson.annotations.SerializedName; + +public class GenerateDataKeyPairResponse extends Response { + + /** 用于加密私钥的 KMS 密钥 */ + @SerializedName("KeyId") + private String keyId; + + /** 生成的数据键对类型。 */ + @SerializedName("KeyPairSpec") + private String keyPairSpec; + + /** 私钥的加密副本。 */ + @SerializedName("PrivateKeyCiphertextBlob") + private String privateKeyCiphertextBlob; + + /** 私钥的明文副本。 */ + @SerializedName("PrivateKeyPlaintext") + private String privateKeyPlaintext; + + /** 公钥(明文)。 */ + @SerializedName("DataPublicKey") + private String dataPublicKey; + + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + public String getKeyPairSpec() { + return keyPairSpec; + } + + public void setKeyPairSpec(String keyPairSpec) { + this.keyPairSpec = keyPairSpec; + } + + public String getPrivateKeyCiphertextBlob() { + return privateKeyCiphertextBlob; + } + + public void setPrivateKeyCiphertextBlob(String privateKeyCiphertextBlob) { + this.privateKeyCiphertextBlob = privateKeyCiphertextBlob; + } + + public String getPrivateKeyPlaintext() { + return privateKeyPlaintext; + } + + public void setPrivateKeyPlaintext(String privateKeyPlaintext) { + this.privateKeyPlaintext = privateKeyPlaintext; + } + + public String getDataPublicKey() { + return dataPublicKey; + } + + public void setDataPublicKey(String dataPublicKey) { + this.dataPublicKey = dataPublicKey; + } +} diff --git a/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/GenerateDataKeyPairWithoutPlaintextRequest.java b/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/GenerateDataKeyPairWithoutPlaintextRequest.java index 89ce8436..9819a603 100644 --- a/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/GenerateDataKeyPairWithoutPlaintextRequest.java +++ b/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/GenerateDataKeyPairWithoutPlaintextRequest.java @@ -37,6 +37,15 @@ public class GenerateDataKeyPairWithoutPlaintextRequest extends Request { @UCloudParam("KeyId") private String keyId; + /** 指定生成的数据密钥对类型。 */ + @NotEmpty + @UCloudParam("KeyPairSpec") + private String keyPairSpec; + + /** 指定加密私钥时使用的加密上下文。 */ + @UCloudParam("EncryptionContext") + private String encryptionContext; + public String getRegion() { return region; } @@ -60,4 +69,20 @@ public String getKeyId() { public void setKeyId(String keyId) { this.keyId = keyId; } + + public String getKeyPairSpec() { + return keyPairSpec; + } + + public void setKeyPairSpec(String keyPairSpec) { + this.keyPairSpec = keyPairSpec; + } + + public String getEncryptionContext() { + return encryptionContext; + } + + public void setEncryptionContext(String encryptionContext) { + this.encryptionContext = encryptionContext; + } } diff --git a/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/GenerateRandomResponse.java b/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/GenerateRandomResponse.java index fa79bc30..4c3b94d6 100644 --- a/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/GenerateRandomResponse.java +++ b/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/GenerateRandomResponse.java @@ -14,7 +14,21 @@ package cn.ucloud.ukms.models; - import cn.ucloud.common.response.Response; -public class GenerateRandomResponse extends Response {} +import com.google.gson.annotations.SerializedName; + +public class GenerateRandomResponse extends Response { + + /** 随机字节串。 */ + @SerializedName("Plaintext") + private String plaintext; + + public String getPlaintext() { + return plaintext; + } + + public void setPlaintext(String plaintext) { + this.plaintext = plaintext; + } +} diff --git a/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/ListScheduleDeletionKeysRequest.java b/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/ListScheduleDeletionKeysRequest.java deleted file mode 100644 index 7d2d7612..00000000 --- a/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/ListScheduleDeletionKeysRequest.java +++ /dev/null @@ -1,111 +0,0 @@ -/** - * Copyright 2021 UCloud Technology Co., Ltd. - * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at - * - *

http://www.apache.org/licenses/LICENSE-2.0 - * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.ucloud.ukms.models; - - -import cn.ucloud.common.annotation.UCloudParam; -import cn.ucloud.common.request.Request; - -public class ListScheduleDeletionKeysRequest extends Request { - - /** - * 项目ID。不填写为默认项目,子帐号必须填写。 - * 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) - */ - @UCloudParam("ProjectId") - private String projectId; - - /** 输出列表起始位置,默认从0开始 */ - @UCloudParam("Offset") - private Integer offset; - - /** 输出列表数量,默认返回200个 */ - @UCloudParam("Limit") - private Integer limit; - - /** - * 列表排序方式, 可选项: "-created_time", - * "created_time","plan_delete_time","-plan_delete_time";默认按-plan_delete_time 计划删除时间升序返回 - */ - @UCloudParam("OrderBy") - private String orderBy; - - /** 按密钥 ID 或别名模糊过滤 */ - @UCloudParam("Alias") - private String alias; - - /** UKMS 实例资源 ID */ - @UCloudParam("ResourceId") - private String resourceId; - - /** 排序方向,默认 desc */ - @UCloudParam("Sort") - private String sort; - - public String getProjectId() { - return projectId; - } - - public void setProjectId(String projectId) { - this.projectId = projectId; - } - - public Integer getOffset() { - return offset; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public Integer getLimit() { - return limit; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public String getOrderBy() { - return orderBy; - } - - public void setOrderBy(String orderBy) { - this.orderBy = orderBy; - } - - public String getAlias() { - return alias; - } - - public void setAlias(String alias) { - this.alias = alias; - } - - public String getResourceId() { - return resourceId; - } - - public void setResourceId(String resourceId) { - this.resourceId = resourceId; - } - - public String getSort() { - return sort; - } - - public void setSort(String sort) { - this.sort = sort; - } -} diff --git a/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/ListScheduleDeletionKeysResponse.java b/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/ListScheduleDeletionKeysResponse.java deleted file mode 100644 index 8842d541..00000000 --- a/ucloud-sdk-java-ukms/src/main/java/cn/ucloud/ukms/models/ListScheduleDeletionKeysResponse.java +++ /dev/null @@ -1,173 +0,0 @@ -/** - * Copyright 2021 UCloud Technology Co., Ltd. - * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at - * - *

http://www.apache.org/licenses/LICENSE-2.0 - * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.ucloud.ukms.models; - -import cn.ucloud.common.response.Response; - -import com.google.gson.annotations.SerializedName; - -import java.util.List; - -public class ListScheduleDeletionKeysResponse extends Response { - - /** 主密钥信息组成的列表 */ - @SerializedName("Objects") - private List objects; - - /** 操作结果 */ - @SerializedName("Status") - private String status; - - /** 请求唯一标识符 */ - @SerializedName("RequestUuid") - private String requestUuid; - - /** 符合条件的总数, 不同于Limit */ - @SerializedName("TotalCount") - private Integer totalCount; - - public List getObjects() { - return objects; - } - - public void setObjects(List objects) { - this.objects = objects; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getRequestUuid() { - return requestUuid; - } - - public void setRequestUuid(String requestUuid) { - this.requestUuid = requestUuid; - } - - public Integer getTotalCount() { - return totalCount; - } - - public void setTotalCount(Integer totalCount) { - this.totalCount = totalCount; - } - - public static class CMK extends Response { - - /** CMK 的唯一标识符 */ - @SerializedName("KeyId") - private String keyId; - - /** 密钥类型,如RSA、EC、DES */ - @SerializedName("KeyType") - private String keyType; - - /** 创建时间 */ - @SerializedName("CreatedTime") - private Integer createdTime; - - /** 别名,与CMK一一对应 */ - @SerializedName("Alias") - private String alias; - - /** - * 密钥状态 "Pre-Active", "Active", "Deactivated", "Compromised", "Destroyed", "Destroyed - * Compromised" - */ - @SerializedName("Status") - private String status; - - /** 更新时间 */ - @SerializedName("UpdateTime") - private Integer updateTime; - - /** 对密钥的描述说明 */ - @SerializedName("Description") - private String description; - - /** 计划删除时间 时间戳 */ - @SerializedName("PlanDeleteTime") - private Integer planDeleteTime; - - public String getKeyId() { - return keyId; - } - - public void setKeyId(String keyId) { - this.keyId = keyId; - } - - public String getKeyType() { - return keyType; - } - - public void setKeyType(String keyType) { - this.keyType = keyType; - } - - public Integer getCreatedTime() { - return createdTime; - } - - public void setCreatedTime(Integer createdTime) { - this.createdTime = createdTime; - } - - public String getAlias() { - return alias; - } - - public void setAlias(String alias) { - this.alias = alias; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public Integer getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Integer updateTime) { - this.updateTime = updateTime; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Integer getPlanDeleteTime() { - return planDeleteTime; - } - - public void setPlanDeleteTime(Integer planDeleteTime) { - this.planDeleteTime = planDeleteTime; - } - } -} diff --git a/ucloud-sdk-java-ulb/pom.xml b/ucloud-sdk-java-ulb/pom.xml index ba54d483..b01c287e 100644 --- a/ucloud-sdk-java-ulb/pom.xml +++ b/ucloud-sdk-java-ulb/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-ulb ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-ulighthost/pom.xml b/ucloud-sdk-java-ulighthost/pom.xml index 8c43ffb8..d3cb48cf 100644 --- a/ucloud-sdk-java-ulighthost/pom.xml +++ b/ucloud-sdk-java-ulighthost/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-ulighthost ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-ulog/pom.xml b/ucloud-sdk-java-ulog/pom.xml index 51ce6c89..5f74622f 100644 --- a/ucloud-sdk-java-ulog/pom.xml +++ b/ucloud-sdk-java-ulog/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-ulog ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-umem/pom.xml b/ucloud-sdk-java-umem/pom.xml index df4899ed..e99a56e2 100644 --- a/ucloud-sdk-java-umem/pom.xml +++ b/ucloud-sdk-java-umem/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-umem ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-umon/pom.xml b/ucloud-sdk-java-umon/pom.xml index c980ab53..b99338bf 100644 --- a/ucloud-sdk-java-umon/pom.xml +++ b/ucloud-sdk-java-umon/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-umon ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-umongodb/pom.xml b/ucloud-sdk-java-umongodb/pom.xml index 5774eaa0..79a27740 100644 --- a/ucloud-sdk-java-umongodb/pom.xml +++ b/ucloud-sdk-java-umongodb/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-umongodb ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-unet/pom.xml b/ucloud-sdk-java-unet/pom.xml index d638793a..c4268078 100644 --- a/ucloud-sdk-java-unet/pom.xml +++ b/ucloud-sdk-java-unet/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-unet ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-upfs/pom.xml b/ucloud-sdk-java-upfs/pom.xml index 25152321..1d1e6648 100644 --- a/ucloud-sdk-java-upfs/pom.xml +++ b/ucloud-sdk-java-upfs/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-upfs ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-upgsql/pom.xml b/ucloud-sdk-java-upgsql/pom.xml index 65734bfb..f747d333 100644 --- a/ucloud-sdk-java-upgsql/pom.xml +++ b/ucloud-sdk-java-upgsql/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-upgsql ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-uphone/pom.xml b/ucloud-sdk-java-uphone/pom.xml index 4ec68c97..340165a3 100644 --- a/ucloud-sdk-java-uphone/pom.xml +++ b/ucloud-sdk-java-uphone/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-uphone ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-uphost/pom.xml b/ucloud-sdk-java-uphost/pom.xml index 841c7614..e03f6e69 100644 --- a/ucloud-sdk-java-uphost/pom.xml +++ b/ucloud-sdk-java-uphost/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-uphost ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-uslk/pom.xml b/ucloud-sdk-java-uslk/pom.xml index 047d500b..0f8bd3bc 100644 --- a/ucloud-sdk-java-uslk/pom.xml +++ b/ucloud-sdk-java-uslk/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-uslk ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-usms/pom.xml b/ucloud-sdk-java-usms/pom.xml index c080cfea..3de4fc2d 100644 --- a/ucloud-sdk-java-usms/pom.xml +++ b/ucloud-sdk-java-usms/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-usms ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-usnap/pom.xml b/ucloud-sdk-java-usnap/pom.xml index 91ae1258..bc92f22b 100644 --- a/ucloud-sdk-java-usnap/pom.xml +++ b/ucloud-sdk-java-usnap/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-usnap ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-uvms/pom.xml b/ucloud-sdk-java-uvms/pom.xml index 001a61b3..604efe6f 100644 --- a/ucloud-sdk-java-uvms/pom.xml +++ b/ucloud-sdk-java-uvms/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-uvms ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-uwsc/pom.xml b/ucloud-sdk-java-uwsc/pom.xml index 5bd32510..c8638787 100644 --- a/ucloud-sdk-java-uwsc/pom.xml +++ b/ucloud-sdk-java-uwsc/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-uwsc ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release diff --git a/ucloud-sdk-java-vpc/pom.xml b/ucloud-sdk-java-vpc/pom.xml index 1b1f41bd..ec58da92 100644 --- a/ucloud-sdk-java-vpc/pom.xml +++ b/ucloud-sdk-java-vpc/pom.xml @@ -5,19 +5,19 @@ ucloud-sdk-java cn.ucloud - 1.2.84-release + 1.2.85-release 4.0.0 ucloud-sdk-java-vpc ucloud-sdk-java - 1.2.84-release + 1.2.85-release cn.ucloud ucloud-sdk-java-common - 1.2.84-release + 1.2.85-release