Skip to content

Commit cc37a43

Browse files
scottfscottf
authored
options builder aroc (#835)
1 parent 48ed141 commit cc37a43

File tree

2 files changed

+68
-69
lines changed

2 files changed

+68
-69
lines changed

‎src/main/java/io/nats/client/Options.java‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -565,25 +565,24 @@ public Thread newThread(Runnable r) {
565565
}
566566
}
567567

568+
// ----------------------------------------------------------------------------------------------------
569+
// BUILDER
570+
// ----------------------------------------------------------------------------------------------------
568571
/**
569-
* Options are created using a Builder. The builder supports chaining and will
570-
* create a default set of options if no methods are calls. The builder can also
571-
* be created from a properties object using the property names defined with the
572-
* prefix PROP_ in this class.
573-
*
574-
* <p>{@code new Options.Builder().build()}}.
575-
*
576-
* <p>A common usage for testing might be {@code new Options.Builder().server(myserverurl).noReconnect.build()}
577-
*/
578-
579-
/**
580-
* Creates a builder for the options.
572+
* Creates a builder for the options in a fluent style
581573
* @return the builder.
582574
*/
583575
public static Builder builder() {
584576
return new Builder();
585577
}
586578

579+
/**
580+
* Options are created using a Builder. The builder supports chaining and will
581+
* create a default set of options if no methods are calls. The builder can also
582+
* be created from a properties object using the property names defined with the
583+
* prefix PROP_ in this class.
584+
* <p>A common usage for testing might be {@code new Options.Builder().server(myserverurl).noReconnect.build()}
585+
*/
587586
public static class Builder {
588587

589588
// ----------------------------------------------------------------------------------------------------

‎src/test/java/io/nats/service/ServiceTests.java‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -248,10 +248,10 @@ public void testServiceWorkflow() throws Exception {
248248
StatsResponse sr = (StatsResponse)response;
249249
assertEquals(exp.getStarted(), sr.getStarted());
250250
for (int x = 0; x < 3; x++) {
251-
EndpointResponse es = exp.getEndpointStats().get(x);
252-
if (!es.getName().equals(ECHO_ENDPOINT_NAME)) {
251+
EndpointResponse er = exp.getEndpointStats().get(x);
252+
if (!er.getName().equals(ECHO_ENDPOINT_NAME)) {
253253
// echo endpoint has data that will vary
254-
assertEquals(es, sr.getEndpointStats().get(x));
254+
assertEquals(er, sr.getEndpointStats().get(x));
255255
}
256256
}
257257
};
@@ -270,19 +270,19 @@ public void testServiceWorkflow() throws Exception {
270270
StatsResponse sr = service1.getStatsResponse();
271271
assertTrue(zdt.isBefore(sr.getStarted()));
272272
for (int x = 0; x < 3; x++) {
273-
EndpointResponse es = sr.getEndpointStats().get(x);
274-
assertEquals(0, es.getNumRequests());
275-
assertEquals(0, es.getNumErrors());
276-
assertEquals(0, es.getProcessingTime());
277-
assertEquals(0, es.getAverageProcessingTime());
278-
assertNull(es.getLastError());
279-
if (es.getName().equals(ECHO_ENDPOINT_NAME)) {
280-
assertNotNull(es.getData());
273+
EndpointResponse er = sr.getEndpointStats().get(x);
274+
assertEquals(0, er.getNumRequests());
275+
assertEquals(0, er.getNumErrors());
276+
assertEquals(0, er.getProcessingTime());
277+
assertEquals(0, er.getAverageProcessingTime());
278+
assertNull(er.getLastError());
279+
if (er.getName().equals(ECHO_ENDPOINT_NAME)) {
280+
assertNotNull(er.getData());
281281
}
282282
else {
283-
assertNull(es.getData());
283+
assertNull(er.getData());
284284
}
285-
assertTrue(zdt.isBefore(es.getStarted()));
285+
assertTrue(zdt.isBefore(er.getStarted()));
286286
}
287287

288288
// shutdown
@@ -615,10 +615,10 @@ public void testHandlerException() throws Exception {
615615
assertEquals("java.lang.RuntimeException: handler-problem", m.getHeaders().getFirst(NATS_SERVICE_ERROR));
616616
assertEquals("500", m.getHeaders().getFirst(NATS_SERVICE_ERROR_CODE));
617617
StatsResponse sr = exService.getStatsResponse();
618-
EndpointResponse es = sr.getEndpointStats().get(0);
619-
assertEquals(1, es.getNumRequests());
620-
assertEquals(1, es.getNumErrors());
621-
assertEquals("java.lang.RuntimeException: handler-problem", es.getLastError());
618+
EndpointResponse er = sr.getEndpointStats().get(0);
619+
assertEquals(1, er.getNumRequests());
620+
assertEquals(1, er.getNumErrors());
621+
assertEquals("java.lang.RuntimeException: handler-problem", er.getLastError());
622622
});
623623
}
624624

@@ -870,31 +870,31 @@ public void testEndpointResponseConstruction() {
870870
.verify();
871871
ZonedDateTime zdt = DateTimeUtils.gmtNow();
872872

873-
EndpointResponse es = new EndpointResponse("name", "subject", 0, 0, 0, null, null, zdt);
874-
assertEquals("name", es.getName());
875-
assertEquals("subject", es.getSubject());
876-
assertNull(es.getSchema());
877-
assertNull(es.getLastError());
878-
assertNull(es.getData());
879-
assertEquals(0, es.getNumRequests());
880-
assertEquals(0, es.getNumErrors());
881-
assertEquals(0, es.getProcessingTime());
882-
assertEquals(0, es.getAverageProcessingTime());
883-
assertEquals(zdt, es.getStarted());
884-
885-
es = new EndpointResponse("name", "subject", 2, 4, 10, "lastError", data, zdt);
886-
assertEquals("name", es.getName());
887-
assertEquals("subject", es.getSubject());
888-
assertNull(es.getSchema());
889-
assertEquals("lastError", es.getLastError());
890-
assertEquals("\"data\"", es.getData().toString());
891-
assertEquals(2, es.getNumRequests());
892-
assertEquals(4, es.getNumErrors());
893-
assertEquals(10, es.getProcessingTime());
894-
assertEquals(5, es.getAverageProcessingTime());
895-
assertEquals(zdt, es.getStarted());
896-
897-
String j = es.toJson();
873+
EndpointResponse er = new EndpointResponse("name", "subject", 0, 0, 0, null, null, zdt);
874+
assertEquals("name", er.getName());
875+
assertEquals("subject", er.getSubject());
876+
assertNull(er.getSchema());
877+
assertNull(er.getLastError());
878+
assertNull(er.getData());
879+
assertEquals(0, er.getNumRequests());
880+
assertEquals(0, er.getNumErrors());
881+
assertEquals(0, er.getProcessingTime());
882+
assertEquals(0, er.getAverageProcessingTime());
883+
assertEquals(zdt, er.getStarted());
884+
885+
er = new EndpointResponse("name", "subject", 2, 4, 10, "lastError", data, zdt);
886+
assertEquals("name", er.getName());
887+
assertEquals("subject", er.getSubject());
888+
assertNull(er.getSchema());
889+
assertEquals("lastError", er.getLastError());
890+
assertEquals("\"data\"", er.getData().toString());
891+
assertEquals(2, er.getNumRequests());
892+
assertEquals(4, er.getNumErrors());
893+
assertEquals(10, er.getProcessingTime());
894+
assertEquals(5, er.getAverageProcessingTime());
895+
assertEquals(zdt, er.getStarted());
896+
897+
String j = er.toJson();
898898
assertTrue(j.startsWith("{"));
899899
assertTrue(j.contains("\"name\":\"name\""));
900900
assertTrue(j.contains("\"subject\":\"subject\""));
@@ -905,22 +905,22 @@ public void testEndpointResponseConstruction() {
905905
assertTrue(j.contains("\"num_errors\":4"));
906906
assertTrue(j.contains("\"processing_time\":10"));
907907
assertTrue(j.contains("\"average_processing_time\":5"));
908-
assertEquals(toKey(EndpointResponse.class) + j, es.toString());
908+
assertEquals(toKey(EndpointResponse.class) + j, er.toString());
909909

910910
Schema schema = new Schema("req", "res");
911-
es = new EndpointResponse("name", "subject", schema);
912-
assertEquals("name", es.getName());
913-
assertEquals("subject", es.getSubject());
914-
assertEquals(schema, es.getSchema());
915-
assertNull(es.getLastError());
916-
assertNull(es.getData());
917-
assertEquals(0, es.getNumRequests());
918-
assertEquals(0, es.getNumErrors());
919-
assertEquals(0, es.getProcessingTime());
920-
assertEquals(0, es.getAverageProcessingTime());
921-
assertNull(es.getStarted());
922-
923-
j = es.toJson();
911+
er = new EndpointResponse("name", "subject", schema);
912+
assertEquals("name", er.getName());
913+
assertEquals("subject", er.getSubject());
914+
assertEquals(schema, er.getSchema());
915+
assertNull(er.getLastError());
916+
assertNull(er.getData());
917+
assertEquals(0, er.getNumRequests());
918+
assertEquals(0, er.getNumErrors());
919+
assertEquals(0, er.getProcessingTime());
920+
assertEquals(0, er.getAverageProcessingTime());
921+
assertNull(er.getStarted());
922+
923+
j = er.toJson();
924924
assertTrue(j.startsWith("{"));
925925
assertTrue(j.contains("\"name\":\"name\""));
926926
assertTrue(j.contains("\"subject\":\"subject\""));
@@ -931,7 +931,7 @@ public void testEndpointResponseConstruction() {
931931
assertFalse(j.contains("\"num_errors\":"));
932932
assertFalse(j.contains("\"processing_time\":"));
933933
assertFalse(j.contains("\"average_processing_time\":"));
934-
assertEquals(toKey(EndpointResponse.class) + j, es.toString());
934+
assertEquals(toKey(EndpointResponse.class) + j, er.toString());
935935
}
936936

937937
@Test

0 commit comments

Comments
 (0)