rebase with upstream/main

Signed-off-by: Antonio Pedro <[email protected]>

Author: antonio-pedro99

src/main/java/io/strimzi/kafka/bridge/http/HttpSourceBridgeEndpoint.java

@@ -229,7 +229,7 @@ private MessageConverter<K, V, byte[], byte[]> buildMessageConverter(String cont
                 return (MessageConverter<K, V, byte[], byte[]>) new HttpJsonMessageConverter();
             case BridgeContentType.KAFKA_JSON_BINARY:
                 return (MessageConverter<K, V, byte[], byte[]>) new HttpBinaryMessageConverter();
-            case TEXT:
+            case BridgeContentType.KAFKA_JSON_TEXT:
                 return (MessageConverter<K, V, byte[], byte[]>) new HttpTextMessageConverter();
         }
         return null;

src/test/java/io/strimzi/kafka/bridge/http/ProducerIT.java

@@ -268,7 +268,7 @@ void sendTextMessage(VertxTestContext context) throws InterruptedException, Exec
         consumerProperties.setProperty(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, kafkaUri);
 
         KafkaConsumer<String, String> consumer = KafkaConsumer.create(vertx, consumerProperties,
-                new StringDeserializer(), new KafkaJsonDeserializer<>(String.class));
+                new StringDeserializer(), new StringDeserializer());
         consumer.handler(record -> {
             context.verify(() -> {
                 assertThat(record.value(), is(value));