diff --git a/aliyun-java-sdk-market/ChangeLog.txt b/aliyun-java-sdk-market/ChangeLog.txt
index 95183e32a9..8105292265 100644
--- a/aliyun-java-sdk-market/ChangeLog.txt
+++ b/aliyun-java-sdk-market/ChangeLog.txt
@@ -1,3 +1,6 @@
+2024-07-29 Version: 2.0.42
+- Update DescribeApiMetering API.
+
2023-06-20 Version: 2.0.41
- Add DistributionProducts API.
diff --git a/aliyun-java-sdk-market/pom.xml b/aliyun-java-sdk-market/pom.xml
index fda5c5dba8..5e4bad62b2 100644
--- a/aliyun-java-sdk-market/pom.xml
+++ b/aliyun-java-sdk-market/pom.xml
@@ -4,7 +4,7 @@
com.aliyun
aliyun-java-sdk-market
jar
- 2.0.41
+ 2.0.42
aliyun-java-sdk-market
http://www.aliyun.com
Aliyun Open API SDK for Java
@@ -27,7 +27,7 @@ http://www.aliyun.com
com.aliyun
aliyun-java-sdk-core
true
- [4.4.9,5.0.0)
+ [4.3.2,5.0.0)
com.google.code.gson
@@ -83,10 +83,9 @@ http://www.aliyun.com
org.apache.maven.plugins
maven-javadoc-plugin
- 3.1.0
+ 2.8
UTF-8
- none
diff --git a/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/ActivateLicenseRequest.java b/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/ActivateLicenseRequest.java
index e527b5c01c..c2e754e528 100644
--- a/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/ActivateLicenseRequest.java
+++ b/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/ActivateLicenseRequest.java
@@ -29,7 +29,7 @@ public class ActivateLicenseRequest extends RpcAcsRequest {
private String orderType;
public CreateOrderRequest() {
- super("Market", "2015-11-01", "CreateOrder");
+ super("Market", "2015-11-01", "CreateOrder", "yunmarket");
setMethod(MethodType.POST);
try {
com.aliyuncs.AcsRequest.class.getDeclaredField("productEndpointMap").set(this, Endpoint.endpointMap);
diff --git a/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/CrossAccountVerifyTokenRequest.java b/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/CrossAccountVerifyTokenRequest.java
index 19863a4d7b..d42c029a2e 100644
--- a/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/CrossAccountVerifyTokenRequest.java
+++ b/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/CrossAccountVerifyTokenRequest.java
@@ -28,7 +28,7 @@ public class CrossAccountVerifyTokenRequest extends RpcAcsRequest codes;
public DescribeDistributionProductsLinkRequest() {
- super("Market", "2015-11-01", "DescribeDistributionProductsLink");
+ super("Market", "2015-11-01", "DescribeDistributionProductsLink", "yunmarket");
setMethod(MethodType.POST);
try {
com.aliyuncs.AcsRequest.class.getDeclaredField("productEndpointMap").set(this, Endpoint.endpointMap);
diff --git a/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/DescribeDistributionProductsRequest.java b/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/DescribeDistributionProductsRequest.java
index 1d850e1bad..1426313b08 100644
--- a/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/DescribeDistributionProductsRequest.java
+++ b/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/DescribeDistributionProductsRequest.java
@@ -32,7 +32,7 @@ public class DescribeDistributionProductsRequest extends RpcAcsRequest modules;
private RelationalData relationalData;
@@ -209,6 +213,22 @@ public void setAutoRenewal(String autoRenewal) {
this.autoRenewal = autoRenewal;
}
+ public String getActiveAddress() {
+ return this.activeAddress;
+ }
+
+ public void setActiveAddress(String activeAddress) {
+ this.activeAddress = activeAddress;
+ }
+
+ public String getLicenseCode() {
+ return this.licenseCode;
+ }
+
+ public void setLicenseCode(String licenseCode) {
+ this.licenseCode = licenseCode;
+ }
+
public List getModules() {
return this.modules;
}
diff --git a/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/DescribeInstancesRequest.java b/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/DescribeInstancesRequest.java
index 9fbb090d42..92cfc18ef1 100644
--- a/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/DescribeInstancesRequest.java
+++ b/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/DescribeInstancesRequest.java
@@ -35,7 +35,7 @@ public class DescribeInstancesRequest extends RpcAcsRequest {
private String orderId;
public DescribeOrderRequest() {
- super("Market", "2015-11-01", "DescribeOrder");
+ super("Market", "2015-11-01", "DescribeOrder", "yunmarket");
setMethod(MethodType.POST);
try {
com.aliyuncs.AcsRequest.class.getDeclaredField("productEndpointMap").set(this, Endpoint.endpointMap);
diff --git a/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/DescribePriceRequest.java b/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/DescribePriceRequest.java
index 3d456db62a..cf64dbd64e 100644
--- a/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/DescribePriceRequest.java
+++ b/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/DescribePriceRequest.java
@@ -29,7 +29,7 @@ public class DescribePriceRequest extends RpcAcsRequest {
private String orderType;
public DescribePriceRequest() {
- super("Market", "2015-11-01", "DescribePrice");
+ super("Market", "2015-11-01", "DescribePrice", "yunmarket");
setMethod(MethodType.POST);
try {
com.aliyuncs.AcsRequest.class.getDeclaredField("productEndpointMap").set(this, Endpoint.endpointMap);
diff --git a/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/DescribeProductRequest.java b/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/DescribeProductRequest.java
index e086136b89..5eb407a35f 100644
--- a/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/DescribeProductRequest.java
+++ b/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/DescribeProductRequest.java
@@ -31,7 +31,7 @@ public class DescribeProductRequest extends RpcAcsRequest {
- private String instanceId;
-
private String remark;
+ private String instanceId;
+
private Long nodeId;
public PauseProjectRequest() {
- super("Market", "2015-11-01", "PauseProject");
+ super("Market", "2015-11-01", "PauseProject", "yunmarket");
setMethod(MethodType.POST);
try {
com.aliyuncs.AcsRequest.class.getDeclaredField("productEndpointMap").set(this, Endpoint.endpointMap);
@@ -39,17 +39,6 @@ public PauseProjectRequest() {
} catch (Exception e) {}
}
- public String getInstanceId() {
- return this.instanceId;
- }
-
- public void setInstanceId(String instanceId) {
- this.instanceId = instanceId;
- if(instanceId != null){
- putQueryParameter("InstanceId", instanceId);
- }
- }
-
public String getRemark() {
return this.remark;
}
@@ -61,6 +50,17 @@ public void setRemark(String remark) {
}
}
+ public String getInstanceId() {
+ return this.instanceId;
+ }
+
+ public void setInstanceId(String instanceId) {
+ this.instanceId = instanceId;
+ if(instanceId != null){
+ putQueryParameter("InstanceId", instanceId);
+ }
+ }
+
public Long getNodeId() {
return this.nodeId;
}
diff --git a/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/PushMeteringDataRequest.java b/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/PushMeteringDataRequest.java
index 951e9b090c..db70d5232d 100644
--- a/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/PushMeteringDataRequest.java
+++ b/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/PushMeteringDataRequest.java
@@ -27,7 +27,7 @@ public class PushMeteringDataRequest extends RpcAcsRequest {
- private String instanceId;
-
private String remark;
+ private String instanceId;
+
private Long nodeId;
public ResumeProjectRequest() {
- super("Market", "2015-11-01", "ResumeProject");
+ super("Market", "2015-11-01", "ResumeProject", "yunmarket");
setMethod(MethodType.POST);
try {
com.aliyuncs.AcsRequest.class.getDeclaredField("productEndpointMap").set(this, Endpoint.endpointMap);
@@ -39,17 +39,6 @@ public ResumeProjectRequest() {
} catch (Exception e) {}
}
- public String getInstanceId() {
- return this.instanceId;
- }
-
- public void setInstanceId(String instanceId) {
- this.instanceId = instanceId;
- if(instanceId != null){
- putQueryParameter("InstanceId", instanceId);
- }
- }
-
public String getRemark() {
return this.remark;
}
@@ -61,6 +50,17 @@ public void setRemark(String remark) {
}
}
+ public String getInstanceId() {
+ return this.instanceId;
+ }
+
+ public void setInstanceId(String instanceId) {
+ this.instanceId = instanceId;
+ if(instanceId != null){
+ putQueryParameter("InstanceId", instanceId);
+ }
+ }
+
public Long getNodeId() {
return this.nodeId;
}
diff --git a/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/RollbackCurrentProjectNodeRequest.java b/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/RollbackCurrentProjectNodeRequest.java
index cd857199b7..94ce0233a9 100644
--- a/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/RollbackCurrentProjectNodeRequest.java
+++ b/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/model/v20151101/RollbackCurrentProjectNodeRequest.java
@@ -25,13 +25,13 @@
public class RollbackCurrentProjectNodeRequest extends RpcAcsRequest {
- private String instanceId;
-
private String remark;
+ private String instanceId;
+
private Long nodeId;
public RollbackCurrentProjectNodeRequest() {
- super("Market", "2015-11-01", "RollbackCurrentProjectNode");
+ super("Market", "2015-11-01", "RollbackCurrentProjectNode", "yunmarket");
setMethod(MethodType.POST);
try {
com.aliyuncs.AcsRequest.class.getDeclaredField("productEndpointMap").set(this, Endpoint.endpointMap);
@@ -39,17 +39,6 @@ public RollbackCurrentProjectNodeRequest() {
} catch (Exception e) {}
}
- public String getInstanceId() {
- return this.instanceId;
- }
-
- public void setInstanceId(String instanceId) {
- this.instanceId = instanceId;
- if(instanceId != null){
- putQueryParameter("InstanceId", instanceId);
- }
- }
-
public String getRemark() {
return this.remark;
}
@@ -61,6 +50,17 @@ public void setRemark(String remark) {
}
}
+ public String getInstanceId() {
+ return this.instanceId;
+ }
+
+ public void setInstanceId(String instanceId) {
+ this.instanceId = instanceId;
+ if(instanceId != null){
+ putQueryParameter("InstanceId", instanceId);
+ }
+ }
+
public Long getNodeId() {
return this.nodeId;
}
diff --git a/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/transform/v20151101/DescribeApiMeteringResponseUnmarshaller.java b/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/transform/v20151101/DescribeApiMeteringResponseUnmarshaller.java
index 992799f9e5..9db0425a1e 100644
--- a/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/transform/v20151101/DescribeApiMeteringResponseUnmarshaller.java
+++ b/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/transform/v20151101/DescribeApiMeteringResponseUnmarshaller.java
@@ -44,6 +44,7 @@ public static DescribeApiMeteringResponse unmarshall(DescribeApiMeteringResponse
resultItem.setProductName(_ctx.stringValue("DescribeApiMeteringResponse.Result["+ i +"].ProductName"));
resultItem.setTotalQuota(_ctx.longValue("DescribeApiMeteringResponse.Result["+ i +"].TotalQuota"));
resultItem.setTotalUsage(_ctx.longValue("DescribeApiMeteringResponse.Result["+ i +"].TotalUsage"));
+ resultItem.setTotalCapacity(_ctx.longValue("DescribeApiMeteringResponse.Result["+ i +"].TotalCapacity"));
resultItem.setUnit(_ctx.stringValue("DescribeApiMeteringResponse.Result["+ i +"].Unit"));
result.add(resultItem);
diff --git a/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/transform/v20151101/DescribeInstanceResponseUnmarshaller.java b/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/transform/v20151101/DescribeInstanceResponseUnmarshaller.java
index f05f50c367..00aa4faf9c 100644
--- a/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/transform/v20151101/DescribeInstanceResponseUnmarshaller.java
+++ b/aliyun-java-sdk-market/src/main/java/com/aliyuncs/market/transform/v20151101/DescribeInstanceResponseUnmarshaller.java
@@ -47,6 +47,8 @@ public static DescribeInstanceResponse unmarshall(DescribeInstanceResponse descr
describeInstanceResponse.setProductCode(_ctx.stringValue("DescribeInstanceResponse.ProductCode"));
describeInstanceResponse.setSupplierName(_ctx.stringValue("DescribeInstanceResponse.SupplierName"));
describeInstanceResponse.setAutoRenewal(_ctx.stringValue("DescribeInstanceResponse.AutoRenewal"));
+ describeInstanceResponse.setActiveAddress(_ctx.stringValue("DescribeInstanceResponse.ActiveAddress"));
+ describeInstanceResponse.setLicenseCode(_ctx.stringValue("DescribeInstanceResponse.LicenseCode"));
RelationalData relationalData = new RelationalData();
relationalData.setServiceStatus(_ctx.stringValue("DescribeInstanceResponse.RelationalData.ServiceStatus"));