anton-vinogradov commented on code in PR #13461: URL: https://github.com/apache/ignite/pull/13461#discussion_r3759075896
########## modules/core/src/test/resources/codegen/MarshalledOnMessageCollection2.java: ########## @@ -0,0 +1,32 @@ +/* + * 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.ignite.internal; + +import java.util.Collection; +import org.apache.ignite.plugin.extensions.communication.Message; + +/** */ +public class MarshalledOnMessageCollection2 implements Message { + /** */ + @Marshalled("msgBytes") + Collection<TestMessage> msgColl; Review Comment: Should we check wildcards as well, like Collection<? extends TestMessage>? ########## modules/core/src/test/resources/codegen/MarshalledOnMessageArray.java: ########## @@ -0,0 +1,31 @@ +/* + * 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.ignite.internal; + +import org.apache.ignite.plugin.extensions.communication.Message; + +/** */ +public class MarshalledOnMessageArray implements Message { Review Comment: Let's call such messages as IncorrectXXX ########## modules/codegen/src/main/java/org/apache/ignite/internal/MessageMarshallerGenerator.java: ########## @@ -1156,18 +1156,78 @@ private enum MarshalledKind { return null; } + MarshalledKind res; + if (map) - return MarshalledKind.MAP; + res = MarshalledKind.MAP; + else { + TypeMirror wire = requireEnclosed(enclosed, ann.value(), "@Marshalled").asType(); + + if (wire.getKind() == TypeKind.ARRAY) { + res = ((ArrayType)wire).getComponentType().getKind() == TypeKind.BYTE + ? MarshalledKind.BLOB + : MarshalledKind.ELEMENTS; + } + else + res = MarshalledKind.ELEMENT_BLOBS; + } + + /* + * Ensures that field annotated with {@link Marshalled} doesn't perform {@code Message} -> {@code byte[]} transformation + * which escapes {@link Order} and other rules implemented on top of communication {@code MessageWriter, MessageReader} logic. + */ + if (foundMessageToBytesTransformation(field.asType(), field, ann)) { + env.getMessager().printMessage(Diagnostic.Kind.ERROR, + "Message must be written by dedicated message serializers. " + + "Remove @" + Marshalled.class.getSimpleName() + " annotation and remove companion field.", field); Review Comment: And set an @Order annotation? -- 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]
