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

Issue #3458 - missing licence headers and changes from review 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2019-03-14 09:29:53 +11:00 committed by lachan-roberts
parent f60534a8ac
commit 62406cdfa2
5 changed files with 54 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfig.java
View File

@ -18,8 +18,6 @@
package org.eclipse.jetty.websocket.api.extensions;
import java.util.Enumeration;
import java.util.List;
import java.util.Map;
import java.util.ServiceLoader;
import java.util.Set;
@ -32,9 +30,6 @@ public interface ExtensionConfig
interface Parser
{
ExtensionConfig parse(String parameterizedName);
List<ExtensionConfig> parseEnum(Enumeration<String> valuesEnum);
List<ExtensionConfig> parseList(String... rawSecWebSocketExtensions);
String toHeaderValue(List<ExtensionConfig> configs);
}
private static ExtensionConfig.Parser getParser()
@ -47,21 +42,6 @@ public interface ExtensionConfig
return getParser().parse(parameterizedName);
}
static List<ExtensionConfig> parseEnum(Enumeration<String> valuesEnum)
{
return getParser().parseEnum(valuesEnum);
}
static List<ExtensionConfig> parseList(String... rawSecWebSocketExtensions)
{
return getParser().parseList(rawSecWebSocketExtensions);
}
static String toHeaderValue(List<ExtensionConfig> configs)
{
return getParser().toHeaderValue(configs);
}
String getName();
int getParameter(String key, int defValue);

49
jetty-websocket/jetty-websocket-common/src/main/java/org/eclipse/jetty/websocket/common/ExtensionConfigParser.java
View File

@ -18,11 +18,6 @@
package org.eclipse.jetty.websocket.common;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
import java.util.stream.Collectors;
import org.eclipse.jetty.websocket.core.ExtensionConfig;
public class ExtensionConfigParser implements org.eclipse.jetty.websocket.api.extensions.ExtensionConfig.Parser
@ -38,48 +33,4 @@ public class ExtensionConfigParser implements org.eclipse.jetty.websocket.api.ex
{
return new JettyExtensionConfig(ExtensionConfig.parse(parameterizedName));
}
/**
* Parse enumeration of {@code Sec-WebSocket-Extensions} header values into a {@code ExtensionConfig} list
*
* @param valuesEnum the raw header values enum
* @return the list of extension configs
*/
@Override
public List<org.eclipse.jetty.websocket.api.extensions.ExtensionConfig> parseEnum(Enumeration<String> valuesEnum)
{
List<org.eclipse.jetty.websocket.api.extensions.ExtensionConfig> configs = new ArrayList<>();
for (ExtensionConfig config : ExtensionConfig.parseEnum(valuesEnum))
configs.add(new JettyExtensionConfig(config));
return configs;
}
/**
* Parse 1 or more raw {@code Sec-WebSocket-Extensions} header values into a {@code ExtensionConfig} list
*
* @param rawSecWebSocketExtensions the raw header values
* @return the list of extension configs
*/
@Override
public List<org.eclipse.jetty.websocket.api.extensions.ExtensionConfig> parseList(String... rawSecWebSocketExtensions)
{
List<org.eclipse.jetty.websocket.api.extensions.ExtensionConfig> configs = new ArrayList<>();
for (ExtensionConfig config : ExtensionConfig.parseList(rawSecWebSocketExtensions))
configs.add(new JettyExtensionConfig(config));
return configs;
}
/**
* Convert a list of {@code ExtensionConfig} to a header value
*
* @param configs the list of extension configs
* @return the header value (null if no configs present)
*/
@Override
public String toHeaderValue(List<org.eclipse.jetty.websocket.api.extensions.ExtensionConfig> configs)
{
return ExtensionConfig.toHeaderValue(configs.stream()
.map(c->new ExtensionConfig(c.getName(), c.getParameters()))
.collect(Collectors.toList()));
}
}

18
jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyServerUpgradeRequest.java
View File

@ -1,3 +1,21 @@
//
// ========================================================================
// 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.websocket.server;
import java.net.HttpCookie;

18
jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyServerUpgradeResponse.java
View File

@ -1,3 +1,21 @@
//
// ========================================================================
// 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.websocket.server;
import java.io.IOException;

18
jetty-websocket/jetty-websocket-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketCreator.java
View File

@ -1,3 +1,21 @@
//
// ========================================================================
// 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.websocket.server;