From a1e9459a43f198a3d65cb761981d3e522d438956 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 30 May 2016 15:06:55 +0200 Subject: [PATCH] @SafeVarargs for header(String, Matcher...) method Issue: SPR-14278 --- .../test/web/client/match/MockRestRequestMatchers.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java b/spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java index 9637bfc6f1..5d69f154ea 100644 --- a/spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java +++ b/spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 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. @@ -123,6 +123,7 @@ public abstract class MockRestRequestMatchers { /** * Assert request header values with the given Hamcrest matcher. */ + @SafeVarargs @SuppressWarnings("unchecked") public static RequestMatcher header(final String name, final Matcher... matchers) { return new RequestMatcher() { @@ -155,8 +156,8 @@ public abstract class MockRestRequestMatchers { private static void assertHeaderValueCount(final String name, HttpHeaders headers, int expectedCount) { List actualValues = headers.get(name); AssertionErrors.assertTrue("Expected header <" + name + ">", actualValues != null); - AssertionErrors.assertTrue("Expected header <" + name + "> to have at least <" + expectedCount - + "> values but found " + actualValues, expectedCount <= actualValues.size()); + AssertionErrors.assertTrue("Expected header <" + name + "> to have at least <" + expectedCount + + "> values but found " + actualValues, expectedCount <= actualValues.size()); } /**