This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit 7f87a0bec0406eabe319e1a3227fb53d55045fa6 Author: Andy Seaborne <[email protected]> AuthorDate: Wed May 21 13:37:03 2025 +0100 GH-3212: Move FileSender to Fuseki test area --- jena-arq/src/main/java/org/apache/jena/web/FileSender.java | 5 ++--- .../test/java/org/apache/jena/fuseki/main}/FileSender.java | 12 +++++------- .../java/org/apache/jena/fuseki/main/TestFileUpload.java | 1 - .../src/test/java/org/apache/jena/fuseki}/FileSender.java | 12 +++++------- .../java/org/apache/jena/fuseki/TestWebappFileUpload.java | 1 - 5 files changed, 12 insertions(+), 19 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/web/FileSender.java b/jena-arq/src/main/java/org/apache/jena/web/FileSender.java index b3e38b5d7d..2a7f26bef1 100644 --- a/jena-arq/src/main/java/org/apache/jena/web/FileSender.java +++ b/jena-arq/src/main/java/org/apache/jena/web/FileSender.java @@ -34,10 +34,9 @@ import org.apache.jena.riot.WebContent; import org.apache.jena.riot.web.HttpNames; /** - * Simple Multipart HTTP PUT/POST sender for testing. - * THis class does not stream the content. - * It is in main/src to enable sharing without needing to depend on a test artifact. + * @deprecated To be removed - do not use. */ +@Deprecated(forRemoval = true) public class FileSender { static record Entry(String fileName, String content, String contentType) {} diff --git a/jena-arq/src/main/java/org/apache/jena/web/FileSender.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/FileSender.java similarity index 89% copy from jena-arq/src/main/java/org/apache/jena/web/FileSender.java copy to jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/FileSender.java index b3e38b5d7d..87f58ca5ab 100644 --- a/jena-arq/src/main/java/org/apache/jena/web/FileSender.java +++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/FileSender.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.web; +package org.apache.jena.fuseki.main; import java.io.InputStream; import java.net.URI; @@ -34,16 +34,14 @@ import org.apache.jena.riot.WebContent; import org.apache.jena.riot.web.HttpNames; /** - * Simple Multipart HTTP PUT/POST sender for testing. - * THis class does not stream the content. - * It is in main/src to enable sharing without needing to depend on a test artifact. + * Simple multipart form data HTTP PUT/POST sender, primarily for. + * This class does not stream the content. */ public class FileSender { + // This class is in main/src to enable sharing without needing to depend on a test artifact. - static record Entry(String fileName, String content, String contentType) {} - + private static record Entry(String fileName, String content, String contentType) {} private List<Entry> items = new ArrayList<>(); - private final String url; public FileSender(String url ) { this.url = url; } diff --git a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFileUpload.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFileUpload.java index 957460c3fd..64a1d00556 100644 --- a/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFileUpload.java +++ b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/main/TestFileUpload.java @@ -33,7 +33,6 @@ import org.apache.jena.sparql.core.DatasetGraph; import org.apache.jena.sparql.exec.http.DSP; import org.apache.jena.sparql.exec.http.GSP; import org.apache.jena.sparql.graph.GraphFactory; -import org.apache.jena.web.FileSender; import org.apache.jena.web.HttpSC; import org.junit.jupiter.api.Test; diff --git a/jena-arq/src/main/java/org/apache/jena/web/FileSender.java b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/FileSender.java similarity index 90% copy from jena-arq/src/main/java/org/apache/jena/web/FileSender.java copy to jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/FileSender.java index b3e38b5d7d..ce6ec45f06 100644 --- a/jena-arq/src/main/java/org/apache/jena/web/FileSender.java +++ b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/FileSender.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.web; +package org.apache.jena.fuseki; import java.io.InputStream; import java.net.URI; @@ -34,16 +34,14 @@ import org.apache.jena.riot.WebContent; import org.apache.jena.riot.web.HttpNames; /** - * Simple Multipart HTTP PUT/POST sender for testing. - * THis class does not stream the content. - * It is in main/src to enable sharing without needing to depend on a test artifact. + * Simple multipart form data HTTP PUT/POST sender, primarily for. + * This class does not stream the content. */ public class FileSender { + // This class is in main/src to enable sharing without needing to depend on a test artifact. - static record Entry(String fileName, String content, String contentType) {} - + private static record Entry(String fileName, String content, String contentType) {} private List<Entry> items = new ArrayList<>(); - private final String url; public FileSender(String url ) { this.url = url; } diff --git a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestWebappFileUpload.java b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestWebappFileUpload.java index 15fc83787a..338ae1aad4 100644 --- a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestWebappFileUpload.java +++ b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestWebappFileUpload.java @@ -33,7 +33,6 @@ import org.apache.jena.sparql.core.DatasetGraph; import org.apache.jena.sparql.exec.http.DSP; import org.apache.jena.sparql.exec.http.GSP; import org.apache.jena.sparql.graph.GraphFactory; -import org.apache.jena.web.FileSender; import org.junit.Test; /**
