-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/fix/jetty-12.1.x/12681-cached-co…
…ntent-already-released' into fix/jetty-12.1.x/serlvet6-demos # Conflicts: # jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/content/CachingHttpContentFactory.java
- Loading branch information
Showing
2 changed files
with
133 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 101 additions & 0 deletions
101
...etty-http/src/test/java/org/eclipse/jetty/http/content/CachingHttpContentFactoryTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| // | ||
| // ======================================================================== | ||
| // Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others. | ||
| // | ||
| // This program and the accompanying materials are made available under the | ||
| // terms of the Eclipse Public License v. 2.0 which is available at | ||
| // https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 | ||
| // which is available at https://www.apache.org/licenses/LICENSE-2.0. | ||
| // | ||
| // SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 | ||
| // ======================================================================== | ||
| // | ||
|
|
||
| package org.eclipse.jetty.http.content; | ||
|
|
||
| import java.io.ByteArrayOutputStream; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
|
|
||
| import org.eclipse.jetty.http.MimeTypes; | ||
| import org.eclipse.jetty.io.ArrayByteBufferPool; | ||
| import org.eclipse.jetty.io.ByteBufferPool; | ||
| import org.eclipse.jetty.io.Content; | ||
| import org.eclipse.jetty.toolchain.test.jupiter.WorkDir; | ||
| import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension; | ||
| import org.eclipse.jetty.util.Blocker; | ||
| import org.eclipse.jetty.util.resource.ResourceFactory; | ||
| import org.junit.jupiter.api.AfterEach; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.ExtendWith; | ||
|
|
||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.is; | ||
|
|
||
| @ExtendWith(WorkDirExtension.class) | ||
| public class CachingHttpContentFactoryTest | ||
| { | ||
| public WorkDir workDir; | ||
| private ArrayByteBufferPool.Tracking trackingPool; | ||
| private ByteBufferPool.Sized sizedPool; | ||
|
|
||
| @BeforeEach | ||
| public void setUp() | ||
| { | ||
| trackingPool = new ArrayByteBufferPool.Tracking(); | ||
| sizedPool = new ByteBufferPool.Sized(trackingPool); | ||
| } | ||
|
|
||
| @AfterEach | ||
| public void tearDown() | ||
| { | ||
| assertThat("Leaks: " + trackingPool.dumpLeaks(), trackingPool.getLeaks().size(), is(0)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testWriteEvictedContent() throws Exception | ||
| { | ||
| Path file = Files.writeString(workDir.getEmptyPathDir().resolve("file.txt"), "0123456789abcdefghijABCDEFGHIJ"); | ||
| ResourceHttpContentFactory resourceHttpContentFactory = new ResourceHttpContentFactory(ResourceFactory.root().newResource(file.getParent()), MimeTypes.DEFAULTS, sizedPool); | ||
| CachingHttpContentFactory cachingHttpContentFactory = new CachingHttpContentFactory(resourceHttpContentFactory, sizedPool); | ||
|
|
||
| HttpContent content = cachingHttpContentFactory.getContent("file.txt"); | ||
|
|
||
| // Empty the cache so 'content' gets released. | ||
| cachingHttpContentFactory.flushCache(); | ||
|
|
||
| ByteArrayOutputStream baos = new ByteArrayOutputStream(); | ||
| try (Blocker.Callback cb = Blocker.callback()) | ||
| { | ||
| content.writeTo(Content.Sink.from(baos), 0L, -1L, cb); | ||
| cb.block(); | ||
| } | ||
| assertThat(baos.toString(StandardCharsets.UTF_8), is("0123456789abcdefghijABCDEFGHIJ")); | ||
| } | ||
|
|
||
| @Test | ||
| public void testEvictBetweenWriteToAndSinkWrite() throws Exception | ||
| { | ||
| Path file = Files.writeString(workDir.getEmptyPathDir().resolve("file.txt"), "0123456789abcdefghijABCDEFGHIJ"); | ||
| ResourceHttpContentFactory resourceHttpContentFactory = new ResourceHttpContentFactory(ResourceFactory.root().newResource(file.getParent()), MimeTypes.DEFAULTS, sizedPool); | ||
| CachingHttpContentFactory cachingHttpContentFactory = new CachingHttpContentFactory(resourceHttpContentFactory, sizedPool); | ||
|
|
||
| HttpContent content = cachingHttpContentFactory.getContent("file.txt"); | ||
|
|
||
| ByteArrayOutputStream baos = new ByteArrayOutputStream(); | ||
| try (Blocker.Callback cb = Blocker.callback()) | ||
| { | ||
| content.writeTo((last, byteBuffer, callback) -> | ||
| { | ||
| // Empty the cache so 'content' gets released. | ||
| cachingHttpContentFactory.flushCache(); | ||
|
|
||
| Content.Sink.from(baos).write(last, byteBuffer, callback); | ||
| }, 0L, -1L, cb); | ||
| cb.block(); | ||
| } | ||
| assertThat(baos.toString(StandardCharsets.UTF_8), is("0123456789abcdefghijABCDEFGHIJ")); | ||
| } | ||
| } |