ListInstances support expired time or creation time filter.

aliyun · Nov 8, 2023 · 8f95803 · 8f95803
1 parent 65fef76
commit 8f95803
Show file tree

Hide file tree

Showing 37 changed files with 233 additions and 165 deletions.
diff --git a/aliyun-java-sdk-cloudphone/ChangeLog.txt b/aliyun-java-sdk-cloudphone/ChangeLog.txt
@@ -1,3 +1,6 @@
+2023-11-08 Version: 1.0.6
+- ListInstances support expired time or creation time filter.
+
 2022-04-21 Version: 1.0.5
 - Support Tag API.
 

diff --git a/aliyun-java-sdk-cloudphone/pom.xml b/aliyun-java-sdk-cloudphone/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.aliyun</groupId>
   <artifactId>aliyun-java-sdk-cloudphone</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.5</version>
+  <version>1.0.6</version>
   <name>aliyun-java-sdk-cloudphone</name>
   <url>http://www.aliyun.com</url>
   <description>Aliyun Open API SDK for Java
@@ -27,7 +27,7 @@ http://www.aliyun.com</description>
       <groupId>com.aliyun</groupId>
       <artifactId>aliyun-java-sdk-core</artifactId>
       <optional>true</optional>
-      <version>[4.3.2,5.0.0)</version>
+      <version>[4.4.9,5.0.0)</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
@@ -37,9 +37,8 @@ http://www.aliyun.com</description>
   </dependencies>
   <licenses>
     <license>
-      <name/>
-      <url/>
-      <distribution/>
+      <name>The Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
     </license>
   </licenses>
   <scm>
@@ -84,9 +83,10 @@ http://www.aliyun.com</description>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.8</version>
+        <version>3.1.0</version>
         <configuration>
           <encoding>UTF-8</encoding>
+          <doclint>none</doclint>
         </configuration>
       </plugin>
       <plugin>

diff --git a/...k-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/CancelTaskRequest.java b/...k-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/CancelTaskRequest.java
@@ -34,7 +34,7 @@ public class CancelTaskRequest extends RpcAcsRequest<CancelTaskResponse> {
 
 	private Long ownerId;
 	public CancelTaskRequest() {
-		super("cloudphone", "2020-12-30", "CancelTask", "cloudphone");
+		super("cloudphone", "2020-12-30", "CancelTask");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...dk-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/CopyImageRequest.java b/...dk-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/CopyImageRequest.java
@@ -42,7 +42,7 @@ public class CopyImageRequest extends RpcAcsRequest<CopyImageResponse> {
 
 	private Long ownerId;
 	public CopyImageRequest() {
-		super("cloudphone", "2020-12-30", "CopyImage", "cloudphone");
+		super("cloudphone", "2020-12-30", "CopyImage");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/CreateImageRequest.java b/...-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/CreateImageRequest.java
@@ -40,7 +40,7 @@ public class CreateImageRequest extends RpcAcsRequest<CreateImageResponse> {
 
 	private String instanceId;
 	public CreateImageRequest() {
-		super("cloudphone", "2020-12-30", "CreateImage", "cloudphone");
+		super("cloudphone", "2020-12-30", "CreateImage");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/DeleteImagesRequest.java b/...cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/DeleteImagesRequest.java
@@ -37,7 +37,7 @@ public class DeleteImagesRequest extends RpcAcsRequest<DeleteImagesResponse> {
 
 	private Boolean force;
 	public DeleteImagesRequest() {
-		super("cloudphone", "2020-12-30", "DeleteImages", "cloudphone");
+		super("cloudphone", "2020-12-30", "DeleteImages");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...udphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/DeleteInstancesRequest.java b/...udphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/DeleteInstancesRequest.java
@@ -37,7 +37,7 @@ public class DeleteInstancesRequest extends RpcAcsRequest<DeleteInstancesRespons
 
 	private Boolean force;
 	public DeleteInstancesRequest() {
-		super("cloudphone", "2020-12-30", "DeleteInstances", "cloudphone");
+		super("cloudphone", "2020-12-30", "DeleteInstances");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...oudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/DeleteKeyPairsRequest.java b/...oudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/DeleteKeyPairsRequest.java
@@ -35,7 +35,7 @@ public class DeleteKeyPairsRequest extends RpcAcsRequest<DeleteKeyPairsResponse>
 
 	private Long ownerId;
 	public DeleteKeyPairsRequest() {
-		super("cloudphone", "2020-12-30", "DeleteKeyPairs", "cloudphone");
+		super("cloudphone", "2020-12-30", "DeleteKeyPairs");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...dk-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/FetchFileRequest.java b/...dk-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/FetchFileRequest.java
@@ -40,7 +40,7 @@ public class FetchFileRequest extends RpcAcsRequest<FetchFileResponse> {
 
 	private String instanceId;
 	public FetchFileRequest() {
-		super("cloudphone", "2020-12-30", "FetchFile", "cloudphone");
+		super("cloudphone", "2020-12-30", "FetchFile");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ImportImageRequest.java b/...-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ImportImageRequest.java
@@ -46,7 +46,7 @@ public class ImportImageRequest extends RpcAcsRequest<ImportImageResponse> {
 
 	private Long ownerId;
 	public ImportImageRequest() {
-		super("cloudphone", "2020-12-30", "ImportImage", "cloudphone");
+		super("cloudphone", "2020-12-30", "ImportImage");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...loudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ImportKeyPairRequest.java b/...loudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ImportKeyPairRequest.java
@@ -36,7 +36,7 @@ public class ImportKeyPairRequest extends RpcAcsRequest<ImportKeyPairResponse> {
 
 	private Long ownerId;
 	public ImportKeyPairRequest() {
-		super("cloudphone", "2020-12-30", "ImportKeyPair", "cloudphone");
+		super("cloudphone", "2020-12-30", "ImportKeyPair");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...hone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/InstallApplicationRequest.java b/...hone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/InstallApplicationRequest.java
@@ -39,7 +39,7 @@ public class InstallApplicationRequest extends RpcAcsRequest<InstallApplicationR
 
 	private List<String> instanceIds;
 	public InstallApplicationRequest() {
-		super("cloudphone", "2020-12-30", "InstallApplication", "cloudphone");
+		super("cloudphone", "2020-12-30", "InstallApplication");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...rc/main/java/com/aliyuncs/cloudphone/model/v20201230/ListImageSharePermissionRequest.java b/...rc/main/java/com/aliyuncs/cloudphone/model/v20201230/ListImageSharePermissionRequest.java
@@ -34,7 +34,7 @@ public class ListImageSharePermissionRequest extends RpcAcsRequest<ListImageShar
 
 	private Long ownerId;
 	public ListImageSharePermissionRequest() {
-		super("cloudphone", "2020-12-30", "ListImageSharePermission", "cloudphone");
+		super("cloudphone", "2020-12-30", "ListImageSharePermission");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...k-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListImagesRequest.java b/...k-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListImagesRequest.java
@@ -35,6 +35,8 @@ public class ListImagesRequest extends RpcAcsRequest<ListImagesResponse> {
 
 	private String nextToken;
 
+	private String instanceType;
+
 	private String resourceOwnerAccount;
 
 	private String ownerAccount;
@@ -45,7 +47,7 @@ public class ListImagesRequest extends RpcAcsRequest<ListImagesResponse> {
 
 	private String status;
 	public ListImagesRequest() {
-		super("cloudphone", "2020-12-30", "ListImages", "cloudphone");
+		super("cloudphone", "2020-12-30", "ListImages");
 		setMethod(MethodType.POST);
 	}
 
@@ -106,6 +108,17 @@ public void setNextToken(String nextToken) {
 		}
 	}
 
+	public String getInstanceType() {
+		return this.instanceType;
+	}
+
+	public void setInstanceType(String instanceType) {
+		this.instanceType = instanceType;
+		if(instanceType != null){
+			putQueryParameter("InstanceType", instanceType);
+		}
+	}
+
 	public String getResourceOwnerAccount() {
 		return this.resourceOwnerAccount;
 	}

diff --git a/...phone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListInstanceTypesRequest.java b/...phone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListInstanceTypesRequest.java
@@ -37,7 +37,7 @@ public class ListInstanceTypesRequest extends RpcAcsRequest<ListInstanceTypesRes
 
 	private Long ownerId;
 	public ListInstanceTypesRequest() {
-		super("cloudphone", "2020-12-30", "ListInstanceTypes", "cloudphone");
+		super("cloudphone", "2020-12-30", "ListInstanceTypes");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...hone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListInstanceVncUrlRequest.java b/...hone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListInstanceVncUrlRequest.java
@@ -34,7 +34,7 @@ public class ListInstanceVncUrlRequest extends RpcAcsRequest<ListInstanceVncUrlR
 
 	private String instanceId;
 	public ListInstanceVncUrlRequest() {
-		super("cloudphone", "2020-12-30", "ListInstanceVncUrl", "cloudphone");
+		super("cloudphone", "2020-12-30", "ListInstanceVncUrl");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...loudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListInstancesRequest.java b/...loudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListInstancesRequest.java
@@ -47,6 +47,8 @@ public class ListInstancesRequest extends RpcAcsRequest<ListInstancesResponse> {
 
 	private Long ownerId;
 
+	private List<Filter> filters;
+
 	private String instanceName;
 
 	private List<String> instanceIds;
@@ -59,7 +61,7 @@ public class ListInstancesRequest extends RpcAcsRequest<ListInstancesResponse> {
 
 	private String status;
 	public ListInstancesRequest() {
-		super("cloudphone", "2020-12-30", "ListInstances", "cloudphone");
+		super("cloudphone", "2020-12-30", "ListInstances");
 		setMethod(MethodType.POST);
 	}
 
@@ -187,6 +189,20 @@ public void setOwnerId(Long ownerId) {
 		}
 	}
 
+	public List<Filter> getFilters() {
+		return this.filters;
+	}
+
+	public void setFilters(List<Filter> filters) {
+		this.filters = filters;	
+		if (filters != null) {
+			for (int depth1 = 0; depth1 < filters.size(); depth1++) {
+				putQueryParameter("Filter." + (depth1 + 1) + ".Key" , filters.get(depth1).getKey());
+				putQueryParameter("Filter." + (depth1 + 1) + ".Value" , filters.get(depth1).getValue());
+			}
+		}	
+	}
+
 	public String getInstanceName() {
 		return this.instanceName;
 	}
@@ -273,6 +289,29 @@ public String getValue() {
 			return this.value;
 		}
 
+		public void setValue(String value) {
+			this.value = value;
+		}
+	}
+
+	public static class Filter {
+
+		private String key;
+
+		private String value;
+
+		public String getKey() {
+			return this.key;
+		}
+
+		public void setKey(String key) {
+			this.key = key;
+		}
+
+		public String getValue() {
+			return this.value;
+		}
+
 		public void setValue(String value) {
 			this.value = value;
 		}

diff --git a/...cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListKeyPairsRequest.java b/...cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListKeyPairsRequest.java
@@ -40,7 +40,7 @@ public class ListKeyPairsRequest extends RpcAcsRequest<ListKeyPairsResponse> {
 
 	private Integer maxResults;
 	public ListKeyPairsRequest() {
-		super("cloudphone", "2020-12-30", "ListKeyPairs", "cloudphone");
+		super("cloudphone", "2020-12-30", "ListKeyPairs");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListRegionsRequest.java b/...-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListRegionsRequest.java
@@ -32,7 +32,7 @@ public class ListRegionsRequest extends RpcAcsRequest<ListRegionsResponse> {
 
 	private Long ownerId;
 	public ListRegionsRequest() {
-		super("cloudphone", "2020-12-30", "ListRegions", "cloudphone");
+		super("cloudphone", "2020-12-30", "ListRegions");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListTagKeysRequest.java b/...-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListTagKeysRequest.java
@@ -34,7 +34,7 @@ public class ListTagKeysRequest extends RpcAcsRequest<ListTagKeysResponse> {
 
 	private String resourceType;
 	public ListTagKeysRequest() {
-		super("cloudphone", "2020-12-30", "ListTagKeys", "cloudphone");
+		super("cloudphone", "2020-12-30", "ListTagKeys");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...dphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListTagResourcesRequest.java b/...dphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListTagResourcesRequest.java
@@ -39,7 +39,7 @@ public class ListTagResourcesRequest extends RpcAcsRequest<ListTagResourcesRespo
 
 	private String resourceType;
 	public ListTagResourcesRequest() {
-		super("cloudphone", "2020-12-30", "ListTagResources", "cloudphone");
+		super("cloudphone", "2020-12-30", "ListTagResources");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...loudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListTagValuesRequest.java b/...loudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListTagValuesRequest.java
@@ -36,7 +36,7 @@ public class ListTagValuesRequest extends RpcAcsRequest<ListTagValuesResponse> {
 
 	private String resourceType;
 	public ListTagValuesRequest() {
-		super("cloudphone", "2020-12-30", "ListTagValues", "cloudphone");
+		super("cloudphone", "2020-12-30", "ListTagValues");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...dk-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListTasksRequest.java b/...dk-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListTasksRequest.java
@@ -45,7 +45,7 @@ public class ListTasksRequest extends RpcAcsRequest<ListTasksResponse> {
 
 	private Integer maxResults;
 	public ListTasksRequest() {
-		super("cloudphone", "2020-12-30", "ListTasks", "cloudphone");
+		super("cloudphone", "2020-12-30", "ListTasks");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...dk-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListZonesRequest.java b/...dk-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ListZonesRequest.java
@@ -32,7 +32,7 @@ public class ListZonesRequest extends RpcAcsRequest<ListZonesResponse> {
 
 	private Long ownerId;
 	public ListZonesRequest() {
-		super("cloudphone", "2020-12-30", "ListZones", "cloudphone");
+		super("cloudphone", "2020-12-30", "ListZones");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...udphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/RebootInstancesRequest.java b/...udphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/RebootInstancesRequest.java
@@ -37,7 +37,7 @@ public class RebootInstancesRequest extends RpcAcsRequest<RebootInstancesRespons
 
 	private Boolean force;
 	public RebootInstancesRequest() {
-		super("cloudphone", "2020-12-30", "RebootInstances", "cloudphone");
+		super("cloudphone", "2020-12-30", "RebootInstances");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...oudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/RenewInstancesRequest.java b/...oudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/RenewInstancesRequest.java
@@ -43,7 +43,7 @@ public class RenewInstancesRequest extends RpcAcsRequest<RenewInstancesResponse>
 
 	private List<String> instanceIds;
 	public RenewInstancesRequest() {
-		super("cloudphone", "2020-12-30", "RenewInstances", "cloudphone");
+		super("cloudphone", "2020-12-30", "RenewInstances");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...oudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ResetInstancesRequest.java b/...oudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/ResetInstancesRequest.java
@@ -37,7 +37,7 @@ public class ResetInstancesRequest extends RpcAcsRequest<ResetInstancesResponse>
 
 	private List<String> instanceIds;
 	public ResetInstancesRequest() {
-		super("cloudphone", "2020-12-30", "ResetInstances", "cloudphone");
+		super("cloudphone", "2020-12-30", "ResetInstances");
 		setMethod(MethodType.POST);
 	}
 

diff --git a/...k-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/RunCommandRequest.java b/...k-cloudphone/src/main/java/com/aliyuncs/cloudphone/model/v20201230/RunCommandRequest.java
@@ -37,7 +37,7 @@ public class RunCommandRequest extends RpcAcsRequest<RunCommandResponse> {
 
 	private List<String> instanceIds;
 	public RunCommandRequest() {
-		super("cloudphone", "2020-12-30", "RunCommand", "cloudphone");
+		super("cloudphone", "2020-12-30", "RunCommand");
 		setMethod(MethodType.POST);
 	}