Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -248,12 +248,6 @@ public ServiceCall<Collection> createCollection(CreateCollectionOptions createCo
if (createCollectionOptions.description() != null) {
contentJson.addProperty("description", createCollectionOptions.description());
}
if (createCollectionOptions.trainingStatus() != null) {
contentJson.add(
"training_status",
com.ibm.cloud.sdk.core.util.GsonSingleton.getGson()
.toJsonTree(createCollectionOptions.trainingStatus()));
}
builder.bodyJson(contentJson);
ResponseConverter<Collection> responseConverter =
ResponseConverterUtils.getValue(
Expand Down Expand Up @@ -381,12 +375,6 @@ public ServiceCall<Collection> updateCollection(UpdateCollectionOptions updateCo
if (updateCollectionOptions.description() != null) {
contentJson.addProperty("description", updateCollectionOptions.description());
}
if (updateCollectionOptions.trainingStatus() != null) {
contentJson.add(
"training_status",
com.ibm.cloud.sdk.core.util.GsonSingleton.getGson()
.toJsonTree(updateCollectionOptions.trainingStatus()));
}
builder.bodyJson(contentJson);
ResponseConverter<Collection> responseConverter =
ResponseConverterUtils.getValue(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,10 @@ public class CreateCollectionOptions extends GenericModel {
public static class Builder {
private String name;
private String description;
private TrainingStatus trainingStatus;

private Builder(CreateCollectionOptions createCollectionOptions) {
this.name = createCollectionOptions.name;
this.description = createCollectionOptions.description;
this.trainingStatus = createCollectionOptions.trainingStatus;
}

/** Instantiates a new builder. */
Expand Down Expand Up @@ -66,23 +64,11 @@ public Builder description(String description) {
this.description = description;
return this;
}

/**
* Set the trainingStatus.
*
* @param trainingStatus the trainingStatus
* @return the CreateCollectionOptions builder
*/
public Builder trainingStatus(TrainingStatus trainingStatus) {
this.trainingStatus = trainingStatus;
return this;
}
}

protected CreateCollectionOptions(Builder builder) {
name = builder.name;
description = builder.description;
trainingStatus = builder.trainingStatus;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,11 @@ public static class Builder {
private String collectionId;
private String name;
private String description;
private TrainingStatus trainingStatus;

private Builder(UpdateCollectionOptions updateCollectionOptions) {
this.collectionId = updateCollectionOptions.collectionId;
this.name = updateCollectionOptions.name;
this.description = updateCollectionOptions.description;
this.trainingStatus = updateCollectionOptions.trainingStatus;
}

/** Instantiates a new builder. */
Expand Down Expand Up @@ -89,17 +87,6 @@ public Builder description(String description) {
this.description = description;
return this;
}

/**
* Set the trainingStatus.
*
* @param trainingStatus the trainingStatus
* @return the UpdateCollectionOptions builder
*/
public Builder trainingStatus(TrainingStatus trainingStatus) {
this.trainingStatus = trainingStatus;
return this;
}
}

protected UpdateCollectionOptions(Builder builder) {
Expand All @@ -108,7 +95,6 @@ protected UpdateCollectionOptions(Builder builder) {
collectionId = builder.collectionId;
name = builder.name;
description = builder.description;
trainingStatus = builder.trainingStatus;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,27 +178,11 @@ public void testCreateCollectionWOptions() throws Throwable {

constructClientService();

// Construct an instance of the ObjectTrainingStatus model
ObjectTrainingStatus objectTrainingStatusModel =
new ObjectTrainingStatus.Builder()
.ready(true)
.inProgress(true)
.dataChanged(true)
.latestFailed(true)
.rscnnReady(true)
.description("testString")
.build();

// Construct an instance of the TrainingStatus model
TrainingStatus trainingStatusModel =
new TrainingStatus.Builder().objects(objectTrainingStatusModel).build();

// Construct an instance of the CreateCollectionOptions model
CreateCollectionOptions createCollectionOptionsModel =
new CreateCollectionOptions.Builder()
.name("testString")
.description("testString")
.trainingStatus(trainingStatusModel)
.build();

// Invoke operation with valid options model (positive test)
Expand Down Expand Up @@ -331,28 +315,12 @@ public void testUpdateCollectionWOptions() throws Throwable {

constructClientService();

// Construct an instance of the ObjectTrainingStatus model
ObjectTrainingStatus objectTrainingStatusModel =
new ObjectTrainingStatus.Builder()
.ready(true)
.inProgress(true)
.dataChanged(true)
.latestFailed(true)
.rscnnReady(true)
.description("testString")
.build();

// Construct an instance of the TrainingStatus model
TrainingStatus trainingStatusModel =
new TrainingStatus.Builder().objects(objectTrainingStatusModel).build();

// Construct an instance of the UpdateCollectionOptions model
UpdateCollectionOptions updateCollectionOptionsModel =
new UpdateCollectionOptions.Builder()
.collectionId("testString")
.name("testString")
.description("testString")
.trainingStatus(trainingStatusModel)
.build();

// Invoke operation with valid options model (positive test)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ public void testCreateCollectionOptions() throws Throwable {
new CreateCollectionOptions.Builder()
.name("testString")
.description("testString")
.trainingStatus(trainingStatusModel)
.build();
assertEquals(createCollectionOptionsModel.name(), "testString");
assertEquals(createCollectionOptionsModel.description(), "testString");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ public void testUpdateCollectionOptions() throws Throwable {
.collectionId("testString")
.name("testString")
.description("testString")
.trainingStatus(trainingStatusModel)
.build();
assertEquals(updateCollectionOptionsModel.collectionId(), "testString");
assertEquals(updateCollectionOptionsModel.name(), "testString");
Expand Down