From 4187bf3eb0142cb33d59e71c125df5be773111ed Mon Sep 17 00:00:00 2001
From: Tyler Benson <tyler.benson@datadoghq.com>
Date: Wed, 20 Mar 2019 17:09:39 -0700
Subject: [PATCH] code review changes.

---
 dd-trace-api/src/main/java/datadog/trace/api/Config.java | 8 ++++----
 .../src/test/groovy/datadog/trace/api/ConfigTest.groovy  | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dd-trace-api/src/main/java/datadog/trace/api/Config.java b/dd-trace-api/src/main/java/datadog/trace/api/Config.java
index 2d58c5b907..144472107b 100644
--- a/dd-trace-api/src/main/java/datadog/trace/api/Config.java
+++ b/dd-trace-api/src/main/java/datadog/trace/api/Config.java
@@ -447,6 +447,7 @@ public class Config {
   }
 
   private static Map<String, String> parseMap(final String str, final String settingName) {
+    // If we ever want to have default values besides an empty map, this will need to change.
     if (str == null || str.trim().isEmpty()) {
       return Collections.emptyMap();
     }
@@ -476,12 +477,11 @@ public class Config {
 
   private static Set<Integer> parseIntegerRangeSet(String str, final String settingName)
       throws NumberFormatException {
-
-    if (str == null || str.trim().isEmpty()) {
-      return Collections.emptySet();
+    if (str == null) {
+      str = "";
     }
     str = str.replaceAll("\\s", "");
-    if (!str.matches("\\d{3}(?:-\\d{3})*(?:,\\d{3}(?:-\\d{3})*)*")) {
+    if (!str.matches("\\d{3}(?:-\\d{3})?(?:,\\d{3}(?:-\\d{3})?)*")) {
       log.warn(
           "Invalid config for {}: '{}'. Must be formatted like '400-403,405,410-499'.",
           settingName,
diff --git a/dd-trace-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy b/dd-trace-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy
index b4cd695de2..726401bc14 100644
--- a/dd-trace-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy
+++ b/dd-trace-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy
@@ -474,11 +474,11 @@ class ConfigTest extends Specification {
 
     then:
     if (expected) {
-      config.httpServerErrorStatuses == expected.toSet()
-      config.httpClientErrorStatuses == expected.toSet()
+      assert config.httpServerErrorStatuses == expected.toSet()
+      assert config.httpClientErrorStatuses == expected.toSet()
     } else {
-      config.httpServerErrorStatuses == Config.DEFAULT_HTTP_SERVER_ERROR_STATUSES
-      config.httpClientErrorStatuses == Config.DEFAULT_HTTP_CLIENT_ERROR_STATUSES
+      assert config.httpServerErrorStatuses == Config.DEFAULT_HTTP_SERVER_ERROR_STATUSES
+      assert config.httpClientErrorStatuses == Config.DEFAULT_HTTP_CLIENT_ERROR_STATUSES
     }
 
     where:
@@ -487,6 +487,7 @@ class ConfigTest extends Specification {
     "a"                 | null
     ""                  | null
     "1000"              | null
+    "100-200-300"       | null
     "500"               | [500]
     "100,999"           | [100, 999]
     "999-888"           | 888..999