Fixed build warnings - removed deprecated HttpRequest calls

Author: pawel.koselski

core/src/test/java/com/onelogin/saml2/http/HttpRequestTest.java

@@ -24,7 +24,7 @@ public class HttpRequestTest {
     public void testConstructorWithNoQueryParams() throws Exception {
         final String url = "url";
 
-        final HttpRequest request = new HttpRequest(url);
+        final HttpRequest request = new HttpRequest(url, (String)null);
         assertThat(request.getRequestURL(), equalTo(url));
         assertThat(request.getParameters(), equalTo(Collections.<String, List<String>>emptyMap()));
         assertThat(request.getParameters("x"), equalTo(Collections.<String>emptyList()));
@@ -41,7 +41,7 @@ public void testConstructorWithQueryParams() throws Exception {
         final List<String> values = Arrays.asList(value1, value2);
         final Map<String, List<String>> parametersMap = singletonMap(name, values);
 
-        final HttpRequest request = new HttpRequest(url, parametersMap);
+        final HttpRequest request = new HttpRequest(url, parametersMap, null);
         assertThat(request.getRequestURL(), equalTo(url));
         assertThat(request.getParameters(), equalTo(parametersMap));
         assertThat(request.getParameters(name), equalTo(values));
@@ -54,7 +54,7 @@ public void testAddParameter() throws Exception {
         final String name = "name";
         final String value = "value";
 
-        final HttpRequest request = new HttpRequest(url).addParameter(name, value);
+        final HttpRequest request = new HttpRequest(url, (String)null).addParameter(name, value);
         assertThat(request.getRequestURL(), equalTo(url));
         assertThat(request.getParameters(), equalTo(singletonMap(name, singletonList(value))));
         assertThat(request.getParameters(name), equalTo(singletonList(value)));
@@ -70,7 +70,7 @@ public void testRemoveParameter() throws Exception {
         final String name = "name";
         final String value = "value";
 
-        HttpRequest request = new HttpRequest(url).addParameter(name, value);
+        HttpRequest request = new HttpRequest(url, (String)null).addParameter(name, value);
         assertThat(request.getRequestURL(), equalTo(url));
         assertThat(request.getParameters(), equalTo(singletonMap(name, singletonList(value))));
         assertThat(request.getParameters(name), equalTo(singletonList(value)));
@@ -94,7 +94,7 @@ public void testGetEncodedParameter_encodesParametersNotOnQueryString() throws E
         final List<String> values = Arrays.asList(value1);
         final Map<String, List<String>> parametersMap = singletonMap(name, values);
 
-        final HttpRequest request = new HttpRequest(url, parametersMap).addParameter(addedName, addedValue);
+        final HttpRequest request = new HttpRequest(url, parametersMap, null).addParameter(addedName, addedValue);
 
         assertThat(request.getEncodedParameter(name), equalTo(Util.urlEncoder(value1)));
         assertThat(request.getEncodedParameter(addedName), equalTo(Util.urlEncoder(addedValue)));
@@ -157,7 +157,7 @@ public void testGetEncodedParameter_withDefault_usesDefaultWhenParameterMissing(
         final String url = "url";
         final String foobar = "foo/bar!";
 
-        final HttpRequest request = new HttpRequest(url);
+        final HttpRequest request = new HttpRequest(url, (String)null);
         assertThat(request.getEncodedParameter("missing", foobar), equalTo(Util.urlEncoder(foobar)));
     }
 

core/src/test/java/com/onelogin/saml2/test/authn/AuthnResponseTest.java

@@ -2869,7 +2869,7 @@ private static HttpRequest newHttpRequest(String samlResponseEncoded) {
 	}
 
 	private static HttpRequest newHttpRequest(String requestURL, String samlResponseEncoded) {
-		return new HttpRequest(requestURL).addParameter("SAMLResponse", samlResponseEncoded);
+		return new HttpRequest(requestURL, (String)null).addParameter("SAMLResponse", samlResponseEncoded);
 	}
 }
 

core/src/test/java/com/onelogin/saml2/test/logout/LogoutRequestTest.java

@@ -721,7 +721,7 @@ public void testIsInValidSign() throws Exception {
 		String sigAlg = "http://www.w3.org/2000/09/xmldsig#rsa-sha1";
 		String signature = "XCwCyI5cs7WhiJlB5ktSlWxSBxv+6q2xT3c8L7dLV6NQG9LHWhN7gf8qNsahSXfCzA0Ey9dp5BQ0EdRvAk2DIzKmJY6e3hvAIEp1zglHNjzkgcQmZCcrkK9Czi2Y1WkjOwR/WgUTUWsGJAVqVvlRZuS3zk3nxMrLH6f7toyvuJc=";
 
-		HttpRequest httpRequest = new HttpRequest(requestURL)
+		HttpRequest httpRequest = new HttpRequest(requestURL, (String)null)
 						.addParameter("SAMLRequest", samlRequestEncoded)
 						.addParameter("RelayState", relayState)
 						.addParameter("SigAlg", sigAlg)
@@ -839,6 +839,6 @@ public void testGetError() throws Exception {
 	}
 
 	private static HttpRequest newHttpRequest(String requestURL, String samlRequestEncoded) {
-		return new HttpRequest(requestURL).addParameter("SAMLRequest", samlRequestEncoded);
+		return new HttpRequest(requestURL, (String)null).addParameter("SAMLRequest", samlRequestEncoded);
 	}
 }

core/src/test/java/com/onelogin/saml2/test/logout/LogoutResponseTest.java

@@ -40,7 +40,7 @@ public void testGetEncodedLogoutResponseSimulated() throws Exception {
 		Saml2Settings settings = new SettingsBuilder().fromFile("config/config.min.properties").build();
 		final String logoutResponseString = Util.getFileAsString("data/logout_responses/logout_response.xml");
 		final String requestURL = "/";
-		HttpRequest httpRequest = new HttpRequest(requestURL);
+		HttpRequest httpRequest = new HttpRequest(requestURL, (String)null);
 
 		LogoutResponse logoutResponseBuilder = new LogoutResponse(settings, httpRequest) {
 			@Override
@@ -136,7 +136,7 @@ public void testBuild() throws IOException, XMLEntityException, URISyntaxExcepti
 		Saml2Settings settings = new SettingsBuilder().fromFile("config/config.min.properties").build();
 
 		final String requestURL = "/";
-		HttpRequest httpRequest = new HttpRequest(requestURL);
+		HttpRequest httpRequest = new HttpRequest(requestURL, (String)null);
 
 		LogoutResponse logoutResponse = new LogoutResponse(settings, httpRequest);
 		assertFalse(logoutResponse.isValid());
@@ -256,7 +256,7 @@ public void testIsValidNoResponse() throws XMLEntityException, IOException, Erro
 		assertFalse(logoutResponse.isValid());
 		assertEquals("SAML Logout Response is not loaded", logoutResponse.getError());
 
-		httpRequest = new HttpRequest(requestURL);
+		httpRequest = new HttpRequest(requestURL, (String)null);
 		logoutResponse = new LogoutResponse(settings, httpRequest);
 		assertFalse(logoutResponse.isValid());
 		assertEquals("SAML Logout Response is not loaded", logoutResponse.getError());		
@@ -499,7 +499,7 @@ public void testIsInValidSign() throws URISyntaxException, IOException, XMLEntit
 		String sigAlg = "http://www.w3.org/2000/09/xmldsig#rsa-sha1";
 		String signature = "vfWbbc47PkP3ejx4bjKsRX7lo9Ml1WRoE5J5owF/0mnyKHfSY6XbhO1wwjBV5vWdrUVX+xp6slHyAf4YoAsXFS0qhan6txDiZY4Oec6yE+l10iZbzvie06I4GPak4QrQ4gAyXOSzwCrRmJu4gnpeUxZ6IqKtdrKfAYRAcVfNKGA=";
 
-		HttpRequest httpRequest = new HttpRequest(requestURL)
+		HttpRequest httpRequest = new HttpRequest(requestURL, (String)null)
 				.addParameter("SAMLResponse", samlResponseEncoded)
 				.addParameter("RelayState", relayState)
 				.addParameter("SigAlg", sigAlg)
@@ -593,6 +593,6 @@ public void testGetError() throws URISyntaxException, IOException, XMLEntityExce
 	}
 
 	private static HttpRequest newHttpRequest(String requestURL, String samlResponseEncoded) {
-		return new HttpRequest(requestURL).addParameter("SAMLResponse", samlResponseEncoded);
+		return new HttpRequest(requestURL, (String)null).addParameter("SAMLResponse", samlResponseEncoded);
 	}
 }