This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-scxml.git
The following commit(s) were added to refs/heads/master by this push:
new e0f839b Use isEmpty().
e0f839b is described below
commit e0f839bf1627e335c6bd6263efb5421ca81a6807
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Jan 17 09:18:10 2021 -0500
Use isEmpty().
---
.../java/org/apache/commons/scxml2/env/groovy/GroovyEvaluator.java | 2 +-
src/main/java/org/apache/commons/scxml2/model/Cancel.java | 2 +-
src/main/java/org/apache/commons/scxml2/model/CustomAction.java | 4 ++--
src/main/java/org/apache/commons/scxml2/model/Send.java | 4 ++--
src/main/java/org/apache/commons/scxml2/test/StandaloneUtils.java | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyEvaluator.java
b/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyEvaluator.java
index aa2c0e6..897ba12 100644
--- a/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyEvaluator.java
+++ b/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyEvaluator.java
@@ -86,7 +86,7 @@ public class GroovyEvaluator extends AbstractBaseEvaluator {
@Override
public String preProcess(final String script) {
- if (script == null || script.length() == 0) {
+ if (script == null || script.isEmpty()) {
return script;
}
StringBuffer sb = null;
diff --git a/src/main/java/org/apache/commons/scxml2/model/Cancel.java
b/src/main/java/org/apache/commons/scxml2/model/Cancel.java
index 426e703..f62ab11 100644
--- a/src/main/java/org/apache/commons/scxml2/model/Cancel.java
+++ b/src/main/java/org/apache/commons/scxml2/model/Cancel.java
@@ -97,7 +97,7 @@ public class Cancel extends Action {
String sendidValue = sendid;
if (sendidValue == null && sendidexpr != null) {
sendidValue = (String) eval.eval(ctx, sendidexpr);
- if ((sendidValue == null || sendidValue.trim().length() == 0)
+ if ((sendidValue == null || sendidValue.trim().isEmpty())
&& exctx.getAppLog().isWarnEnabled()) {
exctx.getAppLog().warn("<send>: sendid expression \"" +
sendidexpr
+ "\" evaluated to null or empty String");
diff --git a/src/main/java/org/apache/commons/scxml2/model/CustomAction.java
b/src/main/java/org/apache/commons/scxml2/model/CustomAction.java
index 57f732d..e54f98d 100644
--- a/src/main/java/org/apache/commons/scxml2/model/CustomAction.java
+++ b/src/main/java/org/apache/commons/scxml2/model/CustomAction.java
@@ -91,7 +91,7 @@ public class CustomAction {
public CustomAction(final String namespaceURI, final String localName,
final Class<? extends Action> actionClass) {
final Log log = LogFactory.getLog(CustomAction.class);
- if (namespaceURI == null || namespaceURI.trim().length() == 0) {
+ if (namespaceURI == null || namespaceURI.trim().isEmpty()) {
log.error(ERR_NO_NAMESPACE);
throw new IllegalArgumentException(ERR_NO_NAMESPACE);
}
@@ -99,7 +99,7 @@ public class CustomAction {
log.error(ERR_RESERVED_NAMESPACE);
throw new IllegalArgumentException(ERR_RESERVED_NAMESPACE);
}
- if (localName == null || localName.trim().length() == 0) {
+ if (localName == null || localName.trim().isEmpty()) {
log.error(ERR_NO_LOCAL_NAME);
throw new IllegalArgumentException(ERR_NO_LOCAL_NAME);
}
diff --git a/src/main/java/org/apache/commons/scxml2/model/Send.java
b/src/main/java/org/apache/commons/scxml2/model/Send.java
index f92cdde..acc39a1 100644
--- a/src/main/java/org/apache/commons/scxml2/model/Send.java
+++ b/src/main/java/org/apache/commons/scxml2/model/Send.java
@@ -403,7 +403,7 @@ public class Send extends Action implements
ContentContainer, ParamsContainer {
String targetValue = target;
if (targetValue == null && targetexpr != null) {
targetValue = (String)eval.eval(ctx, targetexpr);
- if ((targetValue == null || targetValue.trim().length() == 0)
+ if ((targetValue == null || targetValue.trim().isEmpty())
&& exctx.getAppLog().isWarnEnabled()) {
exctx.getAppLog().warn("<send>: target expression \"" +
targetexpr
+ "\" evaluated to null or empty String");
@@ -412,7 +412,7 @@ public class Send extends Action implements
ContentContainer, ParamsContainer {
String typeValue = type;
if (typeValue == null && typeexpr != null) {
typeValue = (String)eval.eval(ctx, typeexpr);
- if ((typeValue == null || typeValue.trim().length() == 0)
+ if ((typeValue == null || typeValue.trim().isEmpty())
&& exctx.getAppLog().isWarnEnabled()) {
exctx.getAppLog().warn("<send>: type expression \"" + typeexpr
+ "\" evaluated to null or empty String");
diff --git a/src/main/java/org/apache/commons/scxml2/test/StandaloneUtils.java
b/src/main/java/org/apache/commons/scxml2/test/StandaloneUtils.java
index fb986a6..3dc76ba 100644
--- a/src/main/java/org/apache/commons/scxml2/test/StandaloneUtils.java
+++ b/src/main/java/org/apache/commons/scxml2/test/StandaloneUtils.java
@@ -110,7 +110,7 @@ public final class StandaloneUtils {
rootCtx.setLocal(name, value);
System.out.println("Set variable " + name + " to "
+ value);
- } else if (event.trim().length() == 0
+ } else if (event.trim().isEmpty()
|| event.equalsIgnoreCase("null")) {
final TriggerEvent[] evts = {new
EventBuilder(null,TriggerEvent.SIGNAL_EVENT).build()};
exec.triggerEvents(evts);
