diff --git a/build.gradle b/build.gradle
index b138424a53..652b22c29d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,6 +23,7 @@ plugins {
     id 'org.antora' version '1.0.0'
     id 'io.spring.antora.generate-antora-yml' version '0.0.1'
     id 'com.github.spotbugs' version '6.0.8'
+    id 'com.google.protobuf' version '0.9.4' apply false
 }
 
 if (isCI) {
@@ -75,7 +76,7 @@ ext {
     hibernateVersion = '6.4.4.Final'
     hsqldbVersion = '2.7.2'
     h2Version = '2.2.224'
-    jacksonVersion = '2.16.2'
+    jacksonVersion = '2.17.0'
     jaxbVersion = '4.0.5'
     jcifsVersion = '2.1.37'
     jeroMqVersion = '0.6.0'
@@ -99,7 +100,7 @@ ext {
     oracleVersion = '23.3.0.23.09'
     pahoMqttClientVersion = '1.2.5'
     postgresVersion = '42.7.3'
-    protobufVersion = '3.25.3'
+    protobufVersion = '4.26.0'
     r2dbch2Version = '1.0.0.RELEASE'
     reactorVersion = '2023.0.4'
     resilience4jVersion = '2.2.0'
@@ -500,6 +501,7 @@ project('spring-integration-core') {
     description = 'Spring Integration Core'
 
     apply plugin: 'org.jetbrains.dokka'
+    apply plugin: 'com.google.protobuf'
 
     dependencies {
         api 'org.springframework:spring-aop'
@@ -559,6 +561,13 @@ project('spring-integration-core') {
             }
         }
     }
+
+    protobuf {
+        protoc {
+            artifact = "com.google.protobuf:protoc:$protobufVersion"
+        }
+    }
+
 }
 
 project('spring-integration-debezium') {
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonMessageParser.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonMessageParser.java
index cb6496fa98..79fb9aff0e 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonMessageParser.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonMessageParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ import org.springframework.util.Assert;
 /**
  * {@link JsonInboundMessageMapper.JsonMessageParser} implementation that parses JSON messages
  * and builds a {@link Message} with the specified payload type from provided {@link JsonInboundMessageMapper}.
- * Uses Jackson 2 JSON-processor (@link https://github.com/FasterXML).
+ * Uses <a href="https://github.com/FasterXML">Jackson JSON Processor</a>.
  *
  * @author Artem Bilan
  * @author Gary Russell
@@ -71,16 +71,17 @@ public class Jackson2JsonMessageParser extends AbstractJacksonJsonMessageParser<
 			Object payload = null;
 			while (JsonToken.END_OBJECT != parser.nextToken()) {
 				Assert.isTrue(JsonToken.FIELD_NAME == parser.getCurrentToken(), error);
-				boolean isHeadersToken = "headers".equals(parser.getCurrentName());
-				boolean isPayloadToken = "payload".equals(parser.getCurrentName());
+				String currentName = parser.currentName();
+				boolean isHeadersToken = "headers".equals(currentName);
+				boolean isPayloadToken = "payload".equals(currentName);
 				Assert.isTrue(isHeadersToken || isPayloadToken, error);
 				if (isHeadersToken) {
 					Assert.isTrue(parser.nextToken() == JsonToken.START_OBJECT, error);
 					headers = readHeaders(parser, jsonMessage);
 				}
-				else if (isPayloadToken) {
+				else {
 					parser.nextToken();
-					payload = this.readPayload(parser, jsonMessage);
+					payload = readPayload(parser, jsonMessage);
 				}
 			}
 			Assert.notNull(headers, error);
@@ -99,9 +100,9 @@ public class Jackson2JsonMessageParser extends AbstractJacksonJsonMessageParser<
 	private Map<String, Object> readHeaders(JsonParser parser, String jsonMessage) throws IOException {
 		Map<String, Object> headers = new LinkedHashMap<>();
 		while (JsonToken.END_OBJECT != parser.nextToken()) {
-			String headerName = parser.getCurrentName();
+			String headerName = parser.currentName();
 			parser.nextToken();
-			Object headerValue = this.readHeader(parser, headerName, jsonMessage);
+			Object headerValue = readHeader(parser, headerName, jsonMessage);
 			headers.put(headerName, headerValue);
 		}
 		return headers;
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonOutboundMessageMapperTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonOutboundMessageMapperTests.java
index 91c11b1857..bd362ce633 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonOutboundMessageMapperTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonOutboundMessageMapperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.integration.history.MessageHistory;
 import org.springframework.integration.support.MessageBuilder;
@@ -35,6 +35,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Jeremy Grelle
  * @author Gary Russell
+ * @author Artem Bilan
+ *
  * @since 2.0
  */
 public class JsonOutboundMessageMapperTests {
@@ -45,39 +47,39 @@ public class JsonOutboundMessageMapperTests {
 
 
 	@Test
-	public void testFromMessageWithHeadersAndStringPayload() throws Exception {
+	public void testFromMessageWithHeadersAndStringPayload() {
 		Message<String> testMessage = MessageBuilder.withPayload("myPayloadStuff").build();
 		JsonOutboundMessageMapper mapper = new JsonOutboundMessageMapper();
 		String result = mapper.fromMessage(testMessage);
-		assertThat(result.contains("\"headers\":{")).isTrue();
-		assertThat(result.contains("\"timestamp\":" + testMessage.getHeaders().getTimestamp())).isTrue();
-		assertThat(result.contains("\"id\":\"" + testMessage.getHeaders().getId() + "\"")).isTrue();
-		assertThat(result.contains("\"payload\":\"myPayloadStuff\"")).isTrue();
+		assertThat(result).contains("\"headers\":{");
+		assertThat(result).contains("\"timestamp\":" + testMessage.getHeaders().getTimestamp());
+		assertThat(result).contains("\"id\":\"" + testMessage.getHeaders().getId() + "\"");
+		assertThat(result).contains("\"payload\":\"myPayloadStuff\"");
 	}
 
 	@Test
-	public void testFromMessageWithMessageHistory() throws Exception {
+	public void testFromMessageWithMessageHistory() {
 		Message<String> testMessage = MessageBuilder.withPayload("myPayloadStuff").build();
 		testMessage = MessageHistory.write(testMessage, new TestNamedComponent(1));
 		testMessage = MessageHistory.write(testMessage, new TestNamedComponent(2));
 		testMessage = MessageHistory.write(testMessage, new TestNamedComponent(3));
 		JsonOutboundMessageMapper mapper = new JsonOutboundMessageMapper();
 		String result = mapper.fromMessage(testMessage);
-		assertThat(result.contains("\"headers\":{")).isTrue();
-		assertThat(result.contains("\"timestamp\":" + testMessage.getHeaders().getTimestamp())).isTrue();
-		assertThat(result.contains("\"id\":\"" + testMessage.getHeaders().getId() + "\"")).isTrue();
-		assertThat(result.contains("\"payload\":\"myPayloadStuff\"")).isTrue();
-		assertThat(result.contains("\"history\":")).isTrue();
-		assertThat(result.contains("testName-1")).isTrue();
-		assertThat(result.contains("testType-1")).isTrue();
-		assertThat(result.contains("testName-2")).isTrue();
-		assertThat(result.contains("testType-2")).isTrue();
-		assertThat(result.contains("testName-3")).isTrue();
-		assertThat(result.contains("testType-3")).isTrue();
+		assertThat(result).contains("\"headers\":{");
+		assertThat(result).contains("\"timestamp\":" + testMessage.getHeaders().getTimestamp());
+		assertThat(result).contains("\"id\":\"" + testMessage.getHeaders().getId() + "\"");
+		assertThat(result).contains("\"payload\":\"myPayloadStuff\"");
+		assertThat(result).contains("\"history\":");
+		assertThat(result).contains("testName-1");
+		assertThat(result).contains("testType-1");
+		assertThat(result).contains("testName-2");
+		assertThat(result).contains("testType-2");
+		assertThat(result).contains("testName-3");
+		assertThat(result).contains("testType-3");
 	}
 
 	@Test
-	public void testFromMessageExtractStringPayload() throws Exception {
+	public void testFromMessageExtractStringPayload() {
 		Message<String> testMessage = MessageBuilder.withPayload("myPayloadStuff").build();
 		String expected = "\"myPayloadStuff\"";
 		JsonOutboundMessageMapper mapper = new JsonOutboundMessageMapper();
@@ -92,9 +94,9 @@ public class JsonOutboundMessageMapperTests {
 		Message<TestBean> testMessage = MessageBuilder.withPayload(payload).build();
 		JsonOutboundMessageMapper mapper = new JsonOutboundMessageMapper();
 		String result = mapper.fromMessage(testMessage);
-		assertThat(result.contains("\"headers\":{")).isTrue();
-		assertThat(result.contains("\"timestamp\":" + testMessage.getHeaders().getTimestamp())).isTrue();
-		assertThat(result.contains("\"id\":\"" + testMessage.getHeaders().getId() + "\"")).isTrue();
+		assertThat(result).contains("\"headers\":{");
+		assertThat(result).contains("\"timestamp\":" + testMessage.getHeaders().getTimestamp());
+		assertThat(result).contains("\"id\":\"" + testMessage.getHeaders().getId() + "\"");
 		TestBean parsedPayload = extractJsonPayloadToTestBean(result);
 		assertThat(parsedPayload).isEqualTo(payload);
 	}
@@ -106,7 +108,7 @@ public class JsonOutboundMessageMapperTests {
 		JsonOutboundMessageMapper mapper = new JsonOutboundMessageMapper();
 		mapper.setShouldExtractPayload(true);
 		String result = mapper.fromMessage(testMessage);
-		assertThat(!result.contains("headers")).isTrue();
+		assertThat(result).doesNotContain("headers");
 		TestBean parsedPayload = objectMapper.readValue(result, TestBean.class);
 		assertThat(parsedPayload).isEqualTo(payload);
 	}
@@ -115,19 +117,13 @@ public class JsonOutboundMessageMapperTests {
 		JsonParser parser = jsonFactory.createParser(json);
 		do {
 			parser.nextToken();
-		} while (parser.getCurrentToken() != JsonToken.FIELD_NAME || !parser.getCurrentName().equals("payload"));
+		} while (parser.getCurrentToken() != JsonToken.FIELD_NAME || !parser.currentName().equals("payload"));
 		parser.nextToken();
 		return objectMapper.readValue(parser, TestBean.class);
 	}
 
 
-	private static class TestNamedComponent implements NamedComponent {
-
-		private final int id;
-
-		TestNamedComponent(int id) {
-			this.id = id;
-		}
+	private record TestNamedComponent(int id) implements NamedComponent {
 
 		@Override
 		public String getComponentName() {
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/proto/TestClass1.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/proto/TestClass1.java
deleted file mode 100644
index 576fdda262..0000000000
--- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/proto/TestClass1.java
+++ /dev/null
@@ -1,670 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: ProtoTest.proto
-
-package org.springframework.integration.transformer.proto;
-
-/**
- * Protobuf type {@code tutorial.TestClass1}
- */
-public  final class TestClass1 extends
-		com.google.protobuf.GeneratedMessageV3 implements
-		// @@protoc_insertion_point(message_implements:tutorial.TestClass1)
-		TestClass1OrBuilder {
-private static final long serialVersionUID = 0L;
-	// Use TestClass1.newBuilder() to construct.
-	private TestClass1(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-		super(builder);
-	}
-	private TestClass1() {
-		bar_ = "";
-	}
-
-	@java.lang.Override
-	@SuppressWarnings({"unused"})
-	protected java.lang.Object newInstance(
-			UnusedPrivateParameter unused) {
-		return new TestClass1();
-	}
-
-	@java.lang.Override
-	public final com.google.protobuf.UnknownFieldSet
-	getUnknownFields() {
-		return this.unknownFields;
-	}
-	private TestClass1(
-			com.google.protobuf.CodedInputStream input,
-			com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-			throws com.google.protobuf.InvalidProtocolBufferException {
-		this();
-		if (extensionRegistry == null) {
-			throw new java.lang.NullPointerException();
-		}
-		int mutable_bitField0_ = 0;
-		com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-				com.google.protobuf.UnknownFieldSet.newBuilder();
-		try {
-			boolean done = false;
-			while (!done) {
-				int tag = input.readTag();
-				switch (tag) {
-					case 0:
-						done = true;
-						break;
-					case 10: {
-						com.google.protobuf.ByteString bs = input.readBytes();
-						bitField0_ |= 0x00000001;
-						bar_ = bs;
-						break;
-					}
-					case 16: {
-						bitField0_ |= 0x00000002;
-						qux_ = input.readInt32();
-						break;
-					}
-					default: {
-						if (!parseUnknownField(
-								input, unknownFields, extensionRegistry, tag)) {
-							done = true;
-						}
-						break;
-					}
-				}
-			}
-		} catch (com.google.protobuf.InvalidProtocolBufferException e) {
-			throw e.setUnfinishedMessage(this);
-		} catch (java.io.IOException e) {
-			throw new com.google.protobuf.InvalidProtocolBufferException(
-					e).setUnfinishedMessage(this);
-		} finally {
-			this.unknownFields = unknownFields.build();
-			makeExtensionsImmutable();
-		}
-	}
-	public static final com.google.protobuf.Descriptors.Descriptor
-			getDescriptor() {
-		return org.springframework.integration.transformer.proto.TestProtos.internal_static_tutorial_TestClass1_descriptor;
-	}
-
-	@java.lang.Override
-	protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-			internalGetFieldAccessorTable() {
-		return org.springframework.integration.transformer.proto.TestProtos.internal_static_tutorial_TestClass1_fieldAccessorTable
-				.ensureFieldAccessorsInitialized(
-						org.springframework.integration.transformer.proto.TestClass1.class, org.springframework.integration.transformer.proto.TestClass1.Builder.class);
-	}
-
-	private int bitField0_;
-	public static final int BAR_FIELD_NUMBER = 1;
-	private volatile java.lang.Object bar_;
-	/**
-	 * <code>optional string bar = 1;</code>
-	 * @return Whether the bar field is set.
-	 */
-	public boolean hasBar() {
-		return ((bitField0_ & 0x00000001) != 0);
-	}
-	/**
-	 * <code>optional string bar = 1;</code>
-	 * @return The bar.
-	 */
-	public java.lang.String getBar() {
-		java.lang.Object ref = bar_;
-		if (ref instanceof java.lang.String) {
-			return (java.lang.String) ref;
-		} else {
-			com.google.protobuf.ByteString bs =
-					(com.google.protobuf.ByteString) ref;
-			java.lang.String s = bs.toStringUtf8();
-			if (bs.isValidUtf8()) {
-				bar_ = s;
-			}
-			return s;
-		}
-	}
-	/**
-	 * <code>optional string bar = 1;</code>
-	 * @return The bytes for bar.
-	 */
-	public com.google.protobuf.ByteString
-			getBarBytes() {
-		java.lang.Object ref = bar_;
-		if (ref instanceof java.lang.String) {
-			com.google.protobuf.ByteString b =
-					com.google.protobuf.ByteString.copyFromUtf8(
-							(java.lang.String) ref);
-			bar_ = b;
-			return b;
-		} else {
-			return (com.google.protobuf.ByteString) ref;
-		}
-	}
-
-	public static final int QUX_FIELD_NUMBER = 2;
-	private int qux_;
-	/**
-	 * <code>optional int32 qux = 2;</code>
-	 * @return Whether the qux field is set.
-	 */
-	public boolean hasQux() {
-		return ((bitField0_ & 0x00000002) != 0);
-	}
-	/**
-	 * <code>optional int32 qux = 2;</code>
-	 * @return The qux.
-	 */
-	public int getQux() {
-		return qux_;
-	}
-
-	private byte memoizedIsInitialized = -1;
-	@java.lang.Override
-	public final boolean isInitialized() {
-		byte isInitialized = memoizedIsInitialized;
-		if (isInitialized == 1) return true;
-		if (isInitialized == 0) return false;
-
-		memoizedIsInitialized = 1;
-		return true;
-	}
-
-	@java.lang.Override
-	public void writeTo(com.google.protobuf.CodedOutputStream output)
-											throws java.io.IOException {
-		if (((bitField0_ & 0x00000001) != 0)) {
-			com.google.protobuf.GeneratedMessageV3.writeString(output, 1, bar_);
-		}
-		if (((bitField0_ & 0x00000002) != 0)) {
-			output.writeInt32(2, qux_);
-		}
-		unknownFields.writeTo(output);
-	}
-
-	@java.lang.Override
-	public int getSerializedSize() {
-		int size = memoizedSize;
-		if (size != -1) return size;
-
-		size = 0;
-		if (((bitField0_ & 0x00000001) != 0)) {
-			size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, bar_);
-		}
-		if (((bitField0_ & 0x00000002) != 0)) {
-			size += com.google.protobuf.CodedOutputStream
-				.computeInt32Size(2, qux_);
-		}
-		size += unknownFields.getSerializedSize();
-		memoizedSize = size;
-		return size;
-	}
-
-	@java.lang.Override
-	public boolean equals(final java.lang.Object obj) {
-		if (obj == this) {
-		 return true;
-		}
-		if (!(obj instanceof org.springframework.integration.transformer.proto.TestClass1)) {
-			return super.equals(obj);
-		}
-		org.springframework.integration.transformer.proto.TestClass1 other = (org.springframework.integration.transformer.proto.TestClass1) obj;
-
-		if (hasBar() != other.hasBar()) return false;
-		if (hasBar()) {
-			if (!getBar()
-					.equals(other.getBar())) return false;
-		}
-		if (hasQux() != other.hasQux()) return false;
-		if (hasQux()) {
-			if (getQux()
-					!= other.getQux()) return false;
-		}
-		if (!unknownFields.equals(other.unknownFields)) return false;
-		return true;
-	}
-
-	@java.lang.Override
-	public int hashCode() {
-		if (memoizedHashCode != 0) {
-			return memoizedHashCode;
-		}
-		int hash = 41;
-		hash = (19 * hash) + getDescriptor().hashCode();
-		if (hasBar()) {
-			hash = (37 * hash) + BAR_FIELD_NUMBER;
-			hash = (53 * hash) + getBar().hashCode();
-		}
-		if (hasQux()) {
-			hash = (37 * hash) + QUX_FIELD_NUMBER;
-			hash = (53 * hash) + getQux();
-		}
-		hash = (29 * hash) + unknownFields.hashCode();
-		memoizedHashCode = hash;
-		return hash;
-	}
-
-	public static org.springframework.integration.transformer.proto.TestClass1 parseFrom(
-			java.nio.ByteBuffer data)
-			throws com.google.protobuf.InvalidProtocolBufferException {
-		return PARSER.parseFrom(data);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass1 parseFrom(
-			java.nio.ByteBuffer data,
-			com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-			throws com.google.protobuf.InvalidProtocolBufferException {
-		return PARSER.parseFrom(data, extensionRegistry);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass1 parseFrom(
-			com.google.protobuf.ByteString data)
-			throws com.google.protobuf.InvalidProtocolBufferException {
-		return PARSER.parseFrom(data);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass1 parseFrom(
-			com.google.protobuf.ByteString data,
-			com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-			throws com.google.protobuf.InvalidProtocolBufferException {
-		return PARSER.parseFrom(data, extensionRegistry);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass1 parseFrom(byte[] data)
-			throws com.google.protobuf.InvalidProtocolBufferException {
-		return PARSER.parseFrom(data);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass1 parseFrom(
-			byte[] data,
-			com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-			throws com.google.protobuf.InvalidProtocolBufferException {
-		return PARSER.parseFrom(data, extensionRegistry);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass1 parseFrom(java.io.InputStream input)
-			throws java.io.IOException {
-		return com.google.protobuf.GeneratedMessageV3
-				.parseWithIOException(PARSER, input);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass1 parseFrom(
-			java.io.InputStream input,
-			com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-			throws java.io.IOException {
-		return com.google.protobuf.GeneratedMessageV3
-				.parseWithIOException(PARSER, input, extensionRegistry);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass1 parseDelimitedFrom(java.io.InputStream input)
-			throws java.io.IOException {
-		return com.google.protobuf.GeneratedMessageV3
-				.parseDelimitedWithIOException(PARSER, input);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass1 parseDelimitedFrom(
-			java.io.InputStream input,
-			com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-			throws java.io.IOException {
-		return com.google.protobuf.GeneratedMessageV3
-				.parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass1 parseFrom(
-			com.google.protobuf.CodedInputStream input)
-			throws java.io.IOException {
-		return com.google.protobuf.GeneratedMessageV3
-				.parseWithIOException(PARSER, input);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass1 parseFrom(
-			com.google.protobuf.CodedInputStream input,
-			com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-			throws java.io.IOException {
-		return com.google.protobuf.GeneratedMessageV3
-				.parseWithIOException(PARSER, input, extensionRegistry);
-	}
-
-	@java.lang.Override
-	public Builder newBuilderForType() { return newBuilder(); }
-	public static Builder newBuilder() {
-		return DEFAULT_INSTANCE.toBuilder();
-	}
-	public static Builder newBuilder(org.springframework.integration.transformer.proto.TestClass1 prototype) {
-		return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-	}
-	@java.lang.Override
-	public Builder toBuilder() {
-		return this == DEFAULT_INSTANCE
-				? new Builder() : new Builder().mergeFrom(this);
-	}
-
-	@java.lang.Override
-	protected Builder newBuilderForType(
-			com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-		Builder builder = new Builder(parent);
-		return builder;
-	}
-	/**
-	 * Protobuf type {@code tutorial.TestClass1}
-	 */
-	public static final class Builder extends
-			com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-			// @@protoc_insertion_point(builder_implements:tutorial.TestClass1)
-			org.springframework.integration.transformer.proto.TestClass1OrBuilder {
-		public static final com.google.protobuf.Descriptors.Descriptor
-				getDescriptor() {
-			return org.springframework.integration.transformer.proto.TestProtos.internal_static_tutorial_TestClass1_descriptor;
-		}
-
-		@java.lang.Override
-		protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-				internalGetFieldAccessorTable() {
-			return org.springframework.integration.transformer.proto.TestProtos.internal_static_tutorial_TestClass1_fieldAccessorTable
-					.ensureFieldAccessorsInitialized(
-							org.springframework.integration.transformer.proto.TestClass1.class, org.springframework.integration.transformer.proto.TestClass1.Builder.class);
-		}
-
-		// Construct using org.springframework.integration.transformer.proto.TestClass1.newBuilder()
-		private Builder() {
-			maybeForceBuilderInitialization();
-		}
-
-		private Builder(
-				com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-			super(parent);
-			maybeForceBuilderInitialization();
-		}
-		private void maybeForceBuilderInitialization() {
-			if (com.google.protobuf.GeneratedMessageV3
-							.alwaysUseFieldBuilders) {
-			}
-		}
-		@java.lang.Override
-		public Builder clear() {
-			super.clear();
-			bar_ = "";
-			bitField0_ = (bitField0_ & ~0x00000001);
-			qux_ = 0;
-			bitField0_ = (bitField0_ & ~0x00000002);
-			return this;
-		}
-
-		@java.lang.Override
-		public com.google.protobuf.Descriptors.Descriptor
-				getDescriptorForType() {
-			return org.springframework.integration.transformer.proto.TestProtos.internal_static_tutorial_TestClass1_descriptor;
-		}
-
-		@java.lang.Override
-		public org.springframework.integration.transformer.proto.TestClass1 getDefaultInstanceForType() {
-			return org.springframework.integration.transformer.proto.TestClass1.getDefaultInstance();
-		}
-
-		@java.lang.Override
-		public org.springframework.integration.transformer.proto.TestClass1 build() {
-			org.springframework.integration.transformer.proto.TestClass1 result = buildPartial();
-			if (!result.isInitialized()) {
-				throw newUninitializedMessageException(result);
-			}
-			return result;
-		}
-
-		@java.lang.Override
-		public org.springframework.integration.transformer.proto.TestClass1 buildPartial() {
-			org.springframework.integration.transformer.proto.TestClass1 result = new org.springframework.integration.transformer.proto.TestClass1(this);
-			int from_bitField0_ = bitField0_;
-			int to_bitField0_ = 0;
-			if (((from_bitField0_ & 0x00000001) != 0)) {
-				to_bitField0_ |= 0x00000001;
-			}
-			result.bar_ = bar_;
-			if (((from_bitField0_ & 0x00000002) != 0)) {
-				result.qux_ = qux_;
-				to_bitField0_ |= 0x00000002;
-			}
-			result.bitField0_ = to_bitField0_;
-			onBuilt();
-			return result;
-		}
-
-		@java.lang.Override
-		public Builder clone() {
-			return super.clone();
-		}
-		@java.lang.Override
-		public Builder setField(
-				com.google.protobuf.Descriptors.FieldDescriptor field,
-				java.lang.Object value) {
-			return super.setField(field, value);
-		}
-		@java.lang.Override
-		public Builder clearField(
-				com.google.protobuf.Descriptors.FieldDescriptor field) {
-			return super.clearField(field);
-		}
-		@java.lang.Override
-		public Builder clearOneof(
-				com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-			return super.clearOneof(oneof);
-		}
-		@java.lang.Override
-		public Builder setRepeatedField(
-				com.google.protobuf.Descriptors.FieldDescriptor field,
-				int index, java.lang.Object value) {
-			return super.setRepeatedField(field, index, value);
-		}
-		@java.lang.Override
-		public Builder addRepeatedField(
-				com.google.protobuf.Descriptors.FieldDescriptor field,
-				java.lang.Object value) {
-			return super.addRepeatedField(field, value);
-		}
-		@java.lang.Override
-		public Builder mergeFrom(com.google.protobuf.Message other) {
-			if (other instanceof org.springframework.integration.transformer.proto.TestClass1) {
-				return mergeFrom((org.springframework.integration.transformer.proto.TestClass1)other);
-			} else {
-				super.mergeFrom(other);
-				return this;
-			}
-		}
-
-		public Builder mergeFrom(org.springframework.integration.transformer.proto.TestClass1 other) {
-			if (other == org.springframework.integration.transformer.proto.TestClass1.getDefaultInstance()) return this;
-			if (other.hasBar()) {
-				bitField0_ |= 0x00000001;
-				bar_ = other.bar_;
-				onChanged();
-			}
-			if (other.hasQux()) {
-				setQux(other.getQux());
-			}
-			this.mergeUnknownFields(other.unknownFields);
-			onChanged();
-			return this;
-		}
-
-		@java.lang.Override
-		public final boolean isInitialized() {
-			return true;
-		}
-
-		@java.lang.Override
-		public Builder mergeFrom(
-				com.google.protobuf.CodedInputStream input,
-				com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-				throws java.io.IOException {
-			org.springframework.integration.transformer.proto.TestClass1 parsedMessage = null;
-			try {
-				parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-			} catch (com.google.protobuf.InvalidProtocolBufferException e) {
-				parsedMessage = (org.springframework.integration.transformer.proto.TestClass1) e.getUnfinishedMessage();
-				throw e.unwrapIOException();
-			} finally {
-				if (parsedMessage != null) {
-					mergeFrom(parsedMessage);
-				}
-			}
-			return this;
-		}
-		private int bitField0_;
-
-		private java.lang.Object bar_ = "";
-		/**
-		 * <code>optional string bar = 1;</code>
-		 * @return Whether the bar field is set.
-		 */
-		public boolean hasBar() {
-			return ((bitField0_ & 0x00000001) != 0);
-		}
-		/**
-		 * <code>optional string bar = 1;</code>
-		 * @return The bar.
-		 */
-		public java.lang.String getBar() {
-			java.lang.Object ref = bar_;
-			if (!(ref instanceof java.lang.String)) {
-				com.google.protobuf.ByteString bs =
-						(com.google.protobuf.ByteString) ref;
-				java.lang.String s = bs.toStringUtf8();
-				if (bs.isValidUtf8()) {
-					bar_ = s;
-				}
-				return s;
-			} else {
-				return (java.lang.String) ref;
-			}
-		}
-		/**
-		 * <code>optional string bar = 1;</code>
-		 * @return The bytes for bar.
-		 */
-		public com.google.protobuf.ByteString
-				getBarBytes() {
-			java.lang.Object ref = bar_;
-			if (ref instanceof String) {
-				com.google.protobuf.ByteString b =
-						com.google.protobuf.ByteString.copyFromUtf8(
-								(java.lang.String) ref);
-				bar_ = b;
-				return b;
-			} else {
-				return (com.google.protobuf.ByteString) ref;
-			}
-		}
-		/**
-		 * <code>optional string bar = 1;</code>
-		 * @param value The bar to set.
-		 * @return This builder for chaining.
-		 */
-		public Builder setBar(
-				java.lang.String value) {
-			if (value == null) {
-		throw new NullPointerException();
-	}
-	bitField0_ |= 0x00000001;
-			bar_ = value;
-			onChanged();
-			return this;
-		}
-		/**
-		 * <code>optional string bar = 1;</code>
-		 * @return This builder for chaining.
-		 */
-		public Builder clearBar() {
-			bitField0_ = (bitField0_ & ~0x00000001);
-			bar_ = getDefaultInstance().getBar();
-			onChanged();
-			return this;
-		}
-		/**
-		 * <code>optional string bar = 1;</code>
-		 * @param value The bytes for bar to set.
-		 * @return This builder for chaining.
-		 */
-		public Builder setBarBytes(
-				com.google.protobuf.ByteString value) {
-			if (value == null) {
-		throw new NullPointerException();
-	}
-	bitField0_ |= 0x00000001;
-			bar_ = value;
-			onChanged();
-			return this;
-		}
-
-		private int qux_ ;
-		/**
-		 * <code>optional int32 qux = 2;</code>
-		 * @return Whether the qux field is set.
-		 */
-		public boolean hasQux() {
-			return ((bitField0_ & 0x00000002) != 0);
-		}
-		/**
-		 * <code>optional int32 qux = 2;</code>
-		 * @return The qux.
-		 */
-		public int getQux() {
-			return qux_;
-		}
-		/**
-		 * <code>optional int32 qux = 2;</code>
-		 * @param value The qux to set.
-		 * @return This builder for chaining.
-		 */
-		public Builder setQux(int value) {
-			bitField0_ |= 0x00000002;
-			qux_ = value;
-			onChanged();
-			return this;
-		}
-		/**
-		 * <code>optional int32 qux = 2;</code>
-		 * @return This builder for chaining.
-		 */
-		public Builder clearQux() {
-			bitField0_ = (bitField0_ & ~0x00000002);
-			qux_ = 0;
-			onChanged();
-			return this;
-		}
-		@java.lang.Override
-		public final Builder setUnknownFields(
-				final com.google.protobuf.UnknownFieldSet unknownFields) {
-			return super.setUnknownFields(unknownFields);
-		}
-
-		@java.lang.Override
-		public final Builder mergeUnknownFields(
-				final com.google.protobuf.UnknownFieldSet unknownFields) {
-			return super.mergeUnknownFields(unknownFields);
-		}
-
-
-		// @@protoc_insertion_point(builder_scope:tutorial.TestClass1)
-	}
-
-	// @@protoc_insertion_point(class_scope:tutorial.TestClass1)
-	private static final org.springframework.integration.transformer.proto.TestClass1 DEFAULT_INSTANCE;
-	static {
-		DEFAULT_INSTANCE = new org.springframework.integration.transformer.proto.TestClass1();
-	}
-
-	public static org.springframework.integration.transformer.proto.TestClass1 getDefaultInstance() {
-		return DEFAULT_INSTANCE;
-	}
-
-	public static final com.google.protobuf.Parser<TestClass1>
-			PARSER = new com.google.protobuf.AbstractParser<TestClass1>() {
-		@java.lang.Override
-		public TestClass1 parsePartialFrom(
-				com.google.protobuf.CodedInputStream input,
-				com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-				throws com.google.protobuf.InvalidProtocolBufferException {
-			return new TestClass1(input, extensionRegistry);
-		}
-	};
-
-	public static com.google.protobuf.Parser<TestClass1> parser() {
-		return PARSER;
-	}
-
-	@java.lang.Override
-	public com.google.protobuf.Parser<TestClass1> getParserForType() {
-		return PARSER;
-	}
-
-	@java.lang.Override
-	public org.springframework.integration.transformer.proto.TestClass1 getDefaultInstanceForType() {
-		return DEFAULT_INSTANCE;
-	}
-
-}
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/proto/TestClass1OrBuilder.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/proto/TestClass1OrBuilder.java
deleted file mode 100644
index 18c6b84006..0000000000
--- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/proto/TestClass1OrBuilder.java
+++ /dev/null
@@ -1,37 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: ProtoTest.proto
-
-package org.springframework.integration.transformer.proto;
-
-public interface TestClass1OrBuilder extends
-		// @@protoc_insertion_point(interface_extends:tutorial.TestClass1)
-		com.google.protobuf.MessageOrBuilder {
-
-	/**
-	 * <code>optional string bar = 1;</code>
-	 * @return Whether the bar field is set.
-	 */
-	boolean hasBar();
-	/**
-	 * <code>optional string bar = 1;</code>
-	 * @return The bar.
-	 */
-	java.lang.String getBar();
-	/**
-	 * <code>optional string bar = 1;</code>
-	 * @return The bytes for bar.
-	 */
-	com.google.protobuf.ByteString
-			getBarBytes();
-
-	/**
-	 * <code>optional int32 qux = 2;</code>
-	 * @return Whether the qux field is set.
-	 */
-	boolean hasQux();
-	/**
-	 * <code>optional int32 qux = 2;</code>
-	 * @return The qux.
-	 */
-	int getQux();
-}
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/proto/TestClass2.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/proto/TestClass2.java
deleted file mode 100644
index 2f363d9271..0000000000
--- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/proto/TestClass2.java
+++ /dev/null
@@ -1,670 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: ProtoTest.proto
-
-package org.springframework.integration.transformer.proto;
-
-/**
- * Protobuf type {@code tutorial.TestClass2}
- */
-public  final class TestClass2 extends
-		com.google.protobuf.GeneratedMessageV3 implements
-		// @@protoc_insertion_point(message_implements:tutorial.TestClass2)
-		TestClass2OrBuilder {
-private static final long serialVersionUID = 0L;
-	// Use TestClass2.newBuilder() to construct.
-	private TestClass2(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-		super(builder);
-	}
-	private TestClass2() {
-		bar_ = "";
-	}
-
-	@java.lang.Override
-	@SuppressWarnings({"unused"})
-	protected java.lang.Object newInstance(
-			UnusedPrivateParameter unused) {
-		return new TestClass2();
-	}
-
-	@java.lang.Override
-	public final com.google.protobuf.UnknownFieldSet
-	getUnknownFields() {
-		return this.unknownFields;
-	}
-	private TestClass2(
-			com.google.protobuf.CodedInputStream input,
-			com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-			throws com.google.protobuf.InvalidProtocolBufferException {
-		this();
-		if (extensionRegistry == null) {
-			throw new java.lang.NullPointerException();
-		}
-		int mutable_bitField0_ = 0;
-		com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-				com.google.protobuf.UnknownFieldSet.newBuilder();
-		try {
-			boolean done = false;
-			while (!done) {
-				int tag = input.readTag();
-				switch (tag) {
-					case 0:
-						done = true;
-						break;
-					case 10: {
-						com.google.protobuf.ByteString bs = input.readBytes();
-						bitField0_ |= 0x00000001;
-						bar_ = bs;
-						break;
-					}
-					case 16: {
-						bitField0_ |= 0x00000002;
-						qux_ = input.readInt32();
-						break;
-					}
-					default: {
-						if (!parseUnknownField(
-								input, unknownFields, extensionRegistry, tag)) {
-							done = true;
-						}
-						break;
-					}
-				}
-			}
-		} catch (com.google.protobuf.InvalidProtocolBufferException e) {
-			throw e.setUnfinishedMessage(this);
-		} catch (java.io.IOException e) {
-			throw new com.google.protobuf.InvalidProtocolBufferException(
-					e).setUnfinishedMessage(this);
-		} finally {
-			this.unknownFields = unknownFields.build();
-			makeExtensionsImmutable();
-		}
-	}
-	public static final com.google.protobuf.Descriptors.Descriptor
-			getDescriptor() {
-		return org.springframework.integration.transformer.proto.TestProtos.internal_static_tutorial_TestClass2_descriptor;
-	}
-
-	@java.lang.Override
-	protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-			internalGetFieldAccessorTable() {
-		return org.springframework.integration.transformer.proto.TestProtos.internal_static_tutorial_TestClass2_fieldAccessorTable
-				.ensureFieldAccessorsInitialized(
-						org.springframework.integration.transformer.proto.TestClass2.class, org.springframework.integration.transformer.proto.TestClass2.Builder.class);
-	}
-
-	private int bitField0_;
-	public static final int BAR_FIELD_NUMBER = 1;
-	private volatile java.lang.Object bar_;
-	/**
-	 * <code>optional string bar = 1;</code>
-	 * @return Whether the bar field is set.
-	 */
-	public boolean hasBar() {
-		return ((bitField0_ & 0x00000001) != 0);
-	}
-	/**
-	 * <code>optional string bar = 1;</code>
-	 * @return The bar.
-	 */
-	public java.lang.String getBar() {
-		java.lang.Object ref = bar_;
-		if (ref instanceof java.lang.String) {
-			return (java.lang.String) ref;
-		} else {
-			com.google.protobuf.ByteString bs =
-					(com.google.protobuf.ByteString) ref;
-			java.lang.String s = bs.toStringUtf8();
-			if (bs.isValidUtf8()) {
-				bar_ = s;
-			}
-			return s;
-		}
-	}
-	/**
-	 * <code>optional string bar = 1;</code>
-	 * @return The bytes for bar.
-	 */
-	public com.google.protobuf.ByteString
-			getBarBytes() {
-		java.lang.Object ref = bar_;
-		if (ref instanceof java.lang.String) {
-			com.google.protobuf.ByteString b =
-					com.google.protobuf.ByteString.copyFromUtf8(
-							(java.lang.String) ref);
-			bar_ = b;
-			return b;
-		} else {
-			return (com.google.protobuf.ByteString) ref;
-		}
-	}
-
-	public static final int QUX_FIELD_NUMBER = 2;
-	private int qux_;
-	/**
-	 * <code>optional int32 qux = 2;</code>
-	 * @return Whether the qux field is set.
-	 */
-	public boolean hasQux() {
-		return ((bitField0_ & 0x00000002) != 0);
-	}
-	/**
-	 * <code>optional int32 qux = 2;</code>
-	 * @return The qux.
-	 */
-	public int getQux() {
-		return qux_;
-	}
-
-	private byte memoizedIsInitialized = -1;
-	@java.lang.Override
-	public final boolean isInitialized() {
-		byte isInitialized = memoizedIsInitialized;
-		if (isInitialized == 1) return true;
-		if (isInitialized == 0) return false;
-
-		memoizedIsInitialized = 1;
-		return true;
-	}
-
-	@java.lang.Override
-	public void writeTo(com.google.protobuf.CodedOutputStream output)
-											throws java.io.IOException {
-		if (((bitField0_ & 0x00000001) != 0)) {
-			com.google.protobuf.GeneratedMessageV3.writeString(output, 1, bar_);
-		}
-		if (((bitField0_ & 0x00000002) != 0)) {
-			output.writeInt32(2, qux_);
-		}
-		unknownFields.writeTo(output);
-	}
-
-	@java.lang.Override
-	public int getSerializedSize() {
-		int size = memoizedSize;
-		if (size != -1) return size;
-
-		size = 0;
-		if (((bitField0_ & 0x00000001) != 0)) {
-			size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, bar_);
-		}
-		if (((bitField0_ & 0x00000002) != 0)) {
-			size += com.google.protobuf.CodedOutputStream
-				.computeInt32Size(2, qux_);
-		}
-		size += unknownFields.getSerializedSize();
-		memoizedSize = size;
-		return size;
-	}
-
-	@java.lang.Override
-	public boolean equals(final java.lang.Object obj) {
-		if (obj == this) {
-		 return true;
-		}
-		if (!(obj instanceof org.springframework.integration.transformer.proto.TestClass2)) {
-			return super.equals(obj);
-		}
-		org.springframework.integration.transformer.proto.TestClass2 other = (org.springframework.integration.transformer.proto.TestClass2) obj;
-
-		if (hasBar() != other.hasBar()) return false;
-		if (hasBar()) {
-			if (!getBar()
-					.equals(other.getBar())) return false;
-		}
-		if (hasQux() != other.hasQux()) return false;
-		if (hasQux()) {
-			if (getQux()
-					!= other.getQux()) return false;
-		}
-		if (!unknownFields.equals(other.unknownFields)) return false;
-		return true;
-	}
-
-	@java.lang.Override
-	public int hashCode() {
-		if (memoizedHashCode != 0) {
-			return memoizedHashCode;
-		}
-		int hash = 41;
-		hash = (19 * hash) + getDescriptor().hashCode();
-		if (hasBar()) {
-			hash = (37 * hash) + BAR_FIELD_NUMBER;
-			hash = (53 * hash) + getBar().hashCode();
-		}
-		if (hasQux()) {
-			hash = (37 * hash) + QUX_FIELD_NUMBER;
-			hash = (53 * hash) + getQux();
-		}
-		hash = (29 * hash) + unknownFields.hashCode();
-		memoizedHashCode = hash;
-		return hash;
-	}
-
-	public static org.springframework.integration.transformer.proto.TestClass2 parseFrom(
-			java.nio.ByteBuffer data)
-			throws com.google.protobuf.InvalidProtocolBufferException {
-		return PARSER.parseFrom(data);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass2 parseFrom(
-			java.nio.ByteBuffer data,
-			com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-			throws com.google.protobuf.InvalidProtocolBufferException {
-		return PARSER.parseFrom(data, extensionRegistry);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass2 parseFrom(
-			com.google.protobuf.ByteString data)
-			throws com.google.protobuf.InvalidProtocolBufferException {
-		return PARSER.parseFrom(data);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass2 parseFrom(
-			com.google.protobuf.ByteString data,
-			com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-			throws com.google.protobuf.InvalidProtocolBufferException {
-		return PARSER.parseFrom(data, extensionRegistry);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass2 parseFrom(byte[] data)
-			throws com.google.protobuf.InvalidProtocolBufferException {
-		return PARSER.parseFrom(data);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass2 parseFrom(
-			byte[] data,
-			com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-			throws com.google.protobuf.InvalidProtocolBufferException {
-		return PARSER.parseFrom(data, extensionRegistry);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass2 parseFrom(java.io.InputStream input)
-			throws java.io.IOException {
-		return com.google.protobuf.GeneratedMessageV3
-				.parseWithIOException(PARSER, input);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass2 parseFrom(
-			java.io.InputStream input,
-			com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-			throws java.io.IOException {
-		return com.google.protobuf.GeneratedMessageV3
-				.parseWithIOException(PARSER, input, extensionRegistry);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass2 parseDelimitedFrom(java.io.InputStream input)
-			throws java.io.IOException {
-		return com.google.protobuf.GeneratedMessageV3
-				.parseDelimitedWithIOException(PARSER, input);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass2 parseDelimitedFrom(
-			java.io.InputStream input,
-			com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-			throws java.io.IOException {
-		return com.google.protobuf.GeneratedMessageV3
-				.parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass2 parseFrom(
-			com.google.protobuf.CodedInputStream input)
-			throws java.io.IOException {
-		return com.google.protobuf.GeneratedMessageV3
-				.parseWithIOException(PARSER, input);
-	}
-	public static org.springframework.integration.transformer.proto.TestClass2 parseFrom(
-			com.google.protobuf.CodedInputStream input,
-			com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-			throws java.io.IOException {
-		return com.google.protobuf.GeneratedMessageV3
-				.parseWithIOException(PARSER, input, extensionRegistry);
-	}
-
-	@java.lang.Override
-	public Builder newBuilderForType() { return newBuilder(); }
-	public static Builder newBuilder() {
-		return DEFAULT_INSTANCE.toBuilder();
-	}
-	public static Builder newBuilder(org.springframework.integration.transformer.proto.TestClass2 prototype) {
-		return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-	}
-	@java.lang.Override
-	public Builder toBuilder() {
-		return this == DEFAULT_INSTANCE
-				? new Builder() : new Builder().mergeFrom(this);
-	}
-
-	@java.lang.Override
-	protected Builder newBuilderForType(
-			com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-		Builder builder = new Builder(parent);
-		return builder;
-	}
-	/**
-	 * Protobuf type {@code tutorial.TestClass2}
-	 */
-	public static final class Builder extends
-			com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-			// @@protoc_insertion_point(builder_implements:tutorial.TestClass2)
-			org.springframework.integration.transformer.proto.TestClass2OrBuilder {
-		public static final com.google.protobuf.Descriptors.Descriptor
-				getDescriptor() {
-			return org.springframework.integration.transformer.proto.TestProtos.internal_static_tutorial_TestClass2_descriptor;
-		}
-
-		@java.lang.Override
-		protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-				internalGetFieldAccessorTable() {
-			return org.springframework.integration.transformer.proto.TestProtos.internal_static_tutorial_TestClass2_fieldAccessorTable
-					.ensureFieldAccessorsInitialized(
-							org.springframework.integration.transformer.proto.TestClass2.class, org.springframework.integration.transformer.proto.TestClass2.Builder.class);
-		}
-
-		// Construct using org.springframework.integration.transformer.proto.TestClass2.newBuilder()
-		private Builder() {
-			maybeForceBuilderInitialization();
-		}
-
-		private Builder(
-				com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-			super(parent);
-			maybeForceBuilderInitialization();
-		}
-		private void maybeForceBuilderInitialization() {
-			if (com.google.protobuf.GeneratedMessageV3
-							.alwaysUseFieldBuilders) {
-			}
-		}
-		@java.lang.Override
-		public Builder clear() {
-			super.clear();
-			bar_ = "";
-			bitField0_ = (bitField0_ & ~0x00000001);
-			qux_ = 0;
-			bitField0_ = (bitField0_ & ~0x00000002);
-			return this;
-		}
-
-		@java.lang.Override
-		public com.google.protobuf.Descriptors.Descriptor
-				getDescriptorForType() {
-			return org.springframework.integration.transformer.proto.TestProtos.internal_static_tutorial_TestClass2_descriptor;
-		}
-
-		@java.lang.Override
-		public org.springframework.integration.transformer.proto.TestClass2 getDefaultInstanceForType() {
-			return org.springframework.integration.transformer.proto.TestClass2.getDefaultInstance();
-		}
-
-		@java.lang.Override
-		public org.springframework.integration.transformer.proto.TestClass2 build() {
-			org.springframework.integration.transformer.proto.TestClass2 result = buildPartial();
-			if (!result.isInitialized()) {
-				throw newUninitializedMessageException(result);
-			}
-			return result;
-		}
-
-		@java.lang.Override
-		public org.springframework.integration.transformer.proto.TestClass2 buildPartial() {
-			org.springframework.integration.transformer.proto.TestClass2 result = new org.springframework.integration.transformer.proto.TestClass2(this);
-			int from_bitField0_ = bitField0_;
-			int to_bitField0_ = 0;
-			if (((from_bitField0_ & 0x00000001) != 0)) {
-				to_bitField0_ |= 0x00000001;
-			}
-			result.bar_ = bar_;
-			if (((from_bitField0_ & 0x00000002) != 0)) {
-				result.qux_ = qux_;
-				to_bitField0_ |= 0x00000002;
-			}
-			result.bitField0_ = to_bitField0_;
-			onBuilt();
-			return result;
-		}
-
-		@java.lang.Override
-		public Builder clone() {
-			return super.clone();
-		}
-		@java.lang.Override
-		public Builder setField(
-				com.google.protobuf.Descriptors.FieldDescriptor field,
-				java.lang.Object value) {
-			return super.setField(field, value);
-		}
-		@java.lang.Override
-		public Builder clearField(
-				com.google.protobuf.Descriptors.FieldDescriptor field) {
-			return super.clearField(field);
-		}
-		@java.lang.Override
-		public Builder clearOneof(
-				com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-			return super.clearOneof(oneof);
-		}
-		@java.lang.Override
-		public Builder setRepeatedField(
-				com.google.protobuf.Descriptors.FieldDescriptor field,
-				int index, java.lang.Object value) {
-			return super.setRepeatedField(field, index, value);
-		}
-		@java.lang.Override
-		public Builder addRepeatedField(
-				com.google.protobuf.Descriptors.FieldDescriptor field,
-				java.lang.Object value) {
-			return super.addRepeatedField(field, value);
-		}
-		@java.lang.Override
-		public Builder mergeFrom(com.google.protobuf.Message other) {
-			if (other instanceof org.springframework.integration.transformer.proto.TestClass2) {
-				return mergeFrom((org.springframework.integration.transformer.proto.TestClass2)other);
-			} else {
-				super.mergeFrom(other);
-				return this;
-			}
-		}
-
-		public Builder mergeFrom(org.springframework.integration.transformer.proto.TestClass2 other) {
-			if (other == org.springframework.integration.transformer.proto.TestClass2.getDefaultInstance()) return this;
-			if (other.hasBar()) {
-				bitField0_ |= 0x00000001;
-				bar_ = other.bar_;
-				onChanged();
-			}
-			if (other.hasQux()) {
-				setQux(other.getQux());
-			}
-			this.mergeUnknownFields(other.unknownFields);
-			onChanged();
-			return this;
-		}
-
-		@java.lang.Override
-		public final boolean isInitialized() {
-			return true;
-		}
-
-		@java.lang.Override
-		public Builder mergeFrom(
-				com.google.protobuf.CodedInputStream input,
-				com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-				throws java.io.IOException {
-			org.springframework.integration.transformer.proto.TestClass2 parsedMessage = null;
-			try {
-				parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-			} catch (com.google.protobuf.InvalidProtocolBufferException e) {
-				parsedMessage = (org.springframework.integration.transformer.proto.TestClass2) e.getUnfinishedMessage();
-				throw e.unwrapIOException();
-			} finally {
-				if (parsedMessage != null) {
-					mergeFrom(parsedMessage);
-				}
-			}
-			return this;
-		}
-		private int bitField0_;
-
-		private java.lang.Object bar_ = "";
-		/**
-		 * <code>optional string bar = 1;</code>
-		 * @return Whether the bar field is set.
-		 */
-		public boolean hasBar() {
-			return ((bitField0_ & 0x00000001) != 0);
-		}
-		/**
-		 * <code>optional string bar = 1;</code>
-		 * @return The bar.
-		 */
-		public java.lang.String getBar() {
-			java.lang.Object ref = bar_;
-			if (!(ref instanceof java.lang.String)) {
-				com.google.protobuf.ByteString bs =
-						(com.google.protobuf.ByteString) ref;
-				java.lang.String s = bs.toStringUtf8();
-				if (bs.isValidUtf8()) {
-					bar_ = s;
-				}
-				return s;
-			} else {
-				return (java.lang.String) ref;
-			}
-		}
-		/**
-		 * <code>optional string bar = 1;</code>
-		 * @return The bytes for bar.
-		 */
-		public com.google.protobuf.ByteString
-				getBarBytes() {
-			java.lang.Object ref = bar_;
-			if (ref instanceof String) {
-				com.google.protobuf.ByteString b =
-						com.google.protobuf.ByteString.copyFromUtf8(
-								(java.lang.String) ref);
-				bar_ = b;
-				return b;
-			} else {
-				return (com.google.protobuf.ByteString) ref;
-			}
-		}
-		/**
-		 * <code>optional string bar = 1;</code>
-		 * @param value The bar to set.
-		 * @return This builder for chaining.
-		 */
-		public Builder setBar(
-				java.lang.String value) {
-			if (value == null) {
-		throw new NullPointerException();
-	}
-	bitField0_ |= 0x00000001;
-			bar_ = value;
-			onChanged();
-			return this;
-		}
-		/**
-		 * <code>optional string bar = 1;</code>
-		 * @return This builder for chaining.
-		 */
-		public Builder clearBar() {
-			bitField0_ = (bitField0_ & ~0x00000001);
-			bar_ = getDefaultInstance().getBar();
-			onChanged();
-			return this;
-		}
-		/**
-		 * <code>optional string bar = 1;</code>
-		 * @param value The bytes for bar to set.
-		 * @return This builder for chaining.
-		 */
-		public Builder setBarBytes(
-				com.google.protobuf.ByteString value) {
-			if (value == null) {
-		throw new NullPointerException();
-	}
-	bitField0_ |= 0x00000001;
-			bar_ = value;
-			onChanged();
-			return this;
-		}
-
-		private int qux_ ;
-		/**
-		 * <code>optional int32 qux = 2;</code>
-		 * @return Whether the qux field is set.
-		 */
-		public boolean hasQux() {
-			return ((bitField0_ & 0x00000002) != 0);
-		}
-		/**
-		 * <code>optional int32 qux = 2;</code>
-		 * @return The qux.
-		 */
-		public int getQux() {
-			return qux_;
-		}
-		/**
-		 * <code>optional int32 qux = 2;</code>
-		 * @param value The qux to set.
-		 * @return This builder for chaining.
-		 */
-		public Builder setQux(int value) {
-			bitField0_ |= 0x00000002;
-			qux_ = value;
-			onChanged();
-			return this;
-		}
-		/**
-		 * <code>optional int32 qux = 2;</code>
-		 * @return This builder for chaining.
-		 */
-		public Builder clearQux() {
-			bitField0_ = (bitField0_ & ~0x00000002);
-			qux_ = 0;
-			onChanged();
-			return this;
-		}
-		@java.lang.Override
-		public final Builder setUnknownFields(
-				final com.google.protobuf.UnknownFieldSet unknownFields) {
-			return super.setUnknownFields(unknownFields);
-		}
-
-		@java.lang.Override
-		public final Builder mergeUnknownFields(
-				final com.google.protobuf.UnknownFieldSet unknownFields) {
-			return super.mergeUnknownFields(unknownFields);
-		}
-
-
-		// @@protoc_insertion_point(builder_scope:tutorial.TestClass2)
-	}
-
-	// @@protoc_insertion_point(class_scope:tutorial.TestClass2)
-	private static final org.springframework.integration.transformer.proto.TestClass2 DEFAULT_INSTANCE;
-	static {
-		DEFAULT_INSTANCE = new org.springframework.integration.transformer.proto.TestClass2();
-	}
-
-	public static org.springframework.integration.transformer.proto.TestClass2 getDefaultInstance() {
-		return DEFAULT_INSTANCE;
-	}
-
-	public static final com.google.protobuf.Parser<TestClass2>
-			PARSER = new com.google.protobuf.AbstractParser<TestClass2>() {
-		@java.lang.Override
-		public TestClass2 parsePartialFrom(
-				com.google.protobuf.CodedInputStream input,
-				com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-				throws com.google.protobuf.InvalidProtocolBufferException {
-			return new TestClass2(input, extensionRegistry);
-		}
-	};
-
-	public static com.google.protobuf.Parser<TestClass2> parser() {
-		return PARSER;
-	}
-
-	@java.lang.Override
-	public com.google.protobuf.Parser<TestClass2> getParserForType() {
-		return PARSER;
-	}
-
-	@java.lang.Override
-	public org.springframework.integration.transformer.proto.TestClass2 getDefaultInstanceForType() {
-		return DEFAULT_INSTANCE;
-	}
-
-}
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/proto/TestClass2OrBuilder.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/proto/TestClass2OrBuilder.java
deleted file mode 100644
index 85324537e9..0000000000
--- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/proto/TestClass2OrBuilder.java
+++ /dev/null
@@ -1,37 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: ProtoTest.proto
-
-package org.springframework.integration.transformer.proto;
-
-public interface TestClass2OrBuilder extends
-		// @@protoc_insertion_point(interface_extends:tutorial.TestClass2)
-		com.google.protobuf.MessageOrBuilder {
-
-	/**
-	 * <code>optional string bar = 1;</code>
-	 * @return Whether the bar field is set.
-	 */
-	boolean hasBar();
-	/**
-	 * <code>optional string bar = 1;</code>
-	 * @return The bar.
-	 */
-	java.lang.String getBar();
-	/**
-	 * <code>optional string bar = 1;</code>
-	 * @return The bytes for bar.
-	 */
-	com.google.protobuf.ByteString
-			getBarBytes();
-
-	/**
-	 * <code>optional int32 qux = 2;</code>
-	 * @return Whether the qux field is set.
-	 */
-	boolean hasQux();
-	/**
-	 * <code>optional int32 qux = 2;</code>
-	 * @return The qux.
-	 */
-	int getQux();
-}
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/proto/TestProtos.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/proto/TestProtos.java
deleted file mode 100644
index 0f6d383ca5..0000000000
--- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/proto/TestProtos.java
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: ProtoTest.proto
-
-package org.springframework.integration.transformer.proto;
-
-public final class TestProtos {
-	private TestProtos() {}
-	public static void registerAllExtensions(
-			com.google.protobuf.ExtensionRegistryLite registry) {
-	}
-
-	public static void registerAllExtensions(
-			com.google.protobuf.ExtensionRegistry registry) {
-		registerAllExtensions(
-				(com.google.protobuf.ExtensionRegistryLite) registry);
-	}
-	static final com.google.protobuf.Descriptors.Descriptor
-		internal_static_tutorial_TestClass1_descriptor;
-	static final
-		com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-			internal_static_tutorial_TestClass1_fieldAccessorTable;
-	static final com.google.protobuf.Descriptors.Descriptor
-		internal_static_tutorial_TestClass2_descriptor;
-	static final
-		com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-			internal_static_tutorial_TestClass2_fieldAccessorTable;
-
-	public static com.google.protobuf.Descriptors.FileDescriptor
-			getDescriptor() {
-		return descriptor;
-	}
-	private static  com.google.protobuf.Descriptors.FileDescriptor
-			descriptor;
-	static {
-		java.lang.String[] descriptorData = {
-			"\n\017ProtoTest.proto\022\010tutorial\"&\n\nTestClass" +
-			"1\022\013\n\003bar\030\001 \001(\t\022\013\n\003qux\030\002 \001(\005\"&\n\nTestClass" +
-			"2\022\013\n\003bar\030\001 \001(\t\022\013\n\003qux\030\002 \001(\005BA\n1org.sprin" +
-			"gframework.integration.transformer.proto" +
-			"B\nTestProtosP\001"
-		};
-		descriptor = com.google.protobuf.Descriptors.FileDescriptor
-			.internalBuildGeneratedFileFrom(descriptorData,
-				new com.google.protobuf.Descriptors.FileDescriptor[] {
-				});
-		internal_static_tutorial_TestClass1_descriptor =
-			getDescriptor().getMessageTypes().get(0);
-		internal_static_tutorial_TestClass1_fieldAccessorTable = new
-			com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-				internal_static_tutorial_TestClass1_descriptor,
-				new java.lang.String[] { "Bar", "Qux", });
-		internal_static_tutorial_TestClass2_descriptor =
-			getDescriptor().getMessageTypes().get(1);
-		internal_static_tutorial_TestClass2_fieldAccessorTable = new
-			com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-				internal_static_tutorial_TestClass2_descriptor,
-				new java.lang.String[] { "Bar", "Qux", });
-	}
-
-	// @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/spring-integration-core/src/test/resources/proto/ProtoTest.proto b/spring-integration-core/src/test/proto/ProtoTest.proto
similarity index 100%
rename from spring-integration-core/src/test/resources/proto/ProtoTest.proto
rename to spring-integration-core/src/test/proto/ProtoTest.proto