Skip to content
This repository was archived by the owner on Apr 22, 2025. It is now read-only.

Commit 1865ed8

Browse files
cr22rccr22rc
committed
FABJ-404 Application set Executor Service
Change-Id: Ic33e97243e3aec20e618b40c51f007dbada09487 Signed-off-by: rickr <cr22rc@gmail.com>
1 parent d9608f2 commit 1865ed8

File tree

3 files changed

+128
-33
lines changed

3 files changed

+128
-33
lines changed

‎src/main/java/org/hyperledger/fabric/sdk/HFClient.java‎

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class HFClient {
5454
private static final Config config = Config.getConfig(); // never remove this! config needs to load first.
5555

5656
private CryptoSuite cryptoSuite;
57-
protected final ExecutorService executorService;
57+
protected ExecutorService executorService;
5858

5959
static {
6060

@@ -67,6 +67,21 @@ public class HFClient {
6767
}
6868

6969
ExecutorService getExecutorService() {
70+
if (null == executorService) {
71+
synchronized (this) { //was null so lets get a lock for safe update.
72+
if (null == executorService) { // no other thread has done it ...
73+
executorService = new ThreadPoolExecutor(CLIENT_THREAD_EXECUTOR_COREPOOLSIZE, CLIENT_THREAD_EXECUTOR_MAXIMUMPOOLSIZE,
74+
CLIENT_THREAD_EXECUTOR_KEEPALIVETIME, CLIENT_THREAD_EXECUTOR_KEEPALIVETIMEUNIT,
75+
new SynchronousQueue<Runnable>(),
76+
r -> {
77+
Thread t = threadFactory.newThread(r);
78+
t.setDaemon(true);
79+
return t;
80+
});
81+
}
82+
}
83+
84+
}
7085
return executorService;
7186
}
7287

@@ -88,16 +103,6 @@ public User getUserContext() {
88103
private static final TimeUnit CLIENT_THREAD_EXECUTOR_KEEPALIVETIMEUNIT = config.getClientThreadExecutorKeepAliveTimeUnit();
89104

90105
private HFClient() {
91-
92-
executorService = new ThreadPoolExecutor(CLIENT_THREAD_EXECUTOR_COREPOOLSIZE, CLIENT_THREAD_EXECUTOR_MAXIMUMPOOLSIZE,
93-
CLIENT_THREAD_EXECUTOR_KEEPALIVETIME, CLIENT_THREAD_EXECUTOR_KEEPALIVETIMEUNIT,
94-
new SynchronousQueue<Runnable>(),
95-
r -> {
96-
Thread t = threadFactory.newThread(r);
97-
t.setDaemon(true);
98-
return t;
99-
});
100-
101106
}
102107

103108
public CryptoSuite getCryptoSuite() {
@@ -112,18 +117,31 @@ public void setCryptoSuite(CryptoSuite cryptoSuite) throws CryptoException, Inva
112117
throw new InvalidArgumentException("CryptoSuite may only be set once.");
113118

114119
}
115-
// if (cryptoSuiteFactory == null) {
116-
// cryptoSuiteFactory = cryptoSuite.getCryptoSuiteFactory();
117-
// } else {
118-
// if (cryptoSuiteFactory != cryptoSuite.getCryptoSuiteFactory()) {
119-
// throw new InvalidArgumentException("CryptoSuite is not derivied from cryptosuite factory");
120-
// }
121-
// }
122120

123121
this.cryptoSuite = cryptoSuite;
124122

125123
}
126124

125+
/**
126+
* Set executor service Applications need to set the executor service prior to doing any other operations on the client.
127+
*
128+
* @param executorService The executor service the application wants to use.
129+
* @throws InvalidArgumentException if executor service has been set already.
130+
*/
131+
132+
public synchronized void setExecutorService(ExecutorService executorService) throws InvalidArgumentException {
133+
134+
if (executorService == null) {
135+
throw new InvalidArgumentException("Executor service can not be null.");
136+
}
137+
if (this.executorService != null && this.executorService != executorService) {
138+
throw new InvalidArgumentException("Executor service has already been set.");
139+
}
140+
141+
this.executorService = executorService;
142+
143+
}
144+
127145
/**
128146
* createNewInstance create a new instance of the HFClient
129147
*

‎src/test/java/org/hyperledger/fabric/sdk/ClientTest.java‎

Lines changed: 92 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414

1515
package org.hyperledger.fabric.sdk;
1616

17+
import java.util.concurrent.Executors;
18+
import java.util.concurrent.SynchronousQueue;
19+
import java.util.concurrent.ThreadPoolExecutor;
20+
import java.util.concurrent.TimeUnit;
1721

1822
import org.hyperledger.fabric.sdk.exception.InvalidArgumentException;
1923
import org.hyperledger.fabric.sdk.helper.Config;
@@ -26,6 +30,7 @@
2630
import org.junit.Test;
2731

2832
import static org.hyperledger.fabric.sdk.testutils.TestUtils.resetConfig;
33+
import static org.junit.Assert.assertSame;
2934

3035
public class ClientTest {
3136
private static final String CHANNEL_NAME = "channel1";
@@ -34,7 +39,6 @@ public class ClientTest {
3439
private static final String USER_NAME = "MockMe";
3540
private static final String USER_MSP_ID = "MockMSPID";
3641

37-
3842
@BeforeClass
3943
public static void setupClient() throws Exception {
4044
try {
@@ -60,7 +64,7 @@ public void testNewChannel() {
6064
}
6165
}
6266

63-
@Test(expected = InvalidArgumentException.class)
67+
@Test (expected = InvalidArgumentException.class)
6468
public void testSetNullChannel() throws InvalidArgumentException {
6569
hfclient.newChannel(null);
6670
Assert.fail("Expected null channel to throw exception.");
@@ -77,7 +81,7 @@ public void testNewPeer() {
7781
}
7882
}
7983

80-
@Test(expected = InvalidArgumentException.class)
84+
@Test (expected = InvalidArgumentException.class)
8185
public void testBadURL() throws InvalidArgumentException {
8286
hfclient.newPeer("peer_", " ");
8387
Assert.fail("Expected peer with no channel throw exception");
@@ -94,13 +98,13 @@ public void testNewOrderer() {
9498
}
9599
}
96100

97-
@Test(expected = InvalidArgumentException.class)
101+
@Test (expected = InvalidArgumentException.class)
98102
public void testBadAddress() throws InvalidArgumentException {
99103
hfclient.newOrderer("xx", "xxxxxx");
100104
Assert.fail("Orderer allowed setting bad URL.");
101105
}
102106

103-
@Test(expected = InvalidArgumentException.class)
107+
@Test (expected = InvalidArgumentException.class)
104108
public void testBadCryptoSuite() throws InvalidArgumentException {
105109
HFClient.createNewInstance()
106110
.newOrderer("xx", "xxxxxx");
@@ -117,7 +121,7 @@ public void testGoodMockUser() throws Exception {
117121

118122
}
119123

120-
@Test(expected = InvalidArgumentException.class)
124+
@Test (expected = InvalidArgumentException.class)
121125
public void testBadUserContextNull() throws Exception {
122126
HFClient client = HFClient.createNewInstance();
123127
client.setCryptoSuite(CryptoSuite.Factory.getCryptoSuite());
@@ -126,7 +130,7 @@ public void testBadUserContextNull() throws Exception {
126130

127131
}
128132

129-
@Test(expected = InvalidArgumentException.class)
133+
@Test (expected = InvalidArgumentException.class)
130134
public void testBadUserNameNull() throws Exception {
131135
HFClient client = HFClient.createNewInstance();
132136
client.setCryptoSuite(CryptoSuite.Factory.getCryptoSuite());
@@ -137,7 +141,7 @@ public void testBadUserNameNull() throws Exception {
137141

138142
}
139143

140-
@Test(expected = InvalidArgumentException.class)
144+
@Test (expected = InvalidArgumentException.class)
141145
public void testBadUserNameEmpty() throws Exception {
142146
HFClient client = HFClient.createNewInstance();
143147
client.setCryptoSuite(CryptoSuite.Factory.getCryptoSuite());
@@ -148,7 +152,7 @@ public void testBadUserNameEmpty() throws Exception {
148152

149153
}
150154

151-
@Test(expected = InvalidArgumentException.class)
155+
@Test (expected = InvalidArgumentException.class)
152156
public void testBadUserMSPIDNull() throws Exception {
153157
HFClient client = HFClient.createNewInstance();
154158
client.setCryptoSuite(CryptoSuite.Factory.getCryptoSuite());
@@ -159,7 +163,7 @@ public void testBadUserMSPIDNull() throws Exception {
159163

160164
}
161165

162-
@Test(expected = InvalidArgumentException.class)
166+
@Test (expected = InvalidArgumentException.class)
163167
public void testBadUserMSPIDEmpty() throws Exception {
164168
HFClient client = HFClient.createNewInstance();
165169
client.setCryptoSuite(CryptoSuite.Factory.getCryptoSuite());
@@ -170,7 +174,7 @@ public void testBadUserMSPIDEmpty() throws Exception {
170174

171175
}
172176

173-
@Test(expected = InvalidArgumentException.class)
177+
@Test (expected = InvalidArgumentException.class)
174178
public void testBadEnrollmentNull() throws Exception {
175179
HFClient client = HFClient.createNewInstance();
176180
client.setCryptoSuite(CryptoSuite.Factory.getCryptoSuite());
@@ -182,7 +186,7 @@ public void testBadEnrollmentNull() throws Exception {
182186

183187
}
184188

185-
@Test(expected = InvalidArgumentException.class)
189+
@Test (expected = InvalidArgumentException.class)
186190
public void testBadEnrollmentBadCert() throws Exception {
187191
HFClient client = HFClient.createNewInstance();
188192
client.setCryptoSuite(CryptoSuite.Factory.getCryptoSuite());
@@ -196,12 +200,11 @@ public void testBadEnrollmentBadCert() throws Exception {
196200

197201
}
198202

199-
@Test(expected = InvalidArgumentException.class)
203+
@Test (expected = InvalidArgumentException.class)
200204
public void testBadEnrollmentBadKey() throws Exception {
201205
HFClient client = HFClient.createNewInstance();
202206
client.setCryptoSuite(CryptoSuite.Factory.getCryptoSuite());
203207

204-
205208
MockUser mockUser = TestUtils.getMockUser(USER_NAME, USER_MSP_ID);
206209

207210
Enrollment mockEnrollment = TestUtils.getMockEnrollment(null, "mockCert");
@@ -211,6 +214,81 @@ public void testBadEnrollmentBadKey() throws Exception {
211214

212215
}
213216

217+
@Test
218+
public void testExecutorset() throws Exception {
219+
220+
hfclient = TestHFClient.newInstance();
221+
// ThreadPoolExecutor threadPoolExecutor = ThreadPoolExecutor()
222+
ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(10, 100,
223+
40, TimeUnit.valueOf("MILLISECONDS"),
224+
new SynchronousQueue<Runnable>(),
225+
r -> {
226+
Thread t = Executors.defaultThreadFactory().newThread(r);
227+
t.setDaemon(true);
228+
return t;
229+
});
230+
231+
hfclient.setExecutorService(threadPoolExecutor);
232+
assertSame(threadPoolExecutor, hfclient.getExecutorService());
233+
Channel mychannel = hfclient.newChannel("mychannel");
234+
assertSame(threadPoolExecutor, mychannel.getExecutorService());
235+
236+
}
237+
238+
@Test (expected = InvalidArgumentException.class)
239+
public void testExecutorsetAgain() throws Exception {
240+
241+
hfclient = TestHFClient.newInstance();
242+
243+
ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(10, 100,
244+
40, TimeUnit.valueOf("MILLISECONDS"),
245+
new SynchronousQueue<Runnable>(),
246+
r -> {
247+
Thread t = Executors.defaultThreadFactory().newThread(r);
248+
t.setDaemon(true);
249+
return t;
250+
});
251+
252+
hfclient.setExecutorService(threadPoolExecutor);
253+
assertSame(threadPoolExecutor, hfclient.getExecutorService());
254+
ThreadPoolExecutor threadPoolExecutor2 = new ThreadPoolExecutor(10, 100,
255+
40, TimeUnit.valueOf("MILLISECONDS"),
256+
new SynchronousQueue<Runnable>(),
257+
r -> {
258+
Thread t = Executors.defaultThreadFactory().newThread(r);
259+
t.setDaemon(true);
260+
return t;
261+
});
262+
hfclient.setExecutorService(threadPoolExecutor2);
263+
}
264+
265+
@Test (expected = InvalidArgumentException.class)
266+
public void testExecutorDefaultSet() throws Exception {
267+
268+
hfclient = TestHFClient.newInstance();
269+
270+
ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(10, 100,
271+
40, TimeUnit.valueOf("MILLISECONDS"),
272+
new SynchronousQueue<Runnable>(),
273+
r -> {
274+
Thread t = Executors.defaultThreadFactory().newThread(r);
275+
t.setDaemon(true);
276+
return t;
277+
});
278+
279+
Channel badisme = hfclient.newChannel("badisme");
280+
badisme.getExecutorService();
281+
hfclient.setExecutorService(threadPoolExecutor);
282+
}
283+
284+
@Test (expected = InvalidArgumentException.class)
285+
public void testExecutorsetNULL() throws Exception {
286+
287+
hfclient = TestHFClient.newInstance();
288+
289+
hfclient.setExecutorService(null);
290+
}
291+
214292
@Test //(expected = InvalidArgumentException.class)
215293
@Ignore
216294
public void testCryptoFactory() throws Exception {

‎src/test/java/org/hyperledger/fabric/sdk/TestHFClient.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public static HFClient newInstance() throws Exception {
4343
}
4444

4545
public static void setupClient(HFClient hfclient) throws Exception {
46-
CryptoSuite cryptoSuite = CryptoSuite.Factory.getCryptoSuite();
4746

4847
File tempFile = File.createTempFile("teststore", "properties");
4948
tempFile.deleteOnExit();

0 commit comments

Comments
 (0)