Browse Source

fix replaceNRTtoUnderline NullPointerException #4098 (#4100)

* fix replaceNRTtoUnderline NullPointerException

* add  unit Test
pull/3/MERGE
felix.wang 4 years ago committed by GitHub
parent
commit
8f5da09d3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/StringUtils.java
  2. 16
      dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/StringUtilsTest.java

4
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/StringUtils.java

@ -45,6 +45,10 @@ public class StringUtils {
} }
public static String replaceNRTtoUnderline(String src) { public static String replaceNRTtoUnderline(String src) {
if (isBlank(src)) {
return src;
} else {
return src.replaceAll("[\n|\r|\t]", "_"); return src.replaceAll("[\n|\r|\t]", "_");
} }
}
} }

16
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/StringUtilsTest.java

@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.utils; package org.apache.dolphinscheduler.common.utils;
import org.junit.Assert; import org.junit.Assert;
@ -61,4 +62,19 @@ public class StringUtilsTest {
b = StringUtils.isNotBlank("test"); b = StringUtils.isNotBlank("test");
Assert.assertTrue(b); Assert.assertTrue(b);
} }
@Test
public void testreplaceNRTtoUnderline() {
String result1 = StringUtils.replaceNRTtoUnderline("abc\n");
Assert.assertEquals("abc_", result1);
String result2 = StringUtils.replaceNRTtoUnderline("abc\r");
Assert.assertEquals("abc_", result2);
String result3 = StringUtils.replaceNRTtoUnderline("abc\t");
Assert.assertEquals("abc_", result3);
String result4 = StringUtils.replaceNRTtoUnderline(null);
Assert.assertNull(result4);
}
} }

Loading…
Cancel
Save