anton-vinogradov commented on code in PR #13462: URL: https://github.com/apache/ignite/pull/13462#discussion_r3784845807
########## modules/core/src/main/java/org/apache/ignite/internal/managers/communication/CommunicationMarshalling.java: ########## @@ -0,0 +1,49 @@ +/* + * 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.managers.communication; + +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.processors.cache.CacheObjectContext; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.jetbrains.annotations.Nullable; + +/** Marshalling of the communication transport. It uses the schema-aware marshaller. */ +public final class CommunicationMarshalling { + /** */ + public static <M extends Message> void marshal(M msg, GridKernalContext kctx, + @Nullable CacheObjectContext cacheObjCtx) throws IgniteCheckedException { + MessageMarshalling.marshal(msg, kctx.marshaller(), kctx, cacheObjCtx); + } + + /** */ + public static <M extends Message> void unmarshal(M msg, GridKernalContext kctx, Review Comment: Split one parameter per line. ########## modules/core/src/main/java/org/apache/ignite/internal/managers/communication/DiscoveryMarshalling.java: ########## @@ -0,0 +1,46 @@ +/* + * 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.managers.communication; + +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.processors.cache.CacheObjectContext; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.jetbrains.annotations.Nullable; + +/** + * Marshalling of the discovery transport. It uses the JDK marshaller, which asks for no type registration at all. + * <p> + * A discovery message is marshalled by a thread that has to move discovery forward itself: the ring worker writing + * it to the socket, a custom event listener marshalling inline, or a node that is not in the ring yet. The binary + * marshaller would make such a thread wait for a cluster-wide round - a class name mapping, or a new metadata + * version - and only a discovery thread delivers the answer, so the wait never ends and the ring stops with it. + * A type the cluster has already accepted marshals fine, but a message cannot rely on that. + */ +public final class DiscoveryMarshalling { + /** */ + public static <M extends Message> void marshal(M msg, GridKernalContext kctx, Review Comment: Split one parameter per line. ########## modules/core/src/main/java/org/apache/ignite/internal/managers/communication/MessageMarshalling.java: ########## @@ -52,28 +49,30 @@ public static <M extends Message> void marshal(M msg, GridKernalContext kctx, @N * * @param msgFactory Message factory to resolve the marshaller from. * @param msg Message to marshal. + * @param marsh Marshaller of the transport. * @param kctx Kernal context. * @param cacheObjCtx Cache object context of the enclosing message, or {@code null} at the top level. */ - public static <M extends Message> void marshal(IgniteMessageFactory msgFactory, M msg, GridKernalContext kctx, - @Nullable CacheObjectContext cacheObjCtx) throws IgniteCheckedException { + public static <M extends Message> void marshal(IgniteMessageFactory msgFactory, M msg, Marshaller marsh, Review Comment: Split one parameter per line. ########## modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerOrderedUnmarshalFailureTest.java: ########## @@ -242,13 +243,13 @@ private static class Serializer implements MessageSerializer<FailingUnmarshalMes /** Fails the unmarshal of the flagged messages. */ private static class FailingMarshaller implements MessageMarshaller<FailingUnmarshalMessage> { /** {@inheritDoc} */ - @Override public void marshal(FailingUnmarshalMessage msg, GridKernalContext kctx, + @Override public void marshal(FailingUnmarshalMessage msg, Marshaller marsh, GridKernalContext kctx, Review Comment: Split one parameter per line. ########## modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionMessageMarshallingTest.java: ########## @@ -67,8 +67,8 @@ public void testMessageUnmarshallWithoutCacheContext() throws Exception { @Override public void onMessage(UUID nodeId, Object msg, byte plc) { if (msg instanceof TxLocksResponse) { try { - MessageMarshalling.unmarshal((TxLocksResponse)msg, - clientCtx.kernalContext(), null, clientCtx.deploy().globalLoader()); + CommunicationMarshalling.unmarshal((TxLocksResponse)msg, clientCtx.kernalContext(), null, Review Comment: Split one parameter per line. ########## modules/core/src/main/java/org/apache/ignite/internal/managers/communication/CommunicationMarshalling.java: ########## @@ -0,0 +1,49 @@ +/* + * 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.managers.communication; + +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.processors.cache.CacheObjectContext; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.jetbrains.annotations.Nullable; + +/** Marshalling of the communication transport. It uses the schema-aware marshaller. */ +public final class CommunicationMarshalling { Review Comment: Dropped these on purpose earlier in the review: the class is final and holds static methods only, so nothing can instantiate it anyway. Happy to bring them back if you prefer them for consistency with the rest of the code. ########## modules/core/src/main/java/org/apache/ignite/internal/managers/communication/DiscoveryMarshalling.java: ########## @@ -0,0 +1,46 @@ +/* + * 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.managers.communication; + +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.processors.cache.CacheObjectContext; +import org.apache.ignite.plugin.extensions.communication.Message; +import org.jetbrains.annotations.Nullable; + +/** + * Marshalling of the discovery transport. It uses the JDK marshaller, which asks for no type registration at all. + * <p> + * A discovery message is marshalled by a thread that has to move discovery forward itself: the ring worker writing + * it to the socket, a custom event listener marshalling inline, or a node that is not in the ring yet. The binary + * marshaller would make such a thread wait for a cluster-wide round - a class name mapping, or a new metadata + * version - and only a discovery thread delivers the answer, so the wait never ends and the ring stops with it. + * A type the cluster has already accepted marshals fine, but a message cannot rely on that. + */ +public final class DiscoveryMarshalling { Review Comment: Same as in CommunicationMarshalling. -- 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]
