Remove some boilerplate.

dangerousben · dangerousben · commit 19ce1727f525 · 2019-08-15T16:27:28.000+01:00
diff --git a/src/main/java/com/timgroup/statsd/NonBlockingStatsDClient.java b/src/main/java/com/timgroup/statsd/NonBlockingStatsDClient.java
@@ -760,7 +760,7 @@ String tagString(final String[] tags) {
      */
     @Override
     public void count(final String aspect, final long delta, final String... tags) {
-        send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(delta).append("|c").append(tagString(tags)).toString());
+        send(aspect, tags, Long.toString(delta), "|c");
     }
 
     /**
@@ -771,7 +771,7 @@ public void count(final String aspect, final long delta, final double sampleRate
     	if(isInvalidSample(sampleRate)) {
     		return;
     	}
-        send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(delta).append("|c|@").append(SAMPLE_RATE_FORMATTERS.get().format(sampleRate)).append(tagString(tags)).toString());
+        send(aspect, tags, Long.toString(delta), "|c|@", SAMPLE_RATE_FORMATTERS.get().format(sampleRate));
     }
 
     /**
@@ -788,7 +788,7 @@ public void count(final String aspect, final long delta, final double sampleRate
      */
     @Override
     public void count(final String aspect, final double delta, final String... tags) {
-        send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(NUMBER_FORMATTERS.get().format(delta)).append("|c").append(tagString(tags)).toString());
+        send(aspect, tags, NUMBER_FORMATTERS.get().format(delta), "|c");
     }
 
     /**
@@ -799,7 +799,7 @@ public void count(final String aspect, final double delta, final double sampleRa
         if(isInvalidSample(sampleRate)) {
             return;
         }
-        send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(NUMBER_FORMATTERS.get().format(delta)).append("|c|@").append(SAMPLE_RATE_FORMATTERS.get().format(sampleRate)).append(tagString(tags)).toString());
+        send(aspect, tags, NUMBER_FORMATTERS.get().format(delta), "|c|@", SAMPLE_RATE_FORMATTERS.get().format(sampleRate));
     }
 
     /**
@@ -896,7 +896,7 @@ public void decrement(final String aspect, final double sampleRate, final String
     public void recordGaugeValue(final String aspect, final double value, final String... tags) {
         /* Intentionally using %s rather than %f here to avoid
          * padding with extra 0s to represent precision */
-        send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(NUMBER_FORMATTERS.get().format(value)).append("|g").append(tagString(tags)).toString());
+        send(aspect, tags, NUMBER_FORMATTERS.get().format(value), "|g");
     }
 
     /**
@@ -907,7 +907,7 @@ public void recordGaugeValue(final String aspect, final double value, final doub
     	if(isInvalidSample(sampleRate)) {
     		return;
     	}
-        send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(NUMBER_FORMATTERS.get().format(value)).append("|g|@").append(SAMPLE_RATE_FORMATTERS.get().format(sampleRate)).append(tagString(tags)).toString());
+        send(aspect, tags, NUMBER_FORMATTERS.get().format(value), "|g|@", SAMPLE_RATE_FORMATTERS.get().format(sampleRate));
     }
 
     /**
@@ -941,7 +941,7 @@ public void gauge(final String aspect, final double value, final double sampleRa
      */
     @Override
     public void recordGaugeValue(final String aspect, final long value, final String... tags) {
-        send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(value).append("|g").append(tagString(tags)).toString());
+        send(aspect, tags, Long.toString(value), "|g");
     }
 
     /**
@@ -952,7 +952,7 @@ public void recordGaugeValue(final String aspect, final long value, final double
     	if(isInvalidSample(sampleRate)) {
     		return;
     	}
-        send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(value).append("|g|@").append(SAMPLE_RATE_FORMATTERS.get().format(sampleRate)).append(tagString(tags)).toString());
+        send(aspect, tags, Long.toString(value), "|g|@", SAMPLE_RATE_FORMATTERS.get().format(sampleRate));
     }
 
     /**
@@ -985,7 +985,7 @@ public void gauge(final String aspect, final long value, final double sampleRate
      */
     @Override
     public void recordExecutionTime(final String aspect, final long timeInMs, final String... tags) {
-        send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(timeInMs).append("|ms").append(tagString(tags)).toString());
+        send(aspect, tags, Long.toString(timeInMs), "|ms");
     }
 
     /**
@@ -996,7 +996,7 @@ public void recordExecutionTime(final String aspect, final long timeInMs, final
     	if(isInvalidSample(sampleRate)) {
     		return;
     	}
-        send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(timeInMs).append("|ms|@").append(SAMPLE_RATE_FORMATTERS.get().format(sampleRate)).append(tagString(tags)).toString());
+        send(aspect, tags, Long.toString(timeInMs), "|ms|@", SAMPLE_RATE_FORMATTERS.get().format(sampleRate));
     }
 
     /**
@@ -1031,7 +1031,7 @@ public void time(final String aspect, final long value, final double sampleRate,
     public void recordHistogramValue(final String aspect, final double value, final String... tags) {
         /* Intentionally using %s rather than %f here to avoid
          * padding with extra 0s to represent precision */
-        send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(NUMBER_FORMATTERS.get().format(value)).append("|h").append(tagString(tags)).toString());
+        send(aspect, tags, NUMBER_FORMATTERS.get().format(value), "|h");
     }
 
     /**
@@ -1044,7 +1044,7 @@ public void recordHistogramValue(final String aspect, final double value, final
     	}
     	  /* Intentionally using %s rather than %f here to avoid
     	   * padding with extra 0s to represent precision */
-        send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(NUMBER_FORMATTERS.get().format(value)).append("|h|@").append(SAMPLE_RATE_FORMATTERS.get().format(sampleRate)).append(tagString(tags)).toString());
+        send(aspect, tags, NUMBER_FORMATTERS.get().format(value), "|h|@", SAMPLE_RATE_FORMATTERS.get().format(sampleRate));
     }
 
     /**
@@ -1077,7 +1077,7 @@ public void histogram(final String aspect, final double value, final double samp
      */
     @Override
     public void recordHistogramValue(final String aspect, final long value, final String... tags) {
-        send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(value).append("|h").append(tagString(tags)).toString());
+        send(aspect, tags, Long.toString(value), "|h");
     }
 
     /**
@@ -1088,7 +1088,7 @@ public void recordHistogramValue(final String aspect, final long value, final do
     	if(isInvalidSample(sampleRate)) {
     		return;
     	}
-        send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(value).append("|h|@").append(SAMPLE_RATE_FORMATTERS.get().format(sampleRate)).append(tagString(tags)).toString());
+        send(aspect, tags, Long.toString(value), "|h|@", SAMPLE_RATE_FORMATTERS.get().format(sampleRate));
     }
 
     /**
@@ -1125,7 +1125,7 @@ public void histogram(final String aspect, final long value, final double sample
     public void recordDistributionValue(final String aspect, final double value, final String... tags) {
         /* Intentionally using %s rather than %f here to avoid
          * padding with extra 0s to represent precision */
-        send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(NUMBER_FORMATTERS.get().format(value)).append("|d").append(tagString(tags)).toString());
+        send(aspect, tags, NUMBER_FORMATTERS.get().format(value), "|d");
     }
 
     /**
@@ -1138,7 +1138,7 @@ public void recordDistributionValue(final String aspect, final double value, fin
     	}
     	  /* Intentionally using %s rather than %f here to avoid
     	   * padding with extra 0s to represent precision */
-        send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(NUMBER_FORMATTERS.get().format(value)).append("|d|@").append(SAMPLE_RATE_FORMATTERS.get().format(sampleRate)).append(tagString(tags)).toString());
+        send(aspect, tags, NUMBER_FORMATTERS.get().format(value), "|d|@", SAMPLE_RATE_FORMATTERS.get().format(sampleRate));
     }
 
     /**
@@ -1172,7 +1172,7 @@ public void distribution(final String aspect, final double value, final double s
      */
     @Override
     public void recordDistributionValue(final String aspect, final long value, final String... tags) {
-        send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(value).append("|d").append(tagString(tags)).toString());
+        send(aspect, tags, Long.toString(value), "|d");
     }
 
     /**
@@ -1183,7 +1183,7 @@ public void recordDistributionValue(final String aspect, final long value, final
     	if(isInvalidSample(sampleRate)) {
     		return;
     	}
-        send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(value).append("|d|@").append(SAMPLE_RATE_FORMATTERS.get().format(sampleRate)).append(tagString(tags)).toString());
+        send(aspect, tags, Long.toString(value), "|d|@", SAMPLE_RATE_FORMATTERS.get().format(sampleRate));
     }
 
     /**
@@ -1390,6 +1390,15 @@ public void recordSetValue(final String aspect, final String value, final String
         send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(value).append("|s").append(tagString(tags)).toString());
     }
 
+    private void send(final String aspect, final String[] tags, final String... data) {
+        final StringBuilder builder = new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":");
+        for (final String d : data) {
+            builder.append(d);
+        }
+        builder.append(tagString(tags));
+        send(builder.toString());
+    }
+
     private void send(final String message) {
         statsDSender.send(message);
     }

Original file line number	Diff line number	Diff line change
`@@ -760,7 +760,7 @@ String tagString(final String[] tags) {`
`760`	`760`	`*/`
`761`	`761`	`@Override`
`762`	`762`	`public void count(final String aspect, final long delta, final String... tags) {`
`763`		`- send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(delta).append("\|c").append(tagString(tags)).toString());`
	`763`	`+ send(aspect, tags, Long.toString(delta), "\|c");`
`764`	`764`	`}`
`765`	`765`
`766`	`766`	`/**`
`@@ -771,7 +771,7 @@ public void count(final String aspect, final long delta, final double sampleRate`
`771`	`771`	`if(isInvalidSample(sampleRate)) {`
`772`	`772`	`return;`
`773`	`773`	`}`
`774`		`- send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(delta).append("\|c\|@").append(SAMPLE_RATE_FORMATTERS.get().format(sampleRate)).append(tagString(tags)).toString());`
	`774`	`+ send(aspect, tags, Long.toString(delta), "\|c\|@", SAMPLE_RATE_FORMATTERS.get().format(sampleRate));`
`775`	`775`	`}`
`776`	`776`
`777`	`777`	`/**`
`@@ -788,7 +788,7 @@ public void count(final String aspect, final long delta, final double sampleRate`
`788`	`788`	`*/`
`789`	`789`	`@Override`
`790`	`790`	`public void count(final String aspect, final double delta, final String... tags) {`
`791`		`- send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(NUMBER_FORMATTERS.get().format(delta)).append("\|c").append(tagString(tags)).toString());`
	`791`	`+ send(aspect, tags, NUMBER_FORMATTERS.get().format(delta), "\|c");`
`792`	`792`	`}`
`793`	`793`
`794`	`794`	`/**`
`@@ -799,7 +799,7 @@ public void count(final String aspect, final double delta, final double sampleRa`
`799`	`799`	`if(isInvalidSample(sampleRate)) {`
`800`	`800`	`return;`
`801`	`801`	`}`
`802`		`- send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(NUMBER_FORMATTERS.get().format(delta)).append("\|c\|@").append(SAMPLE_RATE_FORMATTERS.get().format(sampleRate)).append(tagString(tags)).toString());`
	`802`	`+ send(aspect, tags, NUMBER_FORMATTERS.get().format(delta), "\|c\|@", SAMPLE_RATE_FORMATTERS.get().format(sampleRate));`
`803`	`803`	`}`
`804`	`804`
`805`	`805`	`/**`
`@@ -896,7 +896,7 @@ public void decrement(final String aspect, final double sampleRate, final String`
`896`	`896`	`public void recordGaugeValue(final String aspect, final double value, final String... tags) {`
`897`	`897`	`/* Intentionally using %s rather than %f here to avoid`
`898`	`898`	`* padding with extra 0s to represent precision */`
`899`		`- send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(NUMBER_FORMATTERS.get().format(value)).append("\|g").append(tagString(tags)).toString());`
	`899`	`+ send(aspect, tags, NUMBER_FORMATTERS.get().format(value), "\|g");`
`900`	`900`	`}`
`901`	`901`
`902`	`902`	`/**`
`@@ -907,7 +907,7 @@ public void recordGaugeValue(final String aspect, final double value, final doub`
`907`	`907`	`if(isInvalidSample(sampleRate)) {`
`908`	`908`	`return;`
`909`	`909`	`}`
`910`		`- send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(NUMBER_FORMATTERS.get().format(value)).append("\|g\|@").append(SAMPLE_RATE_FORMATTERS.get().format(sampleRate)).append(tagString(tags)).toString());`
	`910`	`+ send(aspect, tags, NUMBER_FORMATTERS.get().format(value), "\|g\|@", SAMPLE_RATE_FORMATTERS.get().format(sampleRate));`
`911`	`911`	`}`
`912`	`912`
`913`	`913`	`/**`
`@@ -941,7 +941,7 @@ public void gauge(final String aspect, final double value, final double sampleRa`
`941`	`941`	`*/`
`942`	`942`	`@Override`
`943`	`943`	`public void recordGaugeValue(final String aspect, final long value, final String... tags) {`
`944`		`- send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(value).append("\|g").append(tagString(tags)).toString());`
	`944`	`+ send(aspect, tags, Long.toString(value), "\|g");`
`945`	`945`	`}`
`946`	`946`
`947`	`947`	`/**`
`@@ -952,7 +952,7 @@ public void recordGaugeValue(final String aspect, final long value, final double`
`952`	`952`	`if(isInvalidSample(sampleRate)) {`
`953`	`953`	`return;`
`954`	`954`	`}`
`955`		`- send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(value).append("\|g\|@").append(SAMPLE_RATE_FORMATTERS.get().format(sampleRate)).append(tagString(tags)).toString());`
	`955`	`+ send(aspect, tags, Long.toString(value), "\|g\|@", SAMPLE_RATE_FORMATTERS.get().format(sampleRate));`
`956`	`956`	`}`
`957`	`957`
`958`	`958`	`/**`
`@@ -985,7 +985,7 @@ public void gauge(final String aspect, final long value, final double sampleRate`
`985`	`985`	`*/`
`986`	`986`	`@Override`
`987`	`987`	`public void recordExecutionTime(final String aspect, final long timeInMs, final String... tags) {`
`988`		`- send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(timeInMs).append("\|ms").append(tagString(tags)).toString());`
	`988`	`+ send(aspect, tags, Long.toString(timeInMs), "\|ms");`
`989`	`989`	`}`
`990`	`990`
`991`	`991`	`/**`
`@@ -996,7 +996,7 @@ public void recordExecutionTime(final String aspect, final long timeInMs, final`
`996`	`996`	`if(isInvalidSample(sampleRate)) {`
`997`	`997`	`return;`
`998`	`998`	`}`
`999`		`- send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(timeInMs).append("\|ms\|@").append(SAMPLE_RATE_FORMATTERS.get().format(sampleRate)).append(tagString(tags)).toString());`
	`999`	`+ send(aspect, tags, Long.toString(timeInMs), "\|ms\|@", SAMPLE_RATE_FORMATTERS.get().format(sampleRate));`
`1000`	`1000`	`}`
`1001`	`1001`
`1002`	`1002`	`/**`
`@@ -1031,7 +1031,7 @@ public void time(final String aspect, final long value, final double sampleRate,`
`1031`	`1031`	`public void recordHistogramValue(final String aspect, final double value, final String... tags) {`
`1032`	`1032`	`/* Intentionally using %s rather than %f here to avoid`
`1033`	`1033`	`* padding with extra 0s to represent precision */`
`1034`		`- send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(NUMBER_FORMATTERS.get().format(value)).append("\|h").append(tagString(tags)).toString());`
	`1034`	`+ send(aspect, tags, NUMBER_FORMATTERS.get().format(value), "\|h");`
`1035`	`1035`	`}`
`1036`	`1036`
`1037`	`1037`	`/**`
`@@ -1044,7 +1044,7 @@ public void recordHistogramValue(final String aspect, final double value, final`
`1044`	`1044`	`}`
`1045`	`1045`	`/* Intentionally using %s rather than %f here to avoid`
`1046`	`1046`	`* padding with extra 0s to represent precision */`
`1047`		`- send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(NUMBER_FORMATTERS.get().format(value)).append("\|h\|@").append(SAMPLE_RATE_FORMATTERS.get().format(sampleRate)).append(tagString(tags)).toString());`
	`1047`	`+ send(aspect, tags, NUMBER_FORMATTERS.get().format(value), "\|h\|@", SAMPLE_RATE_FORMATTERS.get().format(sampleRate));`
`1048`	`1048`	`}`
`1049`	`1049`
`1050`	`1050`	`/**`
`@@ -1077,7 +1077,7 @@ public void histogram(final String aspect, final double value, final double samp`
`1077`	`1077`	`*/`
`1078`	`1078`	`@Override`
`1079`	`1079`	`public void recordHistogramValue(final String aspect, final long value, final String... tags) {`
`1080`		`- send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(value).append("\|h").append(tagString(tags)).toString());`
	`1080`	`+ send(aspect, tags, Long.toString(value), "\|h");`
`1081`	`1081`	`}`
`1082`	`1082`
`1083`	`1083`	`/**`
`@@ -1088,7 +1088,7 @@ public void recordHistogramValue(final String aspect, final long value, final do`
`1088`	`1088`	`if(isInvalidSample(sampleRate)) {`
`1089`	`1089`	`return;`
`1090`	`1090`	`}`
`1091`		`- send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(value).append("\|h\|@").append(SAMPLE_RATE_FORMATTERS.get().format(sampleRate)).append(tagString(tags)).toString());`
	`1091`	`+ send(aspect, tags, Long.toString(value), "\|h\|@", SAMPLE_RATE_FORMATTERS.get().format(sampleRate));`
`1092`	`1092`	`}`
`1093`	`1093`
`1094`	`1094`	`/**`
`@@ -1125,7 +1125,7 @@ public void histogram(final String aspect, final long value, final double sample`
`1125`	`1125`	`public void recordDistributionValue(final String aspect, final double value, final String... tags) {`
`1126`	`1126`	`/* Intentionally using %s rather than %f here to avoid`
`1127`	`1127`	`* padding with extra 0s to represent precision */`
`1128`		`- send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(NUMBER_FORMATTERS.get().format(value)).append("\|d").append(tagString(tags)).toString());`
	`1128`	`+ send(aspect, tags, NUMBER_FORMATTERS.get().format(value), "\|d");`
`1129`	`1129`	`}`
`1130`	`1130`
`1131`	`1131`	`/**`
`@@ -1138,7 +1138,7 @@ public void recordDistributionValue(final String aspect, final double value, fin`
`1138`	`1138`	`}`
`1139`	`1139`	`/* Intentionally using %s rather than %f here to avoid`
`1140`	`1140`	`* padding with extra 0s to represent precision */`
`1141`		`- send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(NUMBER_FORMATTERS.get().format(value)).append("\|d\|@").append(SAMPLE_RATE_FORMATTERS.get().format(sampleRate)).append(tagString(tags)).toString());`
	`1141`	`+ send(aspect, tags, NUMBER_FORMATTERS.get().format(value), "\|d\|@", SAMPLE_RATE_FORMATTERS.get().format(sampleRate));`
`1142`	`1142`	`}`
`1143`	`1143`
`1144`	`1144`	`/**`
`@@ -1172,7 +1172,7 @@ public void distribution(final String aspect, final double value, final double s`
`1172`	`1172`	`*/`
`1173`	`1173`	`@Override`
`1174`	`1174`	`public void recordDistributionValue(final String aspect, final long value, final String... tags) {`
`1175`		`- send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(value).append("\|d").append(tagString(tags)).toString());`
	`1175`	`+ send(aspect, tags, Long.toString(value), "\|d");`
`1176`	`1176`	`}`
`1177`	`1177`
`1178`	`1178`	`/**`
`@@ -1183,7 +1183,7 @@ public void recordDistributionValue(final String aspect, final long value, final`
`1183`	`1183`	`if(isInvalidSample(sampleRate)) {`
`1184`	`1184`	`return;`
`1185`	`1185`	`}`
`1186`		`- send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(value).append("\|d\|@").append(SAMPLE_RATE_FORMATTERS.get().format(sampleRate)).append(tagString(tags)).toString());`
	`1186`	`+ send(aspect, tags, Long.toString(value), "\|d\|@", SAMPLE_RATE_FORMATTERS.get().format(sampleRate));`
`1187`	`1187`	`}`
`1188`	`1188`
`1189`	`1189`	`/**`
`@@ -1390,6 +1390,15 @@ public void recordSetValue(final String aspect, final String value, final String`
`1390`	`1390`	`send(new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":").append(value).append("\|s").append(tagString(tags)).toString());`
`1391`	`1391`	`}`
`1392`	`1392`
	`1393`	`+ private void send(final String aspect, final String[] tags, final String... data) {`
	`1394`	`+ final StringBuilder builder = new StringBuilder(prefix).append(sanitiseAspect(aspect)).append(":");`
	`1395`	`+ for (final String d : data) {`
	`1396`	`+ builder.append(d);`
	`1397`	`+ }`
	`1398`	`+ builder.append(tagString(tags));`
	`1399`	`+ send(builder.toString());`
	`1400`	`+ }`
	`1401`	`+`
`1393`	`1402`	`private void send(final String message) {`
`1394`	`1403`	`statsDSender.send(message);`
`1395`	`1404`	`}`