Checks if a String is empty ("") or null.
+ * + *
+ * isEmpty(null) == true
+ * isEmpty("") == true
+ * isEmpty("\r\n") == false
+ * isEmpty("\t") == false
+ * isEmpty(" ") == false
+ * isEmpty("a") == false
+ * isEmpty(".") == false
+ * isEmpty(";\n") == false
+ *
+ *
+ * @param str
+ * the string to test.
+ * @return true if string is null or empty.
+ */
+ public static boolean isEmpty(String str)
+ {
+ return str == null || str.isEmpty();
+ }
+
/* ------------------------------------------------------------ */
/**
* Test if a string is not null and contains at least 1 non-whitespace characters in it.
diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/StringUtilTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/StringUtilTest.java
index c12965f3bf5..0abde884537 100644
--- a/jetty-util/src/test/java/org/eclipse/jetty/util/StringUtilTest.java
+++ b/jetty-util/src/test/java/org/eclipse/jetty/util/StringUtilTest.java
@@ -225,6 +225,22 @@ public class StringUtilTest
assertTrue(StringUtil.isNotBlank("."));
assertTrue(StringUtil.isNotBlank(";\n"));
}
+
+ @Test
+ public void testIsEmpty()
+ {
+ assertTrue(StringUtil.isEmpty(null));
+ assertTrue(StringUtil.isEmpty(""));
+ assertFalse(StringUtil.isEmpty("\r\n"));
+ assertFalse(StringUtil.isEmpty("\t"));
+ assertFalse(StringUtil.isEmpty(" "));
+
+ assertFalse(StringUtil.isEmpty("a"));
+ assertFalse(StringUtil.isEmpty(" a"));
+ assertFalse(StringUtil.isEmpty("a "));
+ assertFalse(StringUtil.isEmpty("."));
+ assertFalse(StringUtil.isEmpty(";\n"));
+ }
@Test
public void testSanitizeHTML()
diff --git a/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/util/StringIsEmptyBenchmark.java b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/util/StringIsEmptyBenchmark.java
new file mode 100644
index 00000000000..42e51760e8f
--- /dev/null
+++ b/jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/util/StringIsEmptyBenchmark.java
@@ -0,0 +1,66 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
+// ------------------------------------------------------------------------
+// All rights reserved. This program and the accompanying materials
+// are made available under the terms of the Eclipse Public License v1.0
+// and Apache License v2.0 which accompanies this distribution.
+//
+// The Eclipse Public License is available at
+// http://www.eclipse.org/legal/epl-v10.html
+//
+// The Apache License v2.0 is available at
+// http://www.opensource.org/licenses/apache2.0.php
+//
+// You may elect to redistribute this code under either of these licenses.
+// ========================================================================
+//
+
+package org.eclipse.jetty.util;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Threads;
+import org.openjdk.jmh.annotations.Warmup;
+
+import java.util.concurrent.TimeUnit;
+
+@State( Scope.Benchmark)
+@Threads(4)
+@Warmup(iterations = 7, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 9, time = 800, timeUnit = TimeUnit.MILLISECONDS)
+public class StringIsEmptyBenchmark
+{
+
+ private static final String SHORT = "beer.com/foo";
+
+ private static final String MEDIUM = "beer.com/foobarbeeerbe/bebbebbebebbe/bebbeghdegde/foobarbeeerbe/bebbebbebebbe/bebbeghdegde";
+
+ private static final String LONG = "beer.com/foobarbeeerbe/bebbebbebebbe/bebbeghdegde/foobarbeeerbe/bebbebbebebbe/bebbeghdegde/foobarbeeerbe/bebbebbebebbe/bebbeghdegde/foobarbeeerbe/bebbebbebebbe/bebbeghdegde/foobarbeeerbe/bebbebbebebbe/bebbeghdegde/foobarbeeerbe/bebbebbebebbe/bebbeghdegde/foobarbeeerbe/bebbebbebebbe/bebbeghdegde";
+
+
+ @Benchmark
+ @BenchmarkMode( Mode.Throughput)
+ public void shortIsEmpty()
+ {
+ StringUtil.isEmpty(SHORT);
+ }
+
+ @Benchmark
+ @BenchmarkMode( Mode.Throughput)
+ public void mediumIsEmpty()
+ {
+ StringUtil.isEmpty(MEDIUM);
+ }
+
+ @Benchmark
+ @BenchmarkMode( Mode.Throughput)
+ public void longIsEmpty()
+ {
+ StringUtil.isEmpty(LONG);
+ }
+}
diff --git a/tests/jetty-jmh/src/main/java/org/eclipse/jetty/util/thread/strategy/jmh/EWYKBenchmark.java b/tests/jetty-jmh/src/main/java/org/eclipse/jetty/util/thread/strategy/jmh/EWYKBenchmark.java
index 7c81298cc83..2292281ede2 100644
--- a/tests/jetty-jmh/src/main/java/org/eclipse/jetty/util/thread/strategy/jmh/EWYKBenchmark.java
+++ b/tests/jetty-jmh/src/main/java/org/eclipse/jetty/util/thread/strategy/jmh/EWYKBenchmark.java
@@ -19,11 +19,16 @@
package org.eclipse.jetty.util.thread.strategy.jmh;
import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
+import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.util.thread.ExecutionStrategy;
import org.eclipse.jetty.util.thread.Invocable;
@@ -51,7 +56,7 @@ public class EWYKBenchmark
{
static TestServer server;
static ReservedThreadExecutor reserved;
- static File directory;
+ static Path directory;
@Param({"PC","PEC","EWYK"})
public static String strategyName;
@@ -66,21 +71,15 @@ public class EWYKBenchmark
public static void setupServer() throws Exception
{
// Make a test directory
- directory = File.createTempFile("ewyk","dir");
- if (directory.exists())
- directory.delete();
- directory.mkdir();
- directory.deleteOnExit();
-
+ directory = Files.createTempDirectory("ewyk");
+
// Make some test files
for (int i=0;i<75;i++)
{
- File file =new File(directory,i+".txt");
- file.createNewFile();
- file.deleteOnExit();
+ File.createTempFile( "ewyk_benchmark", i + ".txt" , directory.toFile());
}
- server=new TestServer(directory);
+ server=new TestServer(directory.toFile());
server.start();
reserved = new ReservedThreadExecutor(server,20);
reserved.start();
@@ -89,6 +88,14 @@ public class EWYKBenchmark
@TearDown(Level.Trial)
public static void stopServer() throws Exception
{
+ try
+ {
+ IO.delete(directory.toFile());
+ }
+ catch ( Exception e )
+ {
+ System.out.println("cannot delete directory:"+directory);
+ }
reserved.stop();
server.stop();
}
diff --git a/tests/jetty-jmh/src/main/java/org/eclipse/jetty/util/thread/strategy/jmh/TestServer.java b/tests/jetty-jmh/src/main/java/org/eclipse/jetty/util/thread/strategy/jmh/TestServer.java
index ab99582cad6..3f05463f2ab 100644
--- a/tests/jetty-jmh/src/main/java/org/eclipse/jetty/util/thread/strategy/jmh/TestServer.java
+++ b/tests/jetty-jmh/src/main/java/org/eclipse/jetty/util/thread/strategy/jmh/TestServer.java
@@ -19,6 +19,7 @@
package org.eclipse.jetty.util.thread.strategy.jmh;
import java.io.File;
+import java.nio.file.Files;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -44,7 +45,7 @@ public class TestServer implements Executor, TryExecutor
TestServer()
{
- this(new File("/tmp/"));
+ this(new File(System.getProperty("java.io.tmpdir")));
}