Unified method name in FindInstancesRequest

meridor · Dec 10, 2016 · 052bfce · 052bfce
1 parent 7f96b52
commit 052bfce
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/...hell/src/main/java/org/meridor/perspective/shell/common/request/FindInstancesRequest.java b/...hell/src/main/java/org/meridor/perspective/shell/common/request/FindInstancesRequest.java
@@ -67,8 +67,8 @@ public FindInstancesRequest withClouds(String clouds) {
         this.cloud = parseEnumeration(clouds);
         return this;
     }
-    
-    public FindInstancesRequest withProjectNames(String projects) {
+
+    public FindInstancesRequest withProjects(String projects) {
         this.project = parseEnumeration(projects);
         return this;
     }

diff --git a/...hell/src/main/java/org/meridor/perspective/shell/interactive/commands/ModifyCommands.java b/...hell/src/main/java/org/meridor/perspective/shell/interactive/commands/ModifyCommands.java
@@ -174,7 +174,7 @@ public void resizeInstances(
     ) {
         if (projectName != null && instanceNames != null && flavorName != null) {
             FindInstancesRequest findInstancesRequest = requestProvider.get(FindInstancesRequest.class)
-                    .withProjectNames(projectName)
+                    .withProjects(projectName)
                     .withNames(instanceNames);
             FindFlavorsRequest findFlavorsRequest = requestProvider.get(FindFlavorsRequest.class)
                     .withProjects(projectName)
@@ -219,7 +219,7 @@ public void rebuildInstances(
     ) {
         if (projectName != null && instanceNames != null && imageName != null) {
             FindInstancesRequest findInstancesRequest = requestProvider.get(FindInstancesRequest.class)
-                    .withProjectNames(projectName)
+                    .withProjects(projectName)
                     .withNames(instanceNames);
             FindImagesRequest findImagesRequest = requestProvider.get(FindImagesRequest.class)
                     .withProjects(projectName)

diff --git a/...-shell/src/main/java/org/meridor/perspective/shell/interactive/commands/ShowCommands.java b/...-shell/src/main/java/org/meridor/perspective/shell/interactive/commands/ShowCommands.java
@@ -164,7 +164,7 @@ public void showInstances(
                 .withImages(image)
                 .withStates(state)
                 .withClouds(cloud)
-                .withProjectNames(project);
+                .withProjects(project);
         validateExecuteShowResult(
                 findInstancesRequest,
                 new String[]{"Name", "Project", "Image", "Flavor", "Network", "State", "Last modified"},

diff --git a/...ridor/perspective/shell/interactive/wizard/common/step/AbstractMultipleInstancesStep.java b/...ridor/perspective/shell/interactive/wizard/common/step/AbstractMultipleInstancesStep.java
@@ -32,8 +32,8 @@ public abstract class AbstractMultipleInstancesStep extends MultipleChoicesStep<
     protected List<FindInstancesResult> getPossibleChoices(AnswersStorage previousAnswers) {
         return instancesRepository.findInstances(
                 requestProvider.get(FindInstancesRequest.class)
-                        .withProjectNames(getProjectName(getProjectStepClass(), previousAnswers))
-        );
+                        .withProjects(getProjectName(getProjectStepClass(), previousAnswers))
+       );
     }
 
     protected Class<? extends AbstractProjectStep> getProjectStepClass() {