fix: Incorrect order when Advisors have the same order

Signed-off-by: YunKui Lu <[email protected]>

Author: YunKuiLu

spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/DefaultAroundAdvisorChain.java

@@ -192,7 +192,7 @@ public Builder pushAll(List<? extends Advisor> advisors) {
 					.toList();
 
 				if (!CollectionUtils.isEmpty(callAroundAdvisorList)) {
-					callAroundAdvisorList.forEach(this.callAdvisors::push);
+					this.callAdvisors.addAll(callAroundAdvisorList);
 				}
 
 				List<StreamAdvisor> streamAroundAdvisorList = advisors.stream()
@@ -201,7 +201,7 @@ public Builder pushAll(List<? extends Advisor> advisors) {
 					.toList();
 
 				if (!CollectionUtils.isEmpty(streamAroundAdvisorList)) {
-					streamAroundAdvisorList.forEach(this.streamAdvisors::push);
+					this.streamAdvisors.addAll(streamAroundAdvisorList);
 				}
 
 				this.reOrder();

spring-ai-client-chat/src/test/java/org/springframework/ai/chat/client/advisor/DefaultAroundAdvisorChainTests.java

@@ -125,4 +125,42 @@ void getStreamAdvisors() {
 		assertThat(chain.getStreamAdvisors()).containsExactlyInAnyOrder(advisors.toArray(new StreamAdvisor[0]));
 	}
 
+	@Test
+	void testOrder(){
+		TestOrderAdvisor advisor1 = new TestOrderAdvisor("advisor1", 1);
+		TestOrderAdvisor advisor21 = new TestOrderAdvisor("advisor2_1", 2);
+		TestOrderAdvisor advisor22 = new TestOrderAdvisor("advisor2_2", 2);
+		TestOrderAdvisor advisor3 = new TestOrderAdvisor("advisor3", 3);
+
+		var advisors = List.of(advisor3, advisor1, advisor21, advisor22);
+
+		DefaultAroundAdvisorChain chain = DefaultAroundAdvisorChain.builder(ObservationRegistry.NOOP)
+				.pushAll(advisors)
+				.build();
+
+		assertThat(chain.getStreamAdvisors()).containsExactly(advisor1, advisor21, advisor22, advisor3);
+		assertThat(chain.getCallAdvisors()).containsExactly(advisor1, advisor21, advisor22, advisor3);
+	}
+
+	private record TestOrderAdvisor(String name, int order) implements CallAdvisor, StreamAdvisor {
+		@Override
+		public String getName() {
+			return name;
+		}
+
+		@Override
+		public int getOrder() {
+			return order;
+		}
+
+		@Override
+		public ChatClientResponse adviseCall(ChatClientRequest chatClientRequest, CallAdvisorChain callAdvisorChain) {
+			return null;
+		}
+
+		@Override
+		public Flux<ChatClientResponse> adviseStream(ChatClientRequest chatClientRequest, StreamAdvisorChain streamAdvisorChain) {
+			return null;
+		}
+	}
 }