2 files changed, 1 insertions, 28 deletions
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespastat/ClientParameters.java b/vespaclient-java/src/main/java/com/yahoo/vespastat/ClientParameters.java
index a05e4ed1e48..47a0418e2d8 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespastat/ClientParameters.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespastat/ClientParameters.java
@@ -17,7 +17,6 @@ public class ClientParameters {
     public final SelectionType selectionType;
     // The selection id
     public final String id;
-    public final String bucketSpace;
 
     public ClientParameters(
             boolean help,
@@ -25,22 +24,11 @@ public class ClientParameters {
             String route,
             SelectionType selectionType,
             String id) {
-        this(help, dumpData, route, selectionType, id, "default");
-    }
-
-    public ClientParameters(
-            boolean help,
-            boolean dumpData,
-            String route,
-            SelectionType selectionType,
-            String id,
-            String bucketSpace) {
         this.help = help;
         this.dumpData = dumpData;
         this.route = route;
         this.selectionType = selectionType;
         this.id = id;
-        this.bucketSpace = bucketSpace;
     }
 
     public enum SelectionType {USER, GROUP, BUCKET, GID, DOCUMENT}
@@ -51,7 +39,6 @@ public class ClientParameters {
         private String route;
         private SelectionType selectionType;
         private String id;
-        private String bucketSpace = "default"; // TODO repo etc etc
 
         public Builder setHelp(boolean help) {
             this.help = help;
@@ -78,13 +65,8 @@ public class ClientParameters {
             return this;
         }
 
-        public Builder setBucketSpace(String bucketSpace) {
-            this.bucketSpace = bucketSpace;
-            return this;
-        }
-
         public ClientParameters build() {
-            return new ClientParameters(help, dumpData, route, selectionType, id, bucketSpace);
+            return new ClientParameters(help, dumpData, route, selectionType, id);
         }
     }
 
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespastat/CommandLineOptions.java b/vespaclient-java/src/main/java/com/yahoo/vespastat/CommandLineOptions.java
index b6783efb25b..59ab17af8d6 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespastat/CommandLineOptions.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespastat/CommandLineOptions.java
@@ -25,7 +25,6 @@ public class CommandLineOptions {
     private static final String BUCKET_OPTION = "bucket";
     private static final String GID_OPTION = "gid";
     private static final String DOCUMENT_OPTION = "document";
-    private static final String BUCKET_SPACE_OPTION = "bucketspace";
 
     private final Options options = createOptions();
 
@@ -52,13 +51,6 @@ public class CommandLineOptions {
                 .longOpt(ROUTE_OPTION)
                 .build());
 
-        options.addOption(Option.builder("s")
-                .hasArg(true)
-                .desc("Stat buckets within the given bucket space. If not provided, 'default' is used.")
-                .argName("space")
-                .longOpt(BUCKET_SPACE_OPTION)
-                .build());
-
         // A group of mutually exclusive options for user, group, bucket, gid and document.
         OptionGroup optionGroup = new OptionGroup();
         optionGroup.setRequired(false);
@@ -117,7 +109,6 @@ public class CommandLineOptions {
             builder.setHelp(cl.hasOption(HELP_OPTION));
             builder.setDumpData(cl.hasOption(DUMP_OPTION));
             builder.setRoute(cl.getOptionValue(ROUTE_OPTION, "default"));
-            builder.setBucketSpace(cl.getOptionValue(BUCKET_SPACE_OPTION, "default"));
 
             if (cl.hasOption(USER_OPTION)) {
                 builder.setSelectionType(ClientParameters.SelectionType.USER);