@@ -42,28 +42,28 @@ public class SuperStreamManagementTest {
4242 static final int partitionCount = 3 ;
4343 String s ;
4444 List <String > partitions ;
45- List <String > routingKeys ;
45+ List <String > bindingKeys ;
4646
4747 @ BeforeEach
4848 void init (TestInfo info ) {
4949 s = streamName (info );
5050 partitions = partitions (s );
51- routingKeys = routingKeys ();
51+ bindingKeys = bindingKeys ();
5252 }
5353
5454 @ Test
5555 @ TestUtils .BrokerVersionAtLeast (TestUtils .BrokerVersion .RABBITMQ_3_13_0 )
5656 void createDelete () {
5757 Client c = cf .get ();
58- Client .Response response = c .createSuperStream (s , partitions , routingKeys , null );
58+ Client .Response response = c .createSuperStream (s , partitions , bindingKeys , null );
5959 assertThat (response ).is (ok ());
6060 assertThat (c .metadata (partitions ))
6161 .hasSameSizeAs (partitions )
6262 .allSatisfy ((s , streamMetadata ) -> assertThat (streamMetadata .isResponseOk ()).isTrue ());
6363 assertThat (c .partitions (s )).isEqualTo (partitions );
64- routingKeys .forEach (rk -> assertThat (c .route (rk , s )).hasSize (1 ).contains (s + "-" + rk ));
64+ bindingKeys .forEach (bk -> assertThat (c .route (bk , s )).hasSize (1 ).contains (s + "-" + bk ));
6565
66- response = c .createSuperStream (s , partitions , routingKeys , null );
66+ response = c .createSuperStream (s , partitions , bindingKeys , null );
6767 assertThat (response ).is (ko ()).is (responseCode (RESPONSE_CODE_STREAM_ALREADY_EXISTS ));
6868
6969 response = c .deleteSuperStream (s );
@@ -75,7 +75,7 @@ void createDelete() {
7575 assertThat (streamMetadata .getResponseCode ())
7676 .isEqualTo (RESPONSE_CODE_STREAM_DOES_NOT_EXIST ));
7777 assertThat (c .partitions (s )).isEmpty ();
78- routingKeys .forEach (rk -> assertThat (c .route (rk , s )).isEmpty ());
78+ bindingKeys .forEach (bk -> assertThat (c .route (bk , s )).isEmpty ());
7979
8080 response = c .deleteSuperStream (s );
8181 assertThat (response ).is (responseCode (RESPONSE_CODE_STREAM_DOES_NOT_EXIST ));
@@ -85,7 +85,7 @@ void createDelete() {
8585 @ TestUtils .BrokerVersionAtLeast (TestUtils .BrokerVersion .RABBITMQ_3_13_0 )
8686 void clientWithSubscriptionShouldReceiveNotificationOnDeletion () throws Exception {
8787 Client c = cf .get ();
88- Client .Response response = c .createSuperStream (s , partitions , routingKeys , null );
88+ Client .Response response = c .createSuperStream (s , partitions , bindingKeys , null );
8989 assertThat (response ).is (ok ());
9090 Map <String , Short > notifications = new ConcurrentHashMap <>(partitions .size ());
9191 AtomicInteger notificationCount = new AtomicInteger ();
@@ -114,37 +114,37 @@ void clientWithSubscriptionShouldReceiveNotificationOnDeletion() throws Exceptio
114114 @ TestUtils .BrokerVersionAtLeast (TestUtils .BrokerVersion .RABBITMQ_3_13_0 )
115115 void authorisation () throws Exception {
116116 String user = "stream" ;
117- // routing keys do not matter for authorisation
118- routingKeys = asList ("1" , "2" , "3" );
117+ // binding keys do not matter for authorisation
118+ bindingKeys = asList ("1" , "2" , "3" );
119119 try {
120120 addUser (user , user );
121121 setPermissions (user , asList ("stream|partition.*$" , "partition.*$" , "stream.*$" ));
122122 Client c = cf .get (new Client .ClientParameters ().username (user ).password (user ));
123- Client .Response response = c .createSuperStream ("not-allowed" , partitions , routingKeys , null );
123+ Client .Response response = c .createSuperStream ("not-allowed" , partitions , bindingKeys , null );
124124 assertThat (response ).is (ko ()).is (responseCode (RESPONSE_CODE_ACCESS_REFUSED ));
125125
126126 s = name ("stream" );
127- response = c .createSuperStream (s , asList ("1" , "2" , "3" ), routingKeys , null );
127+ response = c .createSuperStream (s , asList ("1" , "2" , "3" ), bindingKeys , null );
128128 assertThat (response ).is (ko ()).is (responseCode (RESPONSE_CODE_ACCESS_REFUSED ));
129129
130130 partitions = range (0 , partitionCount ).mapToObj (i -> s + "-" + i ).collect (toList ());
131131 // we can create the queues, but can't bind them, as it requires write permission
132- response = c .createSuperStream (s , partitions , routingKeys , null );
132+ response = c .createSuperStream (s , partitions , bindingKeys , null );
133133 assertThat (response ).is (ko ()).is (responseCode (RESPONSE_CODE_ACCESS_REFUSED ));
134134
135135 String partitionName = name ("partition" );
136136 partitions =
137137 range (0 , partitionCount ).mapToObj (i -> partitionName + "-" + i ).collect (toList ());
138- response = c .createSuperStream (s , partitions , routingKeys , null );
138+ response = c .createSuperStream (s , partitions , bindingKeys , null );
139139 assertThat (response ).is (ok ());
140140
141141 assertThat (c .metadata (partitions ))
142142 .hasSameSizeAs (partitions )
143143 .allSatisfy ((s , streamMetadata ) -> assertThat (streamMetadata .isResponseOk ()).isTrue ());
144144 assertThat (c .partitions (s )).isEqualTo (partitions );
145- for (int i = 0 ; i < routingKeys .size (); i ++) {
146- String rk = routingKeys .get (i );
147- assertThat (c .route (rk , s )).hasSize (1 ).contains (partitions .get (i ));
145+ for (int i = 0 ; i < bindingKeys .size (); i ++) {
146+ String bk = bindingKeys .get (i );
147+ assertThat (c .route (bk , s )).hasSize (1 ).contains (partitions .get (i ));
148148 }
149149
150150 response = c .deleteSuperStream (s );
@@ -154,11 +154,11 @@ void authorisation() throws Exception {
154154 }
155155 }
156156
157- private static List <String > routingKeys () {
158- return routingKeys (partitionCount );
157+ private static List <String > bindingKeys () {
158+ return bindingKeys (partitionCount );
159159 }
160160
161- private static List <String > routingKeys (int partitions ) {
161+ private static List <String > bindingKeys (int partitions ) {
162162 return range (0 , partitions ).mapToObj (String ::valueOf ).collect (toList ());
163163 }
164164
0 commit comments