stevenzwu commented on code in PR #16160: URL: https://github.com/apache/iceberg/pull/16160#discussion_r3314500354
########## core/src/main/java/org/apache/iceberg/catalog/CatalogObjectIdentifierParser.java: ########## @@ -0,0 +1,75 @@ +/* + * 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.catalog; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonNode; +import java.io.IOException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.util.JsonUtil; + +/** + * Parses {@link CatalogObjectIdentifier} from its JSON representation used by the REST catalog. + * + * <p>{@code CatalogObjectIdentifier.of("accounting", "tax", "paid")} serializes to {@code + * ["accounting", "tax", "paid"]}. + */ +public class CatalogObjectIdentifierParser { + + private CatalogObjectIdentifierParser() {} + + public static String toJson(CatalogObjectIdentifier identifier) { + return toJson(identifier, false); + } + + public static String toJson(CatalogObjectIdentifier identifier, boolean pretty) { + return JsonUtil.generate(gen -> toJson(identifier, gen), pretty); + } + + public static void toJson(CatalogObjectIdentifier identifier, JsonGenerator generator) + throws IOException { + Preconditions.checkArgument(null != identifier, "Invalid catalog object identifier: null"); + generator.writeArray(identifier.levels(), 0, identifier.length()); + } + + public static CatalogObjectIdentifier fromJson(String json) { + Preconditions.checkArgument( + json != null, "Cannot parse catalog object identifier from invalid JSON: null"); + Preconditions.checkArgument( + !json.isEmpty(), "Cannot parse catalog object identifier from invalid JSON: ''"); + return JsonUtil.parse(json, CatalogObjectIdentifierParser::fromJson); + } + + public static CatalogObjectIdentifier fromJson(JsonNode node) { + Preconditions.checkArgument( + node != null && !node.isNull() && node.isArray(), + "Cannot parse missing or non-array catalog object identifier: %s", + node); + String[] levels = new String[node.size()]; + for (int i = 0; i < node.size(); i++) { + JsonNode element = node.get(i); + Preconditions.checkArgument( + element.isTextual(), Review Comment: Follow-up: [#16586](https://github.com/apache/iceberg/pull/16586) adds the equivalent `isTextual` validation inside `JsonUtil.getStringArray` (already used by `RESTSerializers.NamespaceDeserializer`). This manual loop will be reverted to `JsonUtil.getStringArray(node)` once that PR merges. ########## api/src/main/java/org/apache/iceberg/catalog/CatalogObjectIdentifier.java: ########## @@ -0,0 +1,98 @@ +/* + * 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.catalog; + +import java.util.Arrays; +import java.util.function.Predicate; +import java.util.regex.Pattern; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; + +/** + * A reference to a catalog object as an ordered list of hierarchical levels (for example, a table, + * view, or namespace). The kind of object is determined by context — the endpoint or a companion + * type discriminator — not by the identifier structure alone. + * + * <p>Mirrors {@link Namespace} structurally; the distinct name signals "any object within a + * catalog" and avoids confusion with a future top-level catalog name. + */ +public class CatalogObjectIdentifier { + private static final Joiner DOT = Joiner.on('.'); + private static final Predicate<String> CONTAINS_NULL_CHARACTER = + Pattern.compile("\u0000", Pattern.UNICODE_CHARACTER_CLASS).asPredicate(); + + public static CatalogObjectIdentifier of(String... levels) { + Preconditions.checkArgument( + null != levels, "Cannot create catalog object identifier from null array"); + Preconditions.checkArgument( + levels.length > 0, "Cannot create catalog object identifier with no levels"); Review Comment: Follow-up: [#16587](https://github.com/apache/iceberg/pull/16587) adds `minItems: 1` to the OpenAPI schema to match this check. An identifier with zero levels references no object, so it has no meaningful interpretation — unlike `Namespace`, where the empty array is the catalog root. -- 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]
