kbendick commented on a change in pull request #4037: URL: https://github.com/apache/iceberg/pull/4037#discussion_r808427588
########## File path: core/src/test/java/org/apache/iceberg/rest/requests/TestCreateNamespaceRequest.java ########## @@ -0,0 +1,128 @@ +/* + * 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.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import java.util.Map; +import org.apache.iceberg.AssertHelpers; +import org.apache.iceberg.catalog.Namespace; +import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.rest.RESTUtils; +import org.assertj.core.api.Assertions; +import org.junit.Test; + +public class TestCreateNamespaceRequest { + + private static final ObjectMapper MAPPER = RESTUtils.mapper(); + + private static final String[] ALL_FIELDS_FROM_SPEC = { "namespace", "properties" }; + + /* Values used to fill in request fields */ + private static final Namespace NAMESPACE = Namespace.of("accounting", "tax"); + private static final Map<String, String> PROPERTIES = ImmutableMap.of("owner", "Hank"); + private static final Map<String, String> EMPTY_PROPERTIES = ImmutableMap.of(); + + @Test + public void testValidSerDe() throws JsonProcessingException { + Map<String, CreateNamespaceRequest> toTest = ImmutableMap.of( + // Full response + "{\"namespace\":[\"accounting\",\"tax\"],\"properties\":{\"owner\":\"Hank\"}}", + builder().withNamespace(NAMESPACE).setProperties(PROPERTIES).build(), + "{\"namespace\":[\"accounting\",\"tax\"],\"properties\":null}", + builder().withNamespace(NAMESPACE).build(), + "{\"namespace\":[\"accounting\",\"tax\"],\"properties\":{}}", + builder().withNamespace(NAMESPACE).setProperties(EMPTY_PROPERTIES).build()); + + for (Map.Entry<String, CreateNamespaceRequest> testCase : toTest.entrySet()) { + String json = testCase.getKey(); + CreateNamespaceRequest req = testCase.getValue(); + assertSerializes(req, json); + assertDeserializes(json, req); + } + } + + @Test + public void testDeserializeInvalidRequest() { + String jsonIncorrectTypeForNamespace = "{\"namespace\":\"accounting%00tax\",\"properties\":null}"; + AssertHelpers.assertThrows( + "A JSON request with incorrect types for fields should fail to deserialize and validate", + JsonProcessingException.class, + "Namespace must be an array", + () -> MAPPER.readValue(jsonIncorrectTypeForNamespace, CreateNamespaceRequest.class).validate() + ); + + String jsonIncorrectTypeForProperties = "{\"namespace\":[\"accounting\",\"tax\"],\"properties\":[]}"; + AssertHelpers.assertThrows( + "A JSON request with incorrect types for fields should fail to parse and validate", + JsonProcessingException.class, + () -> MAPPER.readValue(jsonIncorrectTypeForProperties, CreateNamespaceRequest.class).validate() + ); + + String jsonMisspelledKeys = "{\"namepsace\":[\"accounting\",\"tax\"],\"propertiezzzz\":{\"owner\":\"Hank\"}}"; + AssertHelpers.assertThrows( + "A JSON request with the keys spelled incorrectly should fail to deserialize and validate", + JsonProcessingException.class, + () -> MAPPER.readValue(jsonMisspelledKeys, CreateNamespaceRequest.class).validate() Review comment: It fails because there aren't values for what is needed. That's why `validate` is required. With the way the ObjectMapper is presently configured, it doesn't fail on unknown fields (though other object mappers might). ########## File path: core/src/main/java/org/apache/iceberg/rest/requests/CreateNamespaceRequest.java ########## @@ -0,0 +1,128 @@ +/* + * 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.Map; +import java.util.Objects; +import org.apache.iceberg.catalog.Namespace; +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.ImmutableMap; +import org.apache.iceberg.util.ImmutablesUtil; + +/** + * A REST request to create a namespace, with an optional set of properties. + * The server might also add properties, such as `last_modified_time` etc. + */ +public class CreateNamespaceRequest { + + private Namespace namespace; + private Map<String, String> properties; + + public CreateNamespaceRequest() { + // Needed for Jackson Deserialization. + } + + private CreateNamespaceRequest(Namespace namespace, Map<String, String> properties) { + this.namespace = namespace; + this.properties = properties; + validate(); + } + + CreateNamespaceRequest validate() { + ValidationException.check(namespace != null && !namespace.isEmpty(), + "Cannot build a request to create a namespace without specifying the namespace"); + return this; + } + + public static Builder builder() { + return new Builder(); + } Review comment: Moved. ########## File path: core/src/main/java/org/apache/iceberg/rest/RESTUtils.java ########## @@ -0,0 +1,50 @@ +/* + * 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; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.databind.ObjectMapper; + +public class RESTUtils { Review comment: Renamed -- 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]
