Merge branch 'master' into componentschema-refactoring

Author: tvahrst

springwolf-asyncapi/src/main/java/io/github/springwolf/asyncapi/v3/model/ReferenceUtil.java

@@ -1,11 +1,32 @@
 // SPDX-License-Identifier: Apache-2.0
 package io.github.springwolf.asyncapi.v3.model;
 
+import java.util.Set;
+import java.util.stream.Collectors;
+
 public class ReferenceUtil {
-    private static final String FORBIDDEN_ID_CHARACTER = "/";
+    /**
+     * Allowed characters in RFC 3986, section 3.5 fragments (used for AsyncAPI $ref values)
+     * Excluding '~' and '/', since they have a special meaning JSON Pointer (RFC 6901)
+     */
+    private static final Set<Character> ALLOWED_CHARACTERS =
+            "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._!$&'()+,;=:@?%"
+                    .chars()
+                    .mapToObj(c -> (char) c)
+                    .collect(Collectors.toSet());
 
     public static String toValidId(String name) {
-        return name.replaceAll(FORBIDDEN_ID_CHARACTER, "_");
+        StringBuilder sb = new StringBuilder();
+
+        for (char c : name.toCharArray()) {
+            if (ALLOWED_CHARACTERS.contains(c)) {
+                sb.append(c);
+            } else {
+                sb.append("_");
+            }
+        }
+
+        return sb.toString();
     }
 
     public static String getLastSegment(String ref) {

springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/model/ReferenceUtilTest.java

@@ -3,15 +3,18 @@
 
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 class ReferenceUtilTest {
-    @Test
-    void shouldCorrectIllegalCharacter() {
-        String name = "users/{userId}";
+    @ParameterizedTest
+    @CsvSource(value = {"users/userId", "users~userId", "users*userId", "users#userId"})
+    void shouldReplaceIllegalCharacter(String name) {
+        String result = ReferenceUtil.toValidId(name);
 
-        assertThat(ReferenceUtil.toValidId(name)).isEqualTo("users_{userId}");
+        assertThat(result).isEqualTo("users_userId");
     }
 
     @Nested

springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/asyncapi/scanners/bindings/RabbitListenerUtil.java

@@ -65,14 +65,8 @@ public static String getChannelName(RabbitListener annotation, StringValueResolv
     }
 
     public static String getChannelId(RabbitListener annotation, StringValueResolver stringValueResolver) {
-        Stream<String> annotationBindingChannelIds = Arrays.stream(annotation.bindings())
-                .flatMap(binding -> channelIdFromAnnotationBindings(
-                                binding.exchange().name(), binding.key())
-                        .map(stringValueResolver::resolveStringValue));
-
-        Stream<String> stream =
-                Stream.concat(streamQueueNames(annotation).map(ReferenceUtil::toValidId), annotationBindingChannelIds);
-        return resolveFirstValue(stream, stringValueResolver, "channel id");
+        String channelName = getChannelName(annotation, stringValueResolver);
+        return ReferenceUtil.toValidId(channelName);
     }
 
     private static String getQueueName(RabbitListener annotation, StringValueResolver resolver) {
@@ -93,10 +87,6 @@ private static Stream<String> channelNameFromAnnotationBindings(String exchangeN
         return keys.stream().map(key -> String.join("_", exchangeName, key));
     }
 
-    private static Stream<String> channelIdFromAnnotationBindings(String exchangeName, String[] keys) {
-        return channelNameFromAnnotationBindings(exchangeName, keys).map(ReferenceUtil::toValidId);
-    }
-
     /**
      *
      * @param rabbitListenerAnnotation a RabbitListener annotation
@@ -211,14 +201,14 @@ public static ChannelObject buildChannelObject(org.springframework.amqp.core.Que
     }
 
     public static List<ChannelObject> buildChannelObject(Binding binding) {
-        String exchangeId = channelIdFromAnnotationBindings(
+        String exchangeName = channelNameFromAnnotationBindings(
                         binding.getExchange(), List.of(binding.getRoutingKey()).toArray(String[]::new))
                 .findFirst()
                 .get();
         return List.of(
                 // exchange
                 ChannelObject.builder()
-                        .channelId(exchangeId)
+                        .channelId(ReferenceUtil.toValidId(exchangeName))
                         .address(binding.getRoutingKey())
                         .bindings(Map.of(
                                 BINDING_NAME,