Fix number or format arguments in OSGiProxyConfiguration

The format string requires 6 arguments while 7 are provided.
From the format string it is clear that the first argument has
been added by mistake.

Contributed by Michiel Eggermont <michiel.eggermont at gmail.com>

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1721388 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2015-12-22 12:40:01 +00:00
parent be46d7fd93
commit 80601602d0
2 changed files with 63 additions and 1 deletions

View File

@ -27,6 +27,7 @@
package org.apache.http.osgi.impl; package org.apache.http.osgi.impl;
import static java.lang.String.format; import static java.lang.String.format;
import static java.util.Arrays.asList;
import static org.apache.http.osgi.impl.PropertiesUtils.to; import static org.apache.http.osgi.impl.PropertiesUtils.to;
import java.util.Dictionary; import java.util.Dictionary;
@ -135,7 +136,7 @@ public final class OSGiProxyConfiguration implements ProxyConfiguration {
@Override @Override
public String toString() { public String toString() {
return format("ProxyConfiguration [enabled=%s, hostname=%s, port=%s, username=%s, password=%s, proxyExceptions=%s]", return format("ProxyConfiguration [enabled=%s, hostname=%s, port=%s, username=%s, password=%s, proxyExceptions=%s]",
proxyExceptions, enabled, hostname, port, username, password, proxyExceptions); enabled, hostname, port, username, password, asList(proxyExceptions));
} }
} }

View File

@ -0,0 +1,61 @@
/*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.http.osgi.impl;
import org.junit.Test;
import java.util.Dictionary;
import java.util.Hashtable;
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertThat;
public class OSGiProxyConfigurationTest {
@Test
public void testToString() {
final Dictionary<String, Object> config = new Hashtable<>();
config.put("proxy.enabled", false);
config.put("proxy.host", "h");
config.put("proxy.port", 1);
config.put("proxy.username", "u");
config.put("proxy.password", "p");
config.put("proxy.exceptions", new String[]{"e"});
final OSGiProxyConfiguration configuration = new OSGiProxyConfiguration();
configuration.update(config);
final String string = configuration.toString();
assertThat(string, containsString("enabled=false"));
assertThat(string, containsString("hostname=h"));
assertThat(string, containsString("port=1"));
assertThat(string, containsString("username=u"));
assertThat(string, containsString("password=p"));
assertThat(string, containsString("proxyExceptions=[e]"));
}
}