Not sure if I like this yet WIP

sydney-munro · sydney-munro · commit 794e81ece0ec · 2022-07-08T12:15:35.000-07:00
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java
@@ -91,7 +91,6 @@ public com.google.api.services.storage.model.Bucket apply(BucketInfo bucketInfo)
   private final List<Cors> cors;
   private final List<Acl> acl;
   private final List<Acl> defaultAcl;
-  private final String location;
   private final Rpo rpo;
   private final StorageClass storageClass;
   private final Map<String, String> labels;
@@ -103,7 +102,6 @@ public com.google.api.services.storage.model.Bucket apply(BucketInfo bucketInfo)
   private final IamConfiguration iamConfiguration;
   private final String locationType;
   private final Logging logging;
-  private final CustomPlacementConfig customPlacementConfig;
 
   private static final Logger log = Logger.getLogger(BucketInfo.class.getName());
 
@@ -399,6 +397,73 @@ public CustomPlacementConfig build() {
     }
   }
 
+  public static class LocationConfig implements Serializable {
+    private static final long serialVersionUID = 5901211261729627043L;
+    private String location;
+    private CustomPlacementConfig customPlacementConfig;
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+
+      return Objects.equals(
+              this.customPlacementConfig.toPb(), ((LocationConfig) o).customPlacementConfig.toPb())
+          && this.location.equals(((LocationConfig) o).location);
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(location, customPlacementConfig);
+    }
+
+    public static LocationConfig.Builder newBuilder() {
+      return new LocationConfig.Builder();
+    }
+
+    public LocationConfig.Builder toBuilder() {
+      LocationConfig.Builder builder = new LocationConfig.Builder();
+      builder.location = location;
+      builder.customPlacementConfig = customPlacementConfig;
+      return builder;
+    }
+
+    public String getLocation() {
+      return location;
+    }
+
+    public CustomPlacementConfig getCustomPlacementConfig() {
+      return customPlacementConfig;
+    }
+
+    private LocationConfig(LocationConfig.Builder builder) {
+      this.customPlacementConfig = builder.customPlacementConfig;
+      this.location = builder.location;
+    }
+
+    public static class Builder {
+      private String location;
+      private CustomPlacementConfig customPlacementConfig;
+
+      public LocationConfig.Builder setLocation(String location) {
+        this.location = location;
+        return this;
+      }
+
+      public LocationConfig.Builder setCustomPlacementConfig(
+          CustomPlacementConfig customPlacementConfig) {
+        this.customPlacementConfig = customPlacementConfig;
+        return this;
+      }
+
+      public LocationConfig build() {
+        return new LocationConfig(this);
+      }
+    }
+  }
+
   /**
    * The bucket's logging configuration, which defines the destination bucket and optional name
    * prefix for the current bucket's logs.
