Removed deprecated classes from WebServer, mostly static content. (#4376

) Signed-off-by: Tomas Langer <[email protected]>
helidon-io · Jun 13, 2022 · cd99a93 · cd99a93
1 parent 2d2740d
commit cd99a93
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 1,992 deletions.
diff --git a/...tsupport/ClassPathContentHandlerTest.java → ...ccontent/ClassPathContentHandlerTest.java b/...tsupport/ClassPathContentHandlerTest.java → ...ccontent/ClassPathContentHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2022 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.helidon.webserver.testsupport;
+package io.helidon.webserver.staticcontent;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,15 +27,16 @@
 import io.helidon.common.http.Http;
 import io.helidon.common.http.MediaType;
 import io.helidon.webserver.Routing;
-import io.helidon.webserver.StaticContentSupport;
+import io.helidon.webserver.testsupport.TestClient;
+import io.helidon.webserver.testsupport.TestResponse;
 
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
- * Tests {@link io.helidon.webserver.ClassPathContentHandler}.
+ * Tests {@link io.helidon.webserver.staticcontent.ClassPathContentHandler}.
  */
 public class ClassPathContentHandlerTest {
 

diff --git a/...support/FileSystemContentHandlerTest.java → ...content/FileSystemContentHandlerTest.java b/...support/FileSystemContentHandlerTest.java → ...content/FileSystemContentHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2022 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.helidon.webserver.testsupport;
+package io.helidon.webserver.staticcontent;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -27,7 +27,10 @@
 import io.helidon.common.http.Http;
 import io.helidon.common.http.MediaType;
 import io.helidon.webserver.Routing;
-import io.helidon.webserver.StaticContentSupport;
+import io.helidon.webserver.testsupport.TemporaryFolder;
+import io.helidon.webserver.testsupport.TemporaryFolderExtension;
+import io.helidon.webserver.testsupport.TestClient;
+import io.helidon.webserver.testsupport.TestResponse;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -37,7 +40,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
- * Tests {@link io.helidon.webserver.FileSystemContentHandler}.
+ * Tests {@link io.helidon.webserver.staticcontent.FileSystemContentHandler}.
  */
 @ExtendWith(TemporaryFolderExtension.class)
 public class FileSystemContentHandlerTest {

diff --git a/...src/test/resources/content/bar/root-b.txt → ...src/test/resources/content/bar/root-b.txt b/...src/test/resources/content/bar/root-b.txt → ...src/test/resources/content/bar/root-b.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021 Oracle and/or its affiliates.
+# Copyright (c) 2017, 2022 Oracle and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/...port/src/test/resources/content/index.txt → ...tent/src/test/resources/content/index.txt b/...port/src/test/resources/content/index.txt → ...tent/src/test/resources/content/index.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021 Oracle and/or its affiliates.
+# Copyright (c) 2017, 2022 Oracle and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/...ort/src/test/resources/content/root-a.txt → ...ent/src/test/resources/content/root-a.txt b/...ort/src/test/resources/content/root-a.txt → ...ent/src/test/resources/content/root-a.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021 Oracle and/or its affiliates.
+# Copyright (c) 2017, 2022 Oracle and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/...test/resources/s-internal/a/example-a.txt → ...test/resources/s-internal/a/example-a.txt b/...test/resources/s-internal/a/example-a.txt → ...test/resources/s-internal/a/example-a.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021 Oracle and/or its affiliates.
+# Copyright (c) 2017, 2022 Oracle and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/...c/test/resources/s-internal/example-a.txt → ...c/test/resources/s-internal/example-a.txt b/...c/test/resources/s-internal/example-a.txt → ...c/test/resources/s-internal/example-a.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021 Oracle and/or its affiliates.
+# Copyright (c) 2017, 2022 Oracle and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/...c/test/resources/s-internal/example-b.txt → ...c/test/resources/s-internal/example-b.txt b/...c/test/resources/s-internal/example-b.txt → ...c/test/resources/s-internal/example-b.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021 Oracle and/or its affiliates.
+# Copyright (c) 2017, 2022 Oracle and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/webserver/test-support/src/main/java/io/helidon/webserver/testsupport/LoggingTestUtils.java b/webserver/test-support/src/main/java/io/helidon/webserver/testsupport/LoggingTestUtils.java