diff --git a/eng/checkstyle-suppressions.xml b/eng/checkstyle/checkstyle-suppressions.xml similarity index 100% rename from eng/checkstyle-suppressions.xml rename to eng/checkstyle/checkstyle-suppressions.xml diff --git a/checkstyle.xml b/eng/checkstyle/checkstyle.xml similarity index 97% rename from checkstyle.xml rename to eng/checkstyle/checkstyle.xml index 9d66338..f3bf7fd 100644 --- a/checkstyle.xml +++ b/eng/checkstyle/checkstyle.xml @@ -12,16 +12,9 @@ what the following rules do, please see the checkstyle configuration page at http://checkstyle.sourceforge.net/config.html --> - - - - - - - @@ -33,6 +26,12 @@ page at http://checkstyle.sourceforge.net/config.html --> + + + + + + diff --git a/eng/checkstyle/java.header b/eng/checkstyle/java.header new file mode 100644 index 0000000..d194bed --- /dev/null +++ b/eng/checkstyle/java.header @@ -0,0 +1,2 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. diff --git a/pom.xml b/pom.xml index 6d95a95..f63d54a 100644 --- a/pom.xml +++ b/pom.xml @@ -181,10 +181,8 @@ - checkstyle.xml - - - samedir= + eng/checkstyle/checkstyle.xml + eng/checkstyle/checkstyle-suppressions.xml UTF-8 true diff --git a/src/main/java/com/microsoft/azure/proton/transport/proxy/Proxy.java b/src/main/java/com/microsoft/azure/proton/transport/proxy/Proxy.java index 9e87511..b0e91b8 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/proxy/Proxy.java +++ b/src/main/java/com/microsoft/azure/proton/transport/proxy/Proxy.java @@ -1,7 +1,5 @@ -/* - * Copyright (c) Microsoft. All rights reserved. - * Licensed under the MIT license. See LICENSE file in the project root for full license information. - */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. package com.microsoft.azure.proton.transport.proxy; diff --git a/src/main/java/com/microsoft/azure/proton/transport/proxy/ProxyAuthenticationType.java b/src/main/java/com/microsoft/azure/proton/transport/proxy/ProxyAuthenticationType.java index 413ab9d..f2a0215 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/proxy/ProxyAuthenticationType.java +++ b/src/main/java/com/microsoft/azure/proton/transport/proxy/ProxyAuthenticationType.java @@ -1,3 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + package com.microsoft.azure.proton.transport.proxy; /** diff --git a/src/main/java/com/microsoft/azure/proton/transport/proxy/ProxyChallengeProcessor.java b/src/main/java/com/microsoft/azure/proton/transport/proxy/ProxyChallengeProcessor.java index f14bfcd..3d4ea9d 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/proxy/ProxyChallengeProcessor.java +++ b/src/main/java/com/microsoft/azure/proton/transport/proxy/ProxyChallengeProcessor.java @@ -1,3 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + package com.microsoft.azure.proton.transport.proxy; import java.util.Map; diff --git a/src/main/java/com/microsoft/azure/proton/transport/proxy/ProxyConfiguration.java b/src/main/java/com/microsoft/azure/proton/transport/proxy/ProxyConfiguration.java index 324db17..99e2a69 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/proxy/ProxyConfiguration.java +++ b/src/main/java/com/microsoft/azure/proton/transport/proxy/ProxyConfiguration.java @@ -1,3 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + package com.microsoft.azure.proton.transport.proxy; import org.slf4j.Logger; diff --git a/src/main/java/com/microsoft/azure/proton/transport/proxy/ProxyHandler.java b/src/main/java/com/microsoft/azure/proton/transport/proxy/ProxyHandler.java index 7264950..f51f608 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/proxy/ProxyHandler.java +++ b/src/main/java/com/microsoft/azure/proton/transport/proxy/ProxyHandler.java @@ -1,7 +1,5 @@ -/* - * Copyright (c) Microsoft. All rights reserved. - * Licensed under the MIT license. See LICENSE file in the project root for full license information. - */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. package com.microsoft.azure.proton.transport.proxy; diff --git a/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/BasicProxyChallengeProcessorImpl.java b/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/BasicProxyChallengeProcessorImpl.java index b30977e..f31022e 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/BasicProxyChallengeProcessorImpl.java +++ b/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/BasicProxyChallengeProcessorImpl.java @@ -1,3 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + package com.microsoft.azure.proton.transport.proxy.impl; import com.microsoft.azure.proton.transport.proxy.ProxyChallengeProcessor; diff --git a/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/Constants.java b/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/Constants.java index d149e76..28826a6 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/Constants.java +++ b/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/Constants.java @@ -1,3 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + package com.microsoft.azure.proton.transport.proxy.impl; import java.util.Locale; diff --git a/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/DigestProxyChallengeProcessorImpl.java b/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/DigestProxyChallengeProcessorImpl.java index ba041b5..b30842c 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/DigestProxyChallengeProcessorImpl.java +++ b/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/DigestProxyChallengeProcessorImpl.java @@ -1,3 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + package com.microsoft.azure.proton.transport.proxy.impl; import com.microsoft.azure.proton.transport.proxy.ProxyChallengeProcessor; diff --git a/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyAuthenticator.java b/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyAuthenticator.java index 0a3c82c..22a92a7 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyAuthenticator.java +++ b/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyAuthenticator.java @@ -1,3 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + package com.microsoft.azure.proton.transport.proxy.impl; import com.microsoft.azure.proton.transport.proxy.ProxyConfiguration; diff --git a/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyHandlerImpl.java b/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyHandlerImpl.java index a4d4c2d..dd4bef1 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyHandlerImpl.java +++ b/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyHandlerImpl.java @@ -1,7 +1,5 @@ -/* - * Copyright (c) Microsoft. All rights reserved. - * Licensed under the MIT license. See LICENSE file in the project root for full license information. - */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. package com.microsoft.azure.proton.transport.proxy.impl; diff --git a/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyImpl.java b/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyImpl.java index cb61a79..09949c9 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyImpl.java +++ b/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyImpl.java @@ -1,7 +1,5 @@ -/* - * Copyright (c) Microsoft. All rights reserved. - * Licensed under the MIT license. See LICENSE file in the project root for full license information. - */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. package com.microsoft.azure.proton.transport.proxy.impl; diff --git a/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/StringUtils.java b/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/StringUtils.java index 8d57d1f..9af33ac 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/StringUtils.java +++ b/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/StringUtils.java @@ -1,3 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + package com.microsoft.azure.proton.transport.proxy.impl; /** diff --git a/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/package-info.java b/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/package-info.java index fe8bab7..9a28745 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/package-info.java +++ b/src/main/java/com/microsoft/azure/proton/transport/proxy/impl/package-info.java @@ -1,3 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + /** * Package containg implementation for {@link com.microsoft.azure.proton.transport.proxy.ProxyHandler} and {@link * com.microsoft.azure.proton.transport.proxy.Proxy}. diff --git a/src/main/java/com/microsoft/azure/proton/transport/proxy/package-info.java b/src/main/java/com/microsoft/azure/proton/transport/proxy/package-info.java index 2f5d3e7..c14589f 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/proxy/package-info.java +++ b/src/main/java/com/microsoft/azure/proton/transport/proxy/package-info.java @@ -1,3 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + /** * Package containing classes for connecting via an HTTP proxy. */ diff --git a/src/main/java/com/microsoft/azure/proton/transport/ws/WebSocket.java b/src/main/java/com/microsoft/azure/proton/transport/ws/WebSocket.java index f55c3d0..a0e0bd2 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/ws/WebSocket.java +++ b/src/main/java/com/microsoft/azure/proton/transport/ws/WebSocket.java @@ -1,7 +1,5 @@ -/* - * Copyright (c) Microsoft. All rights reserved. - * Licensed under the MIT license. See LICENSE file in the project root for full license information. - */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. package com.microsoft.azure.proton.transport.ws; diff --git a/src/main/java/com/microsoft/azure/proton/transport/ws/WebSocketHandler.java b/src/main/java/com/microsoft/azure/proton/transport/ws/WebSocketHandler.java index d516aa2..79aca96 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/ws/WebSocketHandler.java +++ b/src/main/java/com/microsoft/azure/proton/transport/ws/WebSocketHandler.java @@ -1,7 +1,5 @@ -/* - * Copyright (c) Microsoft. All rights reserved. - * Licensed under the MIT license. See LICENSE file in the project root for full license information. - */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. package com.microsoft.azure.proton.transport.ws; diff --git a/src/main/java/com/microsoft/azure/proton/transport/ws/WebSocketHeader.java b/src/main/java/com/microsoft/azure/proton/transport/ws/WebSocketHeader.java index 8be27b6..124c291 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/ws/WebSocketHeader.java +++ b/src/main/java/com/microsoft/azure/proton/transport/ws/WebSocketHeader.java @@ -1,7 +1,5 @@ -/* - * Copyright (c) Microsoft. All rights reserved. - * Licensed under the MIT license. See LICENSE file in the project root for full license information. - */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. package com.microsoft.azure.proton.transport.ws; diff --git a/src/main/java/com/microsoft/azure/proton/transport/ws/impl/Base64.java b/src/main/java/com/microsoft/azure/proton/transport/ws/impl/Base64.java index 59541e2..038452e 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/ws/impl/Base64.java +++ b/src/main/java/com/microsoft/azure/proton/transport/ws/impl/Base64.java @@ -1,5 +1,5 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. package com.microsoft.azure.proton.transport.ws.impl; diff --git a/src/main/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketHandlerImpl.java b/src/main/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketHandlerImpl.java index 9ede433..943ce13 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketHandlerImpl.java +++ b/src/main/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketHandlerImpl.java @@ -1,7 +1,5 @@ -/* - * Copyright (c) Microsoft. All rights reserved. - * Licensed under the MIT license. See LICENSE file in the project root for full license information. - */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. package com.microsoft.azure.proton.transport.ws.impl; diff --git a/src/main/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketImpl.java b/src/main/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketImpl.java index c07d36e..82ca9bd 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketImpl.java +++ b/src/main/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketImpl.java @@ -1,7 +1,5 @@ -/* - * Copyright (c) Microsoft. All rights reserved. - * Licensed under the MIT license. See LICENSE file in the project root for full license information. - */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. package com.microsoft.azure.proton.transport.ws.impl; diff --git a/src/main/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketSniffer.java b/src/main/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketSniffer.java index 97dcd1e..7189125 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketSniffer.java +++ b/src/main/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketSniffer.java @@ -1,7 +1,5 @@ -/* - * Copyright (c) Microsoft. All rights reserved. - * Licensed under the MIT license. See LICENSE file in the project root for full license information. - */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. package com.microsoft.azure.proton.transport.ws.impl; diff --git a/src/main/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketUpgrade.java b/src/main/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketUpgrade.java index ac4403a..c28fe9a 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketUpgrade.java +++ b/src/main/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketUpgrade.java @@ -1,7 +1,5 @@ -/* - * Copyright (c) Microsoft. All rights reserved. - * Licensed under the MIT license. See LICENSE file in the project root for full license information. - */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. package com.microsoft.azure.proton.transport.ws.impl; diff --git a/src/main/java/com/microsoft/azure/proton/transport/ws/impl/package-info.java b/src/main/java/com/microsoft/azure/proton/transport/ws/impl/package-info.java index 0573edd..a0e4564 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/ws/impl/package-info.java +++ b/src/main/java/com/microsoft/azure/proton/transport/ws/impl/package-info.java @@ -1,3 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + /** * Package containg implementation for {@link com.microsoft.azure.proton.transport.ws.WebSocketHandler} and {@link * com.microsoft.azure.proton.transport.ws.WebSocket}. diff --git a/src/main/java/com/microsoft/azure/proton/transport/ws/package-info.java b/src/main/java/com/microsoft/azure/proton/transport/ws/package-info.java index bb1c378..392f4d3 100644 --- a/src/main/java/com/microsoft/azure/proton/transport/ws/package-info.java +++ b/src/main/java/com/microsoft/azure/proton/transport/ws/package-info.java @@ -1,3 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + /** * Package containing classes for connecting via WebSockets. */ diff --git a/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/BasicProxyChallengeProcessorImplTest.java b/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/BasicProxyChallengeProcessorImplTest.java index a2fd1b6..4219252 100644 --- a/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/BasicProxyChallengeProcessorImplTest.java +++ b/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/BasicProxyChallengeProcessorImplTest.java @@ -1,3 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + package com.microsoft.azure.proton.transport.proxy.impl; import com.microsoft.azure.proton.transport.proxy.ProxyAuthenticationType; @@ -7,9 +10,18 @@ import org.junit.Test; import java.io.IOException; -import java.net.*; +import java.net.Authenticator; +import java.net.InetSocketAddress; +import java.net.PasswordAuthentication; +import java.net.Proxy; +import java.net.ProxySelector; +import java.net.SocketAddress; +import java.net.URI; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.ArrayList; +import java.util.Base64; +import java.util.List; +import java.util.Map; public class BasicProxyChallengeProcessorImplTest { private static final String HOSTNAME = "127.0.0.1"; diff --git a/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/DigestProxyChallengeProcessorImplTest.java b/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/DigestProxyChallengeProcessorImplTest.java index aaaa7c7..f4333ae 100644 --- a/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/DigestProxyChallengeProcessorImplTest.java +++ b/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/DigestProxyChallengeProcessorImplTest.java @@ -1,3 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + package com.microsoft.azure.proton.transport.proxy.impl; import com.microsoft.azure.proton.transport.proxy.ProxyAuthenticationType; diff --git a/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyAuthenticatorTests.java b/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyAuthenticatorTests.java index 9151623..7da053d 100644 --- a/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyAuthenticatorTests.java +++ b/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyAuthenticatorTests.java @@ -1,3 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + package com.microsoft.azure.proton.transport.proxy.impl; import com.microsoft.azure.proton.transport.proxy.ProxyAuthenticationType; diff --git a/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyConfigurationTest.java b/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyConfigurationTest.java index e541969..a7aa508 100644 --- a/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyConfigurationTest.java +++ b/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyConfigurationTest.java @@ -1,3 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + package com.microsoft.azure.proton.transport.proxy.impl; import com.microsoft.azure.proton.transport.proxy.ProxyAuthenticationType; diff --git a/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyHandlerImplTest.java b/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyHandlerImplTest.java index 8efa373..cfad1dd 100644 --- a/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyHandlerImplTest.java +++ b/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyHandlerImplTest.java @@ -1,7 +1,5 @@ -/* - * Copyright (c) Microsoft. All rights reserved. - * Licensed under the MIT license. See LICENSE file in the project root for full license information. - */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. package com.microsoft.azure.proton.transport.proxy.impl; diff --git a/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyImplTest.java b/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyImplTest.java index 25061ec..4f6d6cc 100644 --- a/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyImplTest.java +++ b/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/ProxyImplTest.java @@ -1,7 +1,5 @@ -/* - * Copyright (c) Microsoft. All rights reserved. - * Licensed under the MIT license. See LICENSE file in the project root for full license information. - */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. package com.microsoft.azure.proton.transport.proxy.impl; diff --git a/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/TestAuthenticator.java b/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/TestAuthenticator.java index abc5b68..b4fa7d3 100644 --- a/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/TestAuthenticator.java +++ b/src/test/java/com/microsoft/azure/proton/transport/proxy/impl/TestAuthenticator.java @@ -1,3 +1,6 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + package com.microsoft.azure.proton.transport.proxy.impl; import java.net.Authenticator; diff --git a/src/test/java/com/microsoft/azure/proton/transport/ws/impl/Base64Test.java b/src/test/java/com/microsoft/azure/proton/transport/ws/impl/Base64Test.java index 2feebc2..8b97e58 100644 --- a/src/test/java/com/microsoft/azure/proton/transport/ws/impl/Base64Test.java +++ b/src/test/java/com/microsoft/azure/proton/transport/ws/impl/Base64Test.java @@ -1,5 +1,5 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. package com.microsoft.azure.proton.transport.ws.impl; diff --git a/src/test/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketHandlerImplTest.java b/src/test/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketHandlerImplTest.java index 87e2652..d3c4a1c 100644 --- a/src/test/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketHandlerImplTest.java +++ b/src/test/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketHandlerImplTest.java @@ -1,23 +1,5 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. package com.microsoft.azure.proton.transport.ws.impl; @@ -27,10 +9,20 @@ import java.nio.ByteBuffer; import java.security.SecureRandom; -import java.util.*; - -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.Random; +import java.util.Scanner; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; public class WebSocketHandlerImplTest { @Test diff --git a/src/test/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketImplTest.java b/src/test/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketImplTest.java index 89c1c35..56f0f79 100644 --- a/src/test/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketImplTest.java +++ b/src/test/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketImplTest.java @@ -1,23 +1,5 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. package com.microsoft.azure.proton.transport.ws.impl; @@ -44,8 +26,17 @@ import java.util.Map; import java.util.Random; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class WebSocketImplTest { private int _allocatedWebSocketBufferSize = (4 * 1024) + (16 * WebSocketHeader.MED_HEADER_LENGTH_MASKED); diff --git a/src/test/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketSnifferTest.java b/src/test/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketSnifferTest.java index 5758a4f..51c00bb 100644 --- a/src/test/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketSnifferTest.java +++ b/src/test/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketSnifferTest.java @@ -1,28 +1,9 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. package com.microsoft.azure.proton.transport.ws.impl; import com.microsoft.azure.proton.transport.ws.WebSocketHeader; -import com.microsoft.azure.proton.transport.ws.impl.WebSocketSniffer; import org.apache.qpid.proton.engine.impl.TransportWrapper; import org.junit.Test; diff --git a/src/test/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketUpgradeTest.java b/src/test/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketUpgradeTest.java index a083a19..94ea3a9 100644 --- a/src/test/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketUpgradeTest.java +++ b/src/test/java/com/microsoft/azure/proton/transport/ws/impl/WebSocketUpgradeTest.java @@ -1,29 +1,10 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. package com.microsoft.azure.proton.transport.ws.impl; import org.junit.Test; - import java.security.InvalidParameterException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -31,7 +12,9 @@ import java.util.Map; import java.util.Scanner; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class WebSocketUpgradeTest { final String RFC_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";