Repository: tapestry-5 Updated Branches: refs/heads/5.4.x 8a82679cb -> 2fdf86057
TAP5-2601: fixing compilation error Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/2fdf8605 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/2fdf8605 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/2fdf8605 Branch: refs/heads/5.4.x Commit: 2fdf8605758befc2fac78fbc6096f786fc8b34c9 Parents: 8a82679 Author: Thiago H. de Paula Figueiredo <[email protected]> Authored: Sat Dec 8 11:41:47 2018 -0200 Committer: Thiago H. de Paula Figueiredo <[email protected]> Committed: Sat Dec 8 11:41:47 2018 -0200 ---------------------------------------------------------------------- .../apache/tapestry5/modules/AssetsModule.java | 86 +++++++++++++++++--- 1 file changed, 76 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2fdf8605/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java index 16ab378..f6b9156 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java @@ -18,16 +18,71 @@ import java.util.Map; import org.apache.tapestry5.SymbolConstants; import org.apache.tapestry5.internal.AssetConstants; import org.apache.tapestry5.internal.InternalConstants; -import org.apache.tapestry5.internal.services.*; -import org.apache.tapestry5.internal.services.assets.*; +import org.apache.tapestry5.internal.services.AssetSourceImpl; +import org.apache.tapestry5.internal.services.ClasspathAssetAliasManagerImpl; +import org.apache.tapestry5.internal.services.ClasspathAssetFactory; +import org.apache.tapestry5.internal.services.ContextAssetFactory; +import org.apache.tapestry5.internal.services.ExternalUrlAssetFactory; +import org.apache.tapestry5.internal.services.IdentityAssetPathConverter; +import org.apache.tapestry5.internal.services.RequestConstants; +import org.apache.tapestry5.internal.services.ResourceStreamer; +import org.apache.tapestry5.internal.services.assets.AssetChecksumGeneratorImpl; +import org.apache.tapestry5.internal.services.assets.AssetPathConstructorImpl; +import org.apache.tapestry5.internal.services.assets.CSSURLRewriter; +import org.apache.tapestry5.internal.services.assets.ClasspathAssetRequestHandler; +import org.apache.tapestry5.internal.services.assets.CompressionAnalyzerImpl; +import org.apache.tapestry5.internal.services.assets.ContentTypeAnalyzerImpl; +import org.apache.tapestry5.internal.services.assets.ContextAssetRequestHandler; +import org.apache.tapestry5.internal.services.assets.JavaScriptStackAssembler; +import org.apache.tapestry5.internal.services.assets.JavaScriptStackAssemblerImpl; +import org.apache.tapestry5.internal.services.assets.JavaScriptStackMinimizeDisabler; +import org.apache.tapestry5.internal.services.assets.MasterResourceMinimizer; +import org.apache.tapestry5.internal.services.assets.ResourceChangeTracker; +import org.apache.tapestry5.internal.services.assets.ResourceChangeTrackerImpl; +import org.apache.tapestry5.internal.services.assets.SRSCachingInterceptor; +import org.apache.tapestry5.internal.services.assets.SRSCompressedCachingInterceptor; +import org.apache.tapestry5.internal.services.assets.SRSCompressingInterceptor; +import org.apache.tapestry5.internal.services.assets.SRSMinimizingInterceptor; +import org.apache.tapestry5.internal.services.assets.StackAssetRequestHandler; +import org.apache.tapestry5.internal.services.assets.StreamableResourceSourceImpl; +import org.apache.tapestry5.internal.services.assets.UTF8ForTextAssets; import org.apache.tapestry5.internal.services.messages.ClientLocalizationMessageResource; -import org.apache.tapestry5.ioc.*; -import org.apache.tapestry5.ioc.annotations.*; +import org.apache.tapestry5.ioc.MappedConfiguration; +import org.apache.tapestry5.ioc.OperationTracker; +import org.apache.tapestry5.ioc.OrderedConfiguration; +import org.apache.tapestry5.ioc.Resource; +import org.apache.tapestry5.ioc.ServiceBinder; +import org.apache.tapestry5.ioc.annotations.Autobuild; +import org.apache.tapestry5.ioc.annotations.Contribute; +import org.apache.tapestry5.ioc.annotations.Decorate; +import org.apache.tapestry5.ioc.annotations.Marker; +import org.apache.tapestry5.ioc.annotations.Order; +import org.apache.tapestry5.ioc.annotations.Primary; +import org.apache.tapestry5.ioc.annotations.Symbol; import org.apache.tapestry5.ioc.services.ChainBuilder; import org.apache.tapestry5.ioc.services.FactoryDefaults; import org.apache.tapestry5.ioc.services.SymbolProvider; -import org.apache.tapestry5.services.*; -import org.apache.tapestry5.services.assets.*; +import org.apache.tapestry5.services.ApplicationGlobals; +import org.apache.tapestry5.services.AssetFactory; +import org.apache.tapestry5.services.AssetPathConverter; +import org.apache.tapestry5.services.AssetRequestDispatcher; +import org.apache.tapestry5.services.AssetSource; +import org.apache.tapestry5.services.ClasspathAssetAliasManager; +import org.apache.tapestry5.services.ClasspathAssetProtectionRule; +import org.apache.tapestry5.services.ClasspathProvider; +import org.apache.tapestry5.services.ComponentClassResolver; +import org.apache.tapestry5.services.ContextProvider; +import org.apache.tapestry5.services.Core; +import org.apache.tapestry5.services.Dispatcher; +import org.apache.tapestry5.services.Request; +import org.apache.tapestry5.services.ResponseCompressionAnalyzer; +import org.apache.tapestry5.services.assets.AssetChecksumGenerator; +import org.apache.tapestry5.services.assets.AssetPathConstructor; +import org.apache.tapestry5.services.assets.AssetRequestHandler; +import org.apache.tapestry5.services.assets.CompressionAnalyzer; +import org.apache.tapestry5.services.assets.ContentTypeAnalyzer; +import org.apache.tapestry5.services.assets.ResourceMinimizer; +import org.apache.tapestry5.services.assets.StreamableResourceSource; import org.apache.tapestry5.services.javascript.JavaScriptStackSource; import org.apache.tapestry5.services.messages.ComponentMessagesSource; @@ -364,15 +419,26 @@ public class AssetsModule return chainBuilder.build(ClasspathAssetProtectionRule.class, rules); } + final private static class LowercaseSuffixClasspathAssetProtectinRule implements ClasspathAssetProtectionRule { + final private String suffix; + public LowercaseSuffixClasspathAssetProtectinRule(String suffix) { + this.suffix = suffix; + } + @Override + public boolean block(String path) { + return path.toLowerCase().endsWith(suffix); + } + } + public static void contributeClasspathAssetProtectionRule( OrderedConfiguration<ClasspathAssetProtectionRule> configuration) { - ClasspathAssetProtectionRule classFileRule = (s) -> s.toLowerCase().endsWith(".class"); + ClasspathAssetProtectionRule classFileRule = new LowercaseSuffixClasspathAssetProtectinRule(".class"); configuration.add("ClassFile", classFileRule); - ClasspathAssetProtectionRule propertiesFileRule = (s) -> s.toLowerCase().endsWith(".properties"); + ClasspathAssetProtectionRule propertiesFileRule = new LowercaseSuffixClasspathAssetProtectinRule(".properties"); configuration.add("PropertiesFile", propertiesFileRule); - ClasspathAssetProtectionRule xmlFileRule = (s) -> s.toLowerCase().endsWith(".xml"); - configuration.add("XMLFile", xmlFileRule); + ClasspathAssetProtectionRule xmlFileRule = new LowercaseSuffixClasspathAssetProtectinRule(".xml"); + configuration.add("XMLFile", xmlFileRule); } }
