Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CELEBORN-1477][FOLLOWUP] Minor fix for v1 RESTful apis before release #3023

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
subResourceConsumptions
  • Loading branch information
turboFei committed Dec 22, 2024
commit 88c9a544b39dfadc1b1ee5370b73add9168a79e4
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
WorkerResourceConsumption.JSON_PROPERTY_DISK_FILE_COUNT,
WorkerResourceConsumption.JSON_PROPERTY_HDFS_BYTES_WRITTEN,
WorkerResourceConsumption.JSON_PROPERTY_HDFS_FILE_COUNT,
WorkerResourceConsumption.JSON_PROPERTY_SUB_RESOURCE_CONSUMPTION
WorkerResourceConsumption.JSON_PROPERTY_SUB_RESOURCE_CONSUMPTIONS
})
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0")
public class WorkerResourceConsumption {
Expand All @@ -54,8 +54,8 @@ public class WorkerResourceConsumption {
public static final String JSON_PROPERTY_HDFS_FILE_COUNT = "hdfsFileCount";
private Long hdfsFileCount;

public static final String JSON_PROPERTY_SUB_RESOURCE_CONSUMPTION = "subResourceConsumption";
private Map<String, WorkerResourceConsumption> subResourceConsumption = new HashMap<>();
public static final String JSON_PROPERTY_SUB_RESOURCE_CONSUMPTIONS = "subResourceConsumptions";
private Map<String, WorkerResourceConsumption> subResourceConsumptions = new HashMap<>();

public WorkerResourceConsumption() {
}
Expand Down Expand Up @@ -160,37 +160,37 @@ public void setHdfsFileCount(Long hdfsFileCount) {
this.hdfsFileCount = hdfsFileCount;
}

public WorkerResourceConsumption subResourceConsumption(Map<String, WorkerResourceConsumption> subResourceConsumption) {
public WorkerResourceConsumption subResourceConsumptions(Map<String, WorkerResourceConsumption> subResourceConsumptions) {

this.subResourceConsumption = subResourceConsumption;
this.subResourceConsumptions = subResourceConsumptions;
return this;
}

public WorkerResourceConsumption putSubResourceConsumptionItem(String key, WorkerResourceConsumption subResourceConsumptionItem) {
if (this.subResourceConsumption == null) {
this.subResourceConsumption = new HashMap<>();
public WorkerResourceConsumption putSubResourceConsumptionsItem(String key, WorkerResourceConsumption subResourceConsumptionsItem) {
if (this.subResourceConsumptions == null) {
this.subResourceConsumptions = new HashMap<>();
}
this.subResourceConsumption.put(key, subResourceConsumptionItem);
this.subResourceConsumptions.put(key, subResourceConsumptionsItem);
return this;
}

/**
* Get subResourceConsumption
* @return subResourceConsumption
* Get subResourceConsumptions
* @return subResourceConsumptions
*/
@javax.annotation.Nullable
@JsonProperty(JSON_PROPERTY_SUB_RESOURCE_CONSUMPTION)
@JsonProperty(JSON_PROPERTY_SUB_RESOURCE_CONSUMPTIONS)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)

public Map<String, WorkerResourceConsumption> getSubResourceConsumption() {
return subResourceConsumption;
public Map<String, WorkerResourceConsumption> getSubResourceConsumptions() {
return subResourceConsumptions;
}


@JsonProperty(JSON_PROPERTY_SUB_RESOURCE_CONSUMPTION)
@JsonProperty(JSON_PROPERTY_SUB_RESOURCE_CONSUMPTIONS)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public void setSubResourceConsumption(Map<String, WorkerResourceConsumption> subResourceConsumption) {
this.subResourceConsumption = subResourceConsumption;
public void setSubResourceConsumptions(Map<String, WorkerResourceConsumption> subResourceConsumptions) {
this.subResourceConsumptions = subResourceConsumptions;
}

@Override
Expand All @@ -206,12 +206,12 @@ public boolean equals(Object o) {
Objects.equals(this.diskFileCount, workerResourceConsumption.diskFileCount) &&
Objects.equals(this.hdfsBytesWritten, workerResourceConsumption.hdfsBytesWritten) &&
Objects.equals(this.hdfsFileCount, workerResourceConsumption.hdfsFileCount) &&
Objects.equals(this.subResourceConsumption, workerResourceConsumption.subResourceConsumption);
Objects.equals(this.subResourceConsumptions, workerResourceConsumption.subResourceConsumptions);
}

@Override
public int hashCode() {
return Objects.hash(diskBytesWritten, diskFileCount, hdfsBytesWritten, hdfsFileCount, subResourceConsumption);
return Objects.hash(diskBytesWritten, diskFileCount, hdfsBytesWritten, hdfsFileCount, subResourceConsumptions);
}

@Override
Expand All @@ -222,7 +222,7 @@ public String toString() {
sb.append(" diskFileCount: ").append(toIndentedString(diskFileCount)).append("\n");
sb.append(" hdfsBytesWritten: ").append(toIndentedString(hdfsBytesWritten)).append("\n");
sb.append(" hdfsFileCount: ").append(toIndentedString(hdfsFileCount)).append("\n");
sb.append(" subResourceConsumption: ").append(toIndentedString(subResourceConsumption)).append("\n");
sb.append(" subResourceConsumptions: ").append(toIndentedString(subResourceConsumptions)).append("\n");
sb.append("}");
return sb.toString();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ components:
hdfsFileCount:
type: integer
format: int64
subResourceConsumption:
subResourceConsumptions:
type: object
additionalProperties:
$ref: '#/components/schemas/WorkerResourceConsumption'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ components:
hdfsFileCount:
type: integer
format: int64
subResourceConsumption:
subResourceConsumptions:
type: object
additionalProperties:
$ref: '#/components/schemas/WorkerResourceConsumption'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ object ApiUtils {
.diskFileCount(resourceConsumption.diskFileCount)
.hdfsBytesWritten(resourceConsumption.hdfsBytesWritten)
.hdfsFileCount(resourceConsumption.hdfsFileCount)
.subResourceConsumption(subConsumptions)
.subResourceConsumptions(subConsumptions)

workerResourceConsumptions.put(userIdentifier.toString, workerConsumption)
}
Expand Down
Loading