Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor and improvements to HttpContent Factories #8767

Merged
merged 44 commits into from
Nov 16, 2022
Merged

Refactor and improvements to HttpContent Factories #8767

merged 44 commits into from
Nov 16, 2022

Commits on Oct 11, 2022

  1. Refactor for CachingContentFactory and ResourceService 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    1353f16 View commit details
    Browse the repository at this point in the history

  2. only check file modified time once per second for cached files 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    a7383ea View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2022

  1. fix stampede creating CachingHttpContent & remove usage of getPreComp… 

    …ressedContentFormats

Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    6a6681a View commit details
    Browse the repository at this point in the history

  2. remove usage of HttpContent.getPreCompressedContentFormats for jetty-… 

    …core & ee10

Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    9f86212 View commit details
    Browse the repository at this point in the history

  3. remove getPreCompressedContentFormats from HttpContent 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    81f67f3 View commit details
    Browse the repository at this point in the history

  4. remove getPrecompressedContents from HttpContent and ee9 impl 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    6db4bf8 View commit details
    Browse the repository at this point in the history

  5. use jetty-core ResourceContentFactory in ee9 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    affa747 View commit details
    Browse the repository at this point in the history

  6. replace use of CachedContentFactory with CachingContentFactory 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    6771db4 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2022

  1. cleanups of HttpContentWrapper and ResourceService 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    2d161bf View commit details
    Browse the repository at this point in the history

  2. extract the generation of getCompressedContentFormats to separate con… 

    …tentFactory

Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    57f71ce View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2022

  1. cache more fields in CachingHttpContent 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    64a5b07 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2022

  1. work in progress to improve CachingContentFactory 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    e910a8e View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2022

  1. further work on CachingContentFactory 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    fbceb92 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-… 

    …HttpContent-Caching-Refactor
    @lachlan-roberts
    lachlan-roberts committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    cccc16c View commit details
    Browse the repository at this point in the history

  3. fix failing test cases for ResourceService and Etags 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    bbd7ace View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2022

  1. Rename all HttpContent factories 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    ad7ae3c View commit details
    Browse the repository at this point in the history

  2. cleanups of HttpContent factories 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    3c08931 View commit details
    Browse the repository at this point in the history

  3. improve configuration options for HttpContent.Factory 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    86da43a View commit details
    Browse the repository at this point in the history

  4. separate evicting logic from CachingHttpContentFactory 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    8768725 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2022

  1. use RetainableByteBuffer for getBuffer in HttpContent 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    0e1bae4 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2022

  1. fix bugs in CachingHttpContentFactory, ResourceService and FileMapped… 

    …HttpContentFactory

Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    98c6675 View commit details
    Browse the repository at this point in the history

  2. ResourceHandlerTest should validate cache entry on every request 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    964108f View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2022

  1. cannot add ContentFactory to servletContext attribute as there may be… 

    … multiple factories in a single context

Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    02e0a39 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-… 

    …HttpContent-Caching-Refactor
    @lachlan-roberts
    lachlan-roberts committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    7752720 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2022

  1. use name annotation for EvictingCachingContentFactory constructors 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    af19607 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2022

  1. changes from review 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    e28a528 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-… 

    …HttpContent-Caching-Refactor
    @lachlan-roberts
    lachlan-roberts committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    6facedb View commit details
    Browse the repository at this point in the history

  3. do not cache notFound entries in TryPathsHandlerTests ResourceHandler 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    ac2d54a View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2022

  1. fix release in CachingHttpContentFactory and always use ByteBufferPool 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    c0bb027 View commit details
    Browse the repository at this point in the history

  2. add getBytesOccupied method to HttpContent 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    4ad42e3 View commit details
    Browse the repository at this point in the history

  3. fix javadoc in ValidatingCachingContentFactory 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    d94abe3 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-… 

    …HttpContent-Caching-Refactor
    @lachlan-roberts
    lachlan-roberts committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    7bb3fca View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2022

  1. changes from review 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    489da47 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-… 

    …HttpContent-Caching-Refactor
    @lachlan-roberts
    lachlan-roberts committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    75f210d View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2022

  1. changes from review 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    a4e773a View commit details
    Browse the repository at this point in the history

  2. add getters and setters for HttpContentFactory onto ResourceHandler 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    5fec180 View commit details
    Browse the repository at this point in the history

  3. use double checked locking for FileMappedHttpContent 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    890d025 View commit details
    Browse the repository at this point in the history

  4. fix javadoc 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    3d96b4b View commit details
    Browse the repository at this point in the history

  5. fixes to the CachingHttpContentFactory caching algorithm 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    387d380 View commit details
    Browse the repository at this point in the history

  6. add return to BufferUtil.readFrom javadoc 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    24ce284 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2022

  1. changes from review 

    Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    1c6d36e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-… 

    …HttpContent-Caching-Refactor
    @lachlan-roberts
    lachlan-roberts committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    eeb4df9 View commit details
    Browse the repository at this point in the history

  3. remove setter for HttpContentFactory on ResourceHandler 

    revert to using computeIfAbsent on CachingHttpContentFactory
make direct buffers configurable on CachingHttpContentFactory

Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    1266581 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2022

  1. fix to ResourceHandler for ResourceHandlerTest.testDirectoryOfCollect… 

    …ions

Signed-off-by: Lachlan Roberts <[email protected]>
    @lachlan-roberts
    lachlan-roberts committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    905568a View commit details
    Browse the repository at this point in the history