Skip to content

Commit 58f0160

Browse files
author
BitsAdmin
committed
Merge branch 'vefaas-Java-2024-06-06-online-1681-2025_10_10_15_01_24' into 'integration_2025-10-13_1068094484226'
feat: [development task] vefaas-1681-Java (1723123) See merge request iaasng/volcengine-java-sdk!689
2 parents 5b16f1f + e56ec80 commit 58f0160

File tree

6 files changed

+237
-7
lines changed

6 files changed

+237
-7
lines changed

volcengine-java-sdk-vefaas/src/main/java/com/volcengine/vefaas/model/CreateFunctionRequest.java

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ public class CreateFunctionRequest {
5454
@SerializedName("Description")
5555
private String description = null;
5656

57+
@SerializedName("EnableApmplus")
58+
private Boolean enableApmplus = null;
59+
5760
@SerializedName("Envs")
5861
private List<EnvForCreateFunctionInput> envs = null;
5962

@@ -78,6 +81,9 @@ public class CreateFunctionRequest {
7881
@SerializedName("NasStorage")
7982
private NasStorageForCreateFunctionInput nasStorage = null;
8083

84+
@SerializedName("Port")
85+
private Integer port = null;
86+
8187
@SerializedName("ProjectName")
8288
private String projectName = null;
8389

@@ -201,6 +207,24 @@ public void setDescription(String description) {
201207
this.description = description;
202208
}
203209

210+
public CreateFunctionRequest enableApmplus(Boolean enableApmplus) {
211+
this.enableApmplus = enableApmplus;
212+
return this;
213+
}
214+
215+
/**
216+
* Get enableApmplus
217+
* @return enableApmplus
218+
**/
219+
@Schema(description = "")
220+
public Boolean isEnableApmplus() {
221+
return enableApmplus;
222+
}
223+
224+
public void setEnableApmplus(Boolean enableApmplus) {
225+
this.enableApmplus = enableApmplus;
226+
}
227+
204228
public CreateFunctionRequest envs(List<EnvForCreateFunctionInput> envs) {
205229
this.envs = envs;
206230
return this;
@@ -356,6 +380,24 @@ public void setNasStorage(NasStorageForCreateFunctionInput nasStorage) {
356380
this.nasStorage = nasStorage;
357381
}
358382

383+
public CreateFunctionRequest port(Integer port) {
384+
this.port = port;
385+
return this;
386+
}
387+
388+
/**
389+
* Get port
390+
* @return port
391+
**/
392+
@Schema(description = "")
393+
public Integer getPort() {
394+
return port;
395+
}
396+
397+
public void setPort(Integer port) {
398+
this.port = port;
399+
}
400+
359401
public CreateFunctionRequest projectName(String projectName) {
360402
this.projectName = projectName;
361403
return this;
@@ -583,6 +625,7 @@ public boolean equals(java.lang.Object o) {
583625
Objects.equals(this.cpuMilli, createFunctionRequest.cpuMilli) &&
584626
Objects.equals(this.cpuStrategy, createFunctionRequest.cpuStrategy) &&
585627
Objects.equals(this.description, createFunctionRequest.description) &&
628+
Objects.equals(this.enableApmplus, createFunctionRequest.enableApmplus) &&
586629
Objects.equals(this.envs, createFunctionRequest.envs) &&
587630
Objects.equals(this.exclusiveMode, createFunctionRequest.exclusiveMode) &&
588631
Objects.equals(this.initializerSec, createFunctionRequest.initializerSec) &&
@@ -591,6 +634,7 @@ public boolean equals(java.lang.Object o) {
591634
Objects.equals(this.memoryMB, createFunctionRequest.memoryMB) &&
592635
Objects.equals(this.name, createFunctionRequest.name) &&
593636
Objects.equals(this.nasStorage, createFunctionRequest.nasStorage) &&
637+
Objects.equals(this.port, createFunctionRequest.port) &&
594638
Objects.equals(this.projectName, createFunctionRequest.projectName) &&
595639
Objects.equals(this.requestTimeout, createFunctionRequest.requestTimeout) &&
596640
Objects.equals(this.role, createFunctionRequest.role) &&
@@ -606,7 +650,7 @@ public boolean equals(java.lang.Object o) {
606650

607651
@Override
608652
public int hashCode() {
609-
return Objects.hash(cell, command, cpuMilli, cpuStrategy, description, envs, exclusiveMode, initializerSec, instanceType, maxConcurrency, memoryMB, name, nasStorage, projectName, requestTimeout, role, runtime, source, sourceAccessConfig, sourceType, tags, tlsConfig, tosMountConfig, vpcConfig);
653+
return Objects.hash(cell, command, cpuMilli, cpuStrategy, description, enableApmplus, envs, exclusiveMode, initializerSec, instanceType, maxConcurrency, memoryMB, name, nasStorage, port, projectName, requestTimeout, role, runtime, source, sourceAccessConfig, sourceType, tags, tlsConfig, tosMountConfig, vpcConfig);
610654
}
611655

612656

@@ -620,6 +664,7 @@ public String toString() {
620664
sb.append(" cpuMilli: ").append(toIndentedString(cpuMilli)).append("\n");
621665
sb.append(" cpuStrategy: ").append(toIndentedString(cpuStrategy)).append("\n");
622666
sb.append(" description: ").append(toIndentedString(description)).append("\n");
667+
sb.append(" enableApmplus: ").append(toIndentedString(enableApmplus)).append("\n");
623668
sb.append(" envs: ").append(toIndentedString(envs)).append("\n");
624669
sb.append(" exclusiveMode: ").append(toIndentedString(exclusiveMode)).append("\n");
625670
sb.append(" initializerSec: ").append(toIndentedString(initializerSec)).append("\n");
@@ -628,6 +673,7 @@ public String toString() {
628673
sb.append(" memoryMB: ").append(toIndentedString(memoryMB)).append("\n");
629674
sb.append(" name: ").append(toIndentedString(name)).append("\n");
630675
sb.append(" nasStorage: ").append(toIndentedString(nasStorage)).append("\n");
676+
sb.append(" port: ").append(toIndentedString(port)).append("\n");
631677
sb.append(" projectName: ").append(toIndentedString(projectName)).append("\n");
632678
sb.append(" requestTimeout: ").append(toIndentedString(requestTimeout)).append("\n");
633679
sb.append(" role: ").append(toIndentedString(role)).append("\n");

volcengine-java-sdk-vefaas/src/main/java/com/volcengine/vefaas/model/CreateFunctionResponse.java

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,18 @@ public class CreateFunctionResponse extends com.volcengine.model.AbstractRespons
5050
@SerializedName("Command")
5151
private String command = null;
5252

53+
@SerializedName("Cpu")
54+
private Integer cpu = null;
55+
5356
@SerializedName("CreationTime")
5457
private String creationTime = null;
5558

5659
@SerializedName("Description")
5760
private String description = null;
5861

62+
@SerializedName("EnableApmplus")
63+
private Boolean enableApmplus = null;
64+
5965
@SerializedName("Envs")
6066
private List<EnvForCreateFunctionOutput> envs = null;
6167

@@ -197,6 +203,24 @@ public void setCommand(String command) {
197203
this.command = command;
198204
}
199205

206+
public CreateFunctionResponse cpu(Integer cpu) {
207+
this.cpu = cpu;
208+
return this;
209+
}
210+
211+
/**
212+
* Get cpu
213+
* @return cpu
214+
**/
215+
@Schema(description = "")
216+
public Integer getCpu() {
217+
return cpu;
218+
}
219+
220+
public void setCpu(Integer cpu) {
221+
this.cpu = cpu;
222+
}
223+
200224
public CreateFunctionResponse creationTime(String creationTime) {
201225
this.creationTime = creationTime;
202226
return this;
@@ -233,6 +257,24 @@ public void setDescription(String description) {
233257
this.description = description;
234258
}
235259

260+
public CreateFunctionResponse enableApmplus(Boolean enableApmplus) {
261+
this.enableApmplus = enableApmplus;
262+
return this;
263+
}
264+
265+
/**
266+
* Get enableApmplus
267+
* @return enableApmplus
268+
**/
269+
@Schema(description = "")
270+
public Boolean isEnableApmplus() {
271+
return enableApmplus;
272+
}
273+
274+
public void setEnableApmplus(Boolean enableApmplus) {
275+
this.enableApmplus = enableApmplus;
276+
}
277+
236278
public CreateFunctionResponse envs(List<EnvForCreateFunctionOutput> envs) {
237279
this.envs = envs;
238280
return this;
@@ -683,8 +725,10 @@ public boolean equals(java.lang.Object o) {
683725
Objects.equals(this.codeSize, createFunctionResponse.codeSize) &&
684726
Objects.equals(this.codeSizeLimit, createFunctionResponse.codeSizeLimit) &&
685727
Objects.equals(this.command, createFunctionResponse.command) &&
728+
Objects.equals(this.cpu, createFunctionResponse.cpu) &&
686729
Objects.equals(this.creationTime, createFunctionResponse.creationTime) &&
687730
Objects.equals(this.description, createFunctionResponse.description) &&
731+
Objects.equals(this.enableApmplus, createFunctionResponse.enableApmplus) &&
688732
Objects.equals(this.envs, createFunctionResponse.envs) &&
689733
Objects.equals(this.exclusiveMode, createFunctionResponse.exclusiveMode) &&
690734
Objects.equals(this.functionType, createFunctionResponse.functionType) &&
@@ -712,7 +756,7 @@ public boolean equals(java.lang.Object o) {
712756

713757
@Override
714758
public int hashCode() {
715-
return Objects.hash(cell, codeSize, codeSizeLimit, command, creationTime, description, envs, exclusiveMode, functionType, id, initializerSec, instanceType, lastUpdateTime, maxConcurrency, memoryMB, name, nasStorage, owner, projectName, requestTimeout, role, runtime, sourceLocation, sourceType, tags, tlsConfig, tosMountConfig, triggersCount, vpcConfig);
759+
return Objects.hash(cell, codeSize, codeSizeLimit, command, cpu, creationTime, description, enableApmplus, envs, exclusiveMode, functionType, id, initializerSec, instanceType, lastUpdateTime, maxConcurrency, memoryMB, name, nasStorage, owner, projectName, requestTimeout, role, runtime, sourceLocation, sourceType, tags, tlsConfig, tosMountConfig, triggersCount, vpcConfig);
716760
}
717761

718762

@@ -725,8 +769,10 @@ public String toString() {
725769
sb.append(" codeSize: ").append(toIndentedString(codeSize)).append("\n");
726770
sb.append(" codeSizeLimit: ").append(toIndentedString(codeSizeLimit)).append("\n");
727771
sb.append(" command: ").append(toIndentedString(command)).append("\n");
772+
sb.append(" cpu: ").append(toIndentedString(cpu)).append("\n");
728773
sb.append(" creationTime: ").append(toIndentedString(creationTime)).append("\n");
729774
sb.append(" description: ").append(toIndentedString(description)).append("\n");
775+
sb.append(" enableApmplus: ").append(toIndentedString(enableApmplus)).append("\n");
730776
sb.append(" envs: ").append(toIndentedString(envs)).append("\n");
731777
sb.append(" exclusiveMode: ").append(toIndentedString(exclusiveMode)).append("\n");
732778
sb.append(" functionType: ").append(toIndentedString(functionType)).append("\n");

volcengine-java-sdk-vefaas/src/main/java/com/volcengine/vefaas/model/GetFunctionResponse.java

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ public class GetFunctionResponse extends com.volcengine.model.AbstractResponse {
4646
@SerializedName("Command")
4747
private String command = null;
4848

49+
@SerializedName("Cpu")
50+
private Integer cpu = null;
51+
4952
@SerializedName("CpuStrategy")
5053
private String cpuStrategy = null;
5154

@@ -55,6 +58,9 @@ public class GetFunctionResponse extends com.volcengine.model.AbstractResponse {
5558
@SerializedName("Description")
5659
private String description = null;
5760

61+
@SerializedName("EnableApmplus")
62+
private Boolean enableApmplus = null;
63+
5864
@SerializedName("Envs")
5965
private List<EnvForGetFunctionOutput> envs = null;
6066

@@ -178,6 +184,24 @@ public void setCommand(String command) {
178184
this.command = command;
179185
}
180186

187+
public GetFunctionResponse cpu(Integer cpu) {
188+
this.cpu = cpu;
189+
return this;
190+
}
191+
192+
/**
193+
* Get cpu
194+
* @return cpu
195+
**/
196+
@Schema(description = "")
197+
public Integer getCpu() {
198+
return cpu;
199+
}
200+
201+
public void setCpu(Integer cpu) {
202+
this.cpu = cpu;
203+
}
204+
181205
public GetFunctionResponse cpuStrategy(String cpuStrategy) {
182206
this.cpuStrategy = cpuStrategy;
183207
return this;
@@ -232,6 +256,24 @@ public void setDescription(String description) {
232256
this.description = description;
233257
}
234258

259+
public GetFunctionResponse enableApmplus(Boolean enableApmplus) {
260+
this.enableApmplus = enableApmplus;
261+
return this;
262+
}
263+
264+
/**
265+
* Get enableApmplus
266+
* @return enableApmplus
267+
**/
268+
@Schema(description = "")
269+
public Boolean isEnableApmplus() {
270+
return enableApmplus;
271+
}
272+
273+
public void setEnableApmplus(Boolean enableApmplus) {
274+
this.enableApmplus = enableApmplus;
275+
}
276+
235277
public GetFunctionResponse envs(List<EnvForGetFunctionOutput> envs) {
236278
this.envs = envs;
237279
return this;
@@ -672,9 +714,11 @@ public boolean equals(java.lang.Object o) {
672714
return Objects.equals(this.codeSize, getFunctionResponse.codeSize) &&
673715
Objects.equals(this.codeSizeLimit, getFunctionResponse.codeSizeLimit) &&
674716
Objects.equals(this.command, getFunctionResponse.command) &&
717+
Objects.equals(this.cpu, getFunctionResponse.cpu) &&
675718
Objects.equals(this.cpuStrategy, getFunctionResponse.cpuStrategy) &&
676719
Objects.equals(this.creationTime, getFunctionResponse.creationTime) &&
677720
Objects.equals(this.description, getFunctionResponse.description) &&
721+
Objects.equals(this.enableApmplus, getFunctionResponse.enableApmplus) &&
678722
Objects.equals(this.envs, getFunctionResponse.envs) &&
679723
Objects.equals(this.exclusiveMode, getFunctionResponse.exclusiveMode) &&
680724
Objects.equals(this.id, getFunctionResponse.id) &&
@@ -702,7 +746,7 @@ public boolean equals(java.lang.Object o) {
702746

703747
@Override
704748
public int hashCode() {
705-
return Objects.hash(codeSize, codeSizeLimit, command, cpuStrategy, creationTime, description, envs, exclusiveMode, id, initializerSec, instanceType, lastUpdateTime, maxConcurrency, memoryMB, name, nasStorage, owner, port, projectName, requestTimeout, role, runtime, source, sourceLocation, sourceType, tlsConfig, tosMountConfig, triggersCount, vpcConfig);
749+
return Objects.hash(codeSize, codeSizeLimit, command, cpu, cpuStrategy, creationTime, description, enableApmplus, envs, exclusiveMode, id, initializerSec, instanceType, lastUpdateTime, maxConcurrency, memoryMB, name, nasStorage, owner, port, projectName, requestTimeout, role, runtime, source, sourceLocation, sourceType, tlsConfig, tosMountConfig, triggersCount, vpcConfig);
706750
}
707751

708752

@@ -714,9 +758,11 @@ public String toString() {
714758
sb.append(" codeSize: ").append(toIndentedString(codeSize)).append("\n");
715759
sb.append(" codeSizeLimit: ").append(toIndentedString(codeSizeLimit)).append("\n");
716760
sb.append(" command: ").append(toIndentedString(command)).append("\n");
761+
sb.append(" cpu: ").append(toIndentedString(cpu)).append("\n");
717762
sb.append(" cpuStrategy: ").append(toIndentedString(cpuStrategy)).append("\n");
718763
sb.append(" creationTime: ").append(toIndentedString(creationTime)).append("\n");
719764
sb.append(" description: ").append(toIndentedString(description)).append("\n");
765+
sb.append(" enableApmplus: ").append(toIndentedString(enableApmplus)).append("\n");
720766
sb.append(" envs: ").append(toIndentedString(envs)).append("\n");
721767
sb.append(" exclusiveMode: ").append(toIndentedString(exclusiveMode)).append("\n");
722768
sb.append(" id: ").append(toIndentedString(id)).append("\n");

volcengine-java-sdk-vefaas/src/main/java/com/volcengine/vefaas/model/ItemForListFunctionsOutput.java

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ public class ItemForListFunctionsOutput {
5050
@SerializedName("Command")
5151
private String command = null;
5252

53+
@SerializedName("Cpu")
54+
private Integer cpu = null;
55+
5356
@SerializedName("CpuStrategy")
5457
private String cpuStrategy = null;
5558

@@ -206,6 +209,24 @@ public void setCommand(String command) {
206209
this.command = command;
207210
}
208211

212+
public ItemForListFunctionsOutput cpu(Integer cpu) {
213+
this.cpu = cpu;
214+
return this;
215+
}
216+
217+
/**
218+
* Get cpu
219+
* @return cpu
220+
**/
221+
@Schema(description = "")
222+
public Integer getCpu() {
223+
return cpu;
224+
}
225+
226+
public void setCpu(Integer cpu) {
227+
this.cpu = cpu;
228+
}
229+
209230
public ItemForListFunctionsOutput cpuStrategy(String cpuStrategy) {
210231
this.cpuStrategy = cpuStrategy;
211232
return this;
@@ -746,6 +767,7 @@ public boolean equals(java.lang.Object o) {
746767
Objects.equals(this.codeSize, itemForListFunctionsOutput.codeSize) &&
747768
Objects.equals(this.codeSizeLimit, itemForListFunctionsOutput.codeSizeLimit) &&
748769
Objects.equals(this.command, itemForListFunctionsOutput.command) &&
770+
Objects.equals(this.cpu, itemForListFunctionsOutput.cpu) &&
749771
Objects.equals(this.cpuStrategy, itemForListFunctionsOutput.cpuStrategy) &&
750772
Objects.equals(this.creationTime, itemForListFunctionsOutput.creationTime) &&
751773
Objects.equals(this.description, itemForListFunctionsOutput.description) &&
@@ -778,7 +800,7 @@ public boolean equals(java.lang.Object o) {
778800

779801
@Override
780802
public int hashCode() {
781-
return Objects.hash(cell, codeSize, codeSizeLimit, command, cpuStrategy, creationTime, description, envs, exclusiveMode, functionType, id, initializerSec, instanceType, lastUpdateTime, maxConcurrency, memoryMB, name, nasStorage, owner, port, projectName, requestTimeout, role, runtime, source, sourceLocation, sourceType, tags, tlsConfig, tosMountConfig, triggersCount, vpcConfig);
803+
return Objects.hash(cell, codeSize, codeSizeLimit, command, cpu, cpuStrategy, creationTime, description, envs, exclusiveMode, functionType, id, initializerSec, instanceType, lastUpdateTime, maxConcurrency, memoryMB, name, nasStorage, owner, port, projectName, requestTimeout, role, runtime, source, sourceLocation, sourceType, tags, tlsConfig, tosMountConfig, triggersCount, vpcConfig);
782804
}
783805

784806

@@ -791,6 +813,7 @@ public String toString() {
791813
sb.append(" codeSize: ").append(toIndentedString(codeSize)).append("\n");
792814
sb.append(" codeSizeLimit: ").append(toIndentedString(codeSizeLimit)).append("\n");
793815
sb.append(" command: ").append(toIndentedString(command)).append("\n");
816+
sb.append(" cpu: ").append(toIndentedString(cpu)).append("\n");
794817
sb.append(" cpuStrategy: ").append(toIndentedString(cpuStrategy)).append("\n");
795818
sb.append(" creationTime: ").append(toIndentedString(creationTime)).append("\n");
796819
sb.append(" description: ").append(toIndentedString(description)).append("\n");

0 commit comments

Comments
 (0)