kbendick commented on a change in pull request #4037: URL: https://github.com/apache/iceberg/pull/4037#discussion_r806210962
########## File path: core/src/main/java/org/apache/iceberg/rest/requests/CreateNamespaceRequest.java ########## @@ -0,0 +1,109 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iceberg.rest.requests; + +import com.fasterxml.jackson.annotation.JsonProperty; Review comment: Let me check if Jackson can infer everything. I don't think it can - which is why I added these in." I would be in favor of the more explicit SerDe as well given what's mentioned above (or using a library to generate the classes for us would be my preferred approach but I know that comes with its own set of issues). ########## File path: core/src/main/java/org/apache/iceberg/rest/requests/CreateNamespaceRequest.java ########## @@ -0,0 +1,109 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iceberg.rest.requests; + +import com.fasterxml.jackson.annotation.JsonProperty; Review comment: Let me check if Jackson can infer everything. I would be in favor of the more explicit SerDe as well given what's mentioned above (or using a library to generate the classes for us would be my preferred approach but I know that comes with its own set of issues). ########## File path: core/src/main/java/org/apache/iceberg/rest/requests/CreateNamespaceRequest.java ########## @@ -0,0 +1,109 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iceberg.rest.requests; + +import com.fasterxml.jackson.annotation.JsonProperty; Review comment: So I realized the issue. We can't validate the input if we just let Jackson infer things. For example, if a server sends a `CreateNamespaceResponse` of `{ }`, it will not fail on deserialization and we will get `CreateNamespaceResponse(namespace=null, properties=null)`. The annotations force it to go through the constructor, which is where we throw if the required / not-null field `namespace` isn't found. ########## File path: core/src/main/java/org/apache/iceberg/rest/requests/UpdateNamespacePropertiesRequest.java ########## @@ -0,0 +1,161 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iceberg.rest.requests; + +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.relocated.com.google.common.base.MoreObjects; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet; + +/** + * A REST request to set and/or remove properties on a namespace. + * <p> + * The request body specifies a list of properties to remove and a map + * of key value pairs to update. + * <p> + * Properties that are not in the request are not modified or removed by this call. + * Server implementations are not required to support namespace properties. + */ +public class UpdateNamespacePropertiesRequest { + + private List<String> removals; + private Map<String, String> updates; + + public UpdateNamespacePropertiesRequest() { + // Required for Jackson deserialization. + } + + private UpdateNamespacePropertiesRequest(List<String> removals, Map<String, String> updates) { + this.removals = removals; + this.updates = updates; + validate(); + } + + UpdateNamespacePropertiesRequest validate() { + ValidationException.check((this.removals != null && !this.removals.isEmpty()) || + (this.updates != null && !this.updates.isEmpty()), + "Cannot create a request to update a namespace's properties without specifying any props to update or remove"); + return this; + } + + public static Builder builder() { + return new Builder(); + } + + public List<String> removals() { + return removals != null ? ImmutableList.copyOf(removals) : Collections.emptyList(); + } + + public Map<String, String> updates() { + return updates != null ? ImmutableMap.copyOf(updates) : Collections.emptyMap(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + + if (o == null || getClass() != o.getClass()) { + return false; + } + + UpdateNamespacePropertiesRequest that = (UpdateNamespacePropertiesRequest) o; + return Objects.equals(removals, that.removals) && Objects.equals(updates, that.updates); + } + + @Override + public int hashCode() { + return Objects.hash(removals, updates); + } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("removals", removals) + .add("updates", updates) + .toString(); + } + + public static class Builder { + private ImmutableSet.Builder<String> removalsBuilder; + private ImmutableMap.Builder<String, String> updatesBuilder; + + private Builder() { + } + + public Builder remove(String removal) { + ensureRemovalsInitialized(); + removalsBuilder.add(removal); + return this; + } + + public Builder removeAll(Iterable<String> removals) { + ensureRemovalsInitialized(); + removalsBuilder.addAll(removals); + return this; + } + + public Builder update(String key, String value) { + ensureUpdatesInitialized(); + updatesBuilder.put(key, value); + return this; + } + + public Builder updateAll(Map<String, String> updates) { + ensureUpdatesInitialized(); + updatesBuilder.putAll(updates); + return this; + } + + private void ensureRemovalsInitialized() { + if (removalsBuilder == null) { + removalsBuilder = ImmutableSet.builder(); + } + } Review comment: Lazily instantiated so that we serialize null vs empty in a way that will match what is parsed with equals. Accessor methods return immutable copies, so null values are tolerated. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
