tpalfy commented on code in PR #11499: URL: https://github.com/apache/nifi/pull/11499#discussion_r4095886603
########## nifi-extension-bundles/nifi-confluent-platform-bundle/nifi-confluent-protobuf-message-index-writer/src/test/java/org/apache/nifi/confluent/schemaregistry/ProtobufMessageIndexEncoderTest.java: ########## @@ -0,0 +1,206 @@ +/* + * 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.nifi.confluent.schemaregistry; + +import org.apache.nifi.confluent.schema.AntlrProtobufMessageSchemaParser; +import org.apache.nifi.confluent.schema.ProtobufMessageSchema; +import org.apache.nifi.confluent.schema.VarintUtils; +import org.apache.nifi.schemaregistry.services.MessageName; +import org.apache.nifi.schemaregistry.services.StandardMessageName; +import org.apache.nifi.schemaregistry.services.StandardMessageNameFactory; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.stream.IntStream; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +/** + * This class contains no NiFi framework dependencies: it exercises {@link ProtobufMessageIndexEncoder} + * directly, without a TestRunner or any controller-service context. + */ +class ProtobufMessageIndexEncoderTest { + + // Schema without package (default package) + private static final String DEFAULT_PACKAGE_SCHEMA = """ + syntax = "proto3"; + message User { + int32 id = 1; + string name = 2; + Address address = 3; + message Profile { + string bio = 1; + Settings settings = 2; + message Settings { + bool notifications = 1; + string theme = 2; + } + } + } + message Company { + string name = 1; + Address address = 2; + } + message Address { + string street = 1; + string city = 2; + }"""; + + // Schema with explicit package + private static final String EXPLICIT_PACKAGE_SCHEMA = """ + syntax = "proto3"; + package com.example.proto; + message User { + int32 id = 1; + string name = 2; + Address address = 3; + message Profile { + string bio = 1; + Settings settings = 2; + message Settings { + bool notifications = 1; + string theme = 2; + } + } + } + message Company { + string name = 1; + Address address = 2; + } + message Address { + string street = 1; + string city = 2; + }"""; + + private static Stream<Arguments> provideMessageIndexTestCases() { + return Stream.of( + // the format is [input schema], [target message name], [expected message indexes] + Arguments.of(DEFAULT_PACKAGE_SCHEMA, new StandardMessageName(Optional.empty(), "User"), new int[] {0}), + Arguments.of(DEFAULT_PACKAGE_SCHEMA, new StandardMessageName(Optional.empty(), "Company"), new int[] {1}), + Arguments.of(DEFAULT_PACKAGE_SCHEMA, new StandardMessageName(Optional.empty(), "Address"), new int[] {2}), + Arguments.of(DEFAULT_PACKAGE_SCHEMA, new StandardMessageName(Optional.empty(), "User.Profile"), new int[] {0, 0}), + Arguments.of(DEFAULT_PACKAGE_SCHEMA, new StandardMessageName(Optional.empty(), "User.Profile.Settings"), new int[] {0, 0, 0}), + + Arguments.of(EXPLICIT_PACKAGE_SCHEMA, new StandardMessageName(Optional.of("com.example.proto"), "User"), new int[] {0}), + Arguments.of(EXPLICIT_PACKAGE_SCHEMA, new StandardMessageName(Optional.of("com.example.proto"), "Company"), new int[] {1}), + Arguments.of(EXPLICIT_PACKAGE_SCHEMA, new StandardMessageName(Optional.of("com.example.proto"), "Address"), new int[] {2}), + Arguments.of(EXPLICIT_PACKAGE_SCHEMA, new StandardMessageName(Optional.of("com.example.proto"), "User.Profile"), new int[] {0, 0}), + Arguments.of(EXPLICIT_PACKAGE_SCHEMA, new StandardMessageName(Optional.of("com.example.proto"), "User.Profile.Settings"), new int[] {0, 0, 0}) + ); Review Comment: ```suggestion , Arguments.of(NON_ZERO_NESTED_INDEX_SCHEMA, new StandardMessageName(Optional.of("com.example.nested"), "Root.ChildTwo.GrandchildThree"), new int[] {1, 2, 3}) ) ``` ########## nifi-extension-bundles/nifi-confluent-platform-bundle/nifi-confluent-protobuf-message-index-writer/src/test/java/org/apache/nifi/confluent/schemaregistry/ProtobufMessageIndexEncoderTest.java: ########## @@ -0,0 +1,206 @@ +/* + * 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.nifi.confluent.schemaregistry; + +import org.apache.nifi.confluent.schema.AntlrProtobufMessageSchemaParser; +import org.apache.nifi.confluent.schema.ProtobufMessageSchema; +import org.apache.nifi.confluent.schema.VarintUtils; +import org.apache.nifi.schemaregistry.services.MessageName; +import org.apache.nifi.schemaregistry.services.StandardMessageName; +import org.apache.nifi.schemaregistry.services.StandardMessageNameFactory; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.stream.IntStream; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +/** + * This class contains no NiFi framework dependencies: it exercises {@link ProtobufMessageIndexEncoder} + * directly, without a TestRunner or any controller-service context. + */ +class ProtobufMessageIndexEncoderTest { + + // Schema without package (default package) + private static final String DEFAULT_PACKAGE_SCHEMA = """ + syntax = "proto3"; + message User { + int32 id = 1; + string name = 2; + Address address = 3; + message Profile { + string bio = 1; + Settings settings = 2; + message Settings { + bool notifications = 1; + string theme = 2; + } + } + } + message Company { + string name = 1; + Address address = 2; + } + message Address { + string street = 1; + string city = 2; + }"""; + + // Schema with explicit package + private static final String EXPLICIT_PACKAGE_SCHEMA = """ + syntax = "proto3"; + package com.example.proto; + message User { + int32 id = 1; + string name = 2; + Address address = 3; + message Profile { + string bio = 1; + Settings settings = 2; + message Settings { + bool notifications = 1; + string theme = 2; + } + } + } + message Company { + string name = 1; + Address address = 2; + } + message Address { + string street = 1; + string city = 2; + }"""; + Review Comment: All nested indexes are zeros. We can add another test to cover a bit more complex case. ```suggestion private static final String NON_ZERO_NESTED_INDEX_SCHEMA = """ syntax = "proto3"; package com.example.nested; message Unused {} message Root { message ChildZero {} message ChildOne {} message ChildTwo { message GrandchildZero {} message GrandchildOne {} message GrandchildTwo {} message GrandchildThree {} } }"""; ``` -- 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]
