Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jetty-9.4.x' into jetty-10.0.x

This commit is contained in:
olivier lamy 2019-05-23 14:18:39 +10:00
parent d37038496e 0ebc0fa9ce
commit d377db5d26
12 changed files with 141 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Jmh_Jenkinsfile
View File

@ -4,20 +4,15 @@ def branch = params.get("JETTY_BRANCH" ,"jetty-10.0.x")
def owner = params.get("REPO_OWNER", "eclipse")
def jdk = params.get("JDK", "jdk11")
def jmhJarPath = params.get("jmhJarPath","tests/jetty-jmh/target/benchmarks.jar")
currentBuild.description = "Build branch $branch with jdk $jdk"
node("linux") {
// System Dependent Locations
def mvntool = tool name: 'maven3.5', type: 'hudson.tasks.Maven$MavenInstallation'
def jdktool = tool name: "$jdk", type: 'hudson.model.JDK'
def mvnName = 'maven3.5'
def localRepo = "${env.JENKINS_HOME}/${env.EXECUTOR_NUMBER}"
def settingsName = 'oss-settings.xml'
def mavenOpts = '-Xms1g -Xmx4g -Djava.awt.headless=true'
// Environment
List mvnEnv = ["PATH+MVN=${mvntool}/bin", "PATH+JDK=${jdktool}/bin", "JAVA_HOME=${jdktool}/", "MAVEN_HOME=${mvntool}"]
mvnEnv.add("MAVEN_OPTS=$mavenOpts")
stage("Checkout") {
git url: "https://github.com/$owner/jetty.project.git", branch: "$branch"
@ -41,15 +36,14 @@ node("linux") {
}
// jmh run
stage("jmh-run") {
node( 'jmh-build-node' ) {
node( 'jmh-build-node' ) {
stage("jmh-run") {
timeout( time: 180, unit: 'MINUTES' ) {
withEnv( ["JAVA_HOME=${tool "$jdk"}"] ) {
unstash name: 'perf-tests'
sh "rm -rf jmh_results"
sh "mkdir jmh_results"
sh "${env.JAVA_HOME}/bin/java -jar $jmhJarPath -rff jmh_results/jmh_result.json -rf json"
sh "${env.JAVA_HOME}/bin/java -jar $jmhJarPath -rff jmh_results/jmh_result.json -rf json -foe true"
jmhReport 'jmh_results/jmh_result.json'
}
}

3
jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTLSTest.java
View File

@ -46,6 +46,7 @@ import org.eclipse.jetty.io.ssl.SslHandshakeListener;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.ExecutorThreadPool;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
@ -508,7 +509,7 @@ public class HttpClientTLSTest
while (true)
{
String line = reader.readLine();
if (line == null || line.isEmpty())
if (StringUtil.isEmpty(line))
break;
}

3
jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientURITest.java
View File

@ -44,6 +44,7 @@ import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.eclipse.jetty.toolchain.test.Net;
import org.eclipse.jetty.util.Fields;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.URIUtil;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.params.ParameterizedTest;
@ -609,7 +610,7 @@ public class HttpClientURITest extends AbstractHttpClientServerTest
while (true)
{
String line = reader.readLine();
if (line == null || line.isEmpty())
if (StringUtil.isEmpty(line))
break;
}

3
jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/HttpChannelOverFCGI.java
View File

@ -35,6 +35,7 @@ import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.HttpChannel;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpTransport;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
@ -87,7 +88,7 @@ public class HttpChannelOverFCGI extends HttpChannel
public void onRequest()
{
String uri = path;
if (query != null && !query.isEmpty())
if (!StringUtil.isEmpty(query))
uri += "?" + query;
// TODO https?
onRequest(new MetaData.Request(method, HttpScheme.HTTP.asString(), hostPort, uri, HttpVersion.fromString(version), fields,Long.MIN_VALUE));

3
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
View File

@ -29,6 +29,7 @@ import org.eclipse.jetty.http.HttpTokens.EndOfContent;
import org.eclipse.jetty.util.ArrayTernaryTrie;
import org.eclipse.jetty.util.ArrayTrie;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.Trie;
import org.eclipse.jetty.util.Utf8StringBuilder;
import org.eclipse.jetty.util.log.Log;
@ -1092,7 +1093,7 @@ public class HttpParser
checkViolation(Violation.MULTILINE_FIELD_VALUE);
// header value without name - continuation?
if (_valueString==null || _valueString.isEmpty())
if ( StringUtil.isEmpty(_valueString))
{
_string.setLength(0);
_length=0;

3
jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java
View File

@ -38,6 +38,7 @@ import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.NegotiatingServerConnection.CipherDiscriminator;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.annotation.Name;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
@ -116,7 +117,7 @@ public class HTTP2ServerConnectionFactory extends AbstractHTTP2ServerConnectionF
public void onClose(Session session, GoAwayFrame frame, Callback callback)
{
String reason = frame.tryConvertPayload();
if (reason != null && !reason.isEmpty())
if (!StringUtil.isEmpty(reason))
reason = " (" + reason + ")";
getConnection().onSessionFailure(new EofException(String.format("Close %s/%s", ErrorCode.toString(frame.getError(), null), reason)), callback);
}

2
jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
View File

@ -718,7 +718,7 @@ public class SessionHandler extends ScopedHandler
if (isUsingCookies())
{
String sessionPath = (_cookieConfig.getPath()==null) ? contextPath : _cookieConfig.getPath();
sessionPath = (sessionPath==null||sessionPath.isEmpty()) ? "/" : sessionPath;
sessionPath = (StringUtil.isEmpty(sessionPath)) ? "/" : sessionPath;
String id = getExtendedId(session);
HttpCookie cookie = null;
if (_sessionComment == null)

25
jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
View File

@ -454,7 +454,30 @@ public class StringUtil
// only whitespace
return true;
}
/**
* <p>Checks if a String is empty ("") or null.</p>
*
* <pre>
* isEmpty(null) == true
* isEmpty("") == true
* isEmpty("\r\n") == false
* isEmpty("\t") == false
* isEmpty(" ") == false
* isEmpty("a") == false
* isEmpty(".") == false
* isEmpty(";\n") == false
* </pre>
*
* @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.

16
jetty-util/src/test/java/org/eclipse/jetty/util/StringUtilTest.java
View File

@ -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()

66
jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/util/StringIsEmptyBenchmark.java Normal file
View File

@ -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);
}
}

29
tests/jetty-jmh/src/main/java/org/eclipse/jetty/util/thread/strategy/jmh/EWYKBenchmark.java
View File

@ -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();
}

3
tests/jetty-jmh/src/main/java/org/eclipse/jetty/util/thread/strategy/jmh/TestServer.java
View File

@ -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")));
}