Skip to content

Commit e7698f3

Browse files
committed
added some extra constructors, JavaDoc
1 parent b413a22 commit e7698f3

File tree

1 file changed

+45
-5
lines changed

1 file changed

+45
-5
lines changed

pkix/src/main/java/org/bouncycastle/est/jcajce/JsseESTServiceBuilder.java

+45-5
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,22 @@ public class JsseESTServiceBuilder
3232
protected SSLSocketFactoryCreatorBuilder sslSocketFactoryCreatorBuilder;
3333
protected boolean filterCipherSuites = true;
3434

35+
/**
36+
* Create a builder for a client using a custom SSLSocketFactoryCreator.
37+
*
38+
* @param hostName hostName to talk to.
39+
* @param socketFactoryCreator a custom creator of socket factories.
40+
*/
41+
public JsseESTServiceBuilder(String hostName, int portNo, SSLSocketFactoryCreator socketFactoryCreator)
42+
{
43+
super(hostName + ":" + portNo);
44+
if (socketFactoryCreator == null)
45+
{
46+
throw new NullPointerException("No socket factory creator.");
47+
}
48+
this.socketFactoryCreator = socketFactoryCreator;
49+
}
50+
3551
/**
3652
* Create a builder for a client using a custom SSLSocketFactoryCreator.
3753
*
@@ -46,7 +62,6 @@ public JsseESTServiceBuilder(String server, SSLSocketFactoryCreator socketFactor
4662
throw new NullPointerException("No socket factory creator.");
4763
}
4864
this.socketFactoryCreator = socketFactoryCreator;
49-
5065
}
5166

5267
/**
@@ -60,28 +75,53 @@ public JsseESTServiceBuilder(String server)
6075
sslSocketFactoryCreatorBuilder = new SSLSocketFactoryCreatorBuilder(JcaJceUtils.getTrustAllTrustManager());
6176
}
6277

78+
/**
79+
* Create a builder for a client talking to a trusted server.
80+
*
81+
* @param hostName name of the server to talk to.
82+
* @param portNo port number to connect on.
83+
* @param trustManager trust manager to be used for validating the connection.
84+
*/
85+
public JsseESTServiceBuilder(String hostName, int portNo, X509TrustManager trustManager)
86+
{
87+
super(hostName + ":" + portNo);
88+
sslSocketFactoryCreatorBuilder = new SSLSocketFactoryCreatorBuilder(trustManager);
89+
}
90+
6391
/**
6492
* Create a builder for a client talking to a trusted server.
6593
*
6694
* @param server name of the server to talk to (URL format).
67-
* @param trustManager
95+
* @param trustManager trust manager to be used for validating the connection.
6896
*/
6997
public JsseESTServiceBuilder(String server, X509TrustManager trustManager)
7098
{
7199
super(server);
72100
sslSocketFactoryCreatorBuilder = new SSLSocketFactoryCreatorBuilder(trustManager);
73101
}
74102

103+
/**
104+
* Create a builder for a client talking to a trusted server.
105+
*
106+
* @param hostName name of the server to talk to.
107+
* @param portNo port number to connect on.
108+
* @param trustManagers trust managers that can be used for validating the connection.
109+
*/
110+
public JsseESTServiceBuilder(String hostName, int portNo, X509TrustManager[] trustManagers)
111+
{
112+
this(hostName + ":" + portNo, trustManagers);
113+
}
114+
75115
/**
76116
* Create a builder for a client talking to a trusted server.
77117
*
78118
* @param server name of the server to talk to (URL format).
79-
* @param trustManager
119+
* @param trustManagers trust managers that can be used for validating the connection.
80120
*/
81-
public JsseESTServiceBuilder(String server, X509TrustManager[] trustManager)
121+
public JsseESTServiceBuilder(String server, X509TrustManager[] trustManagers)
82122
{
83123
super(server);
84-
sslSocketFactoryCreatorBuilder = new SSLSocketFactoryCreatorBuilder(trustManager);
124+
sslSocketFactoryCreatorBuilder = new SSLSocketFactoryCreatorBuilder(trustManagers);
85125
}
86126

87127
public JsseESTServiceBuilder withHostNameAuthorizer(JsseHostnameAuthorizer hostNameAuthorizer)

0 commit comments

Comments
 (0)