You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by th...@apache.org on 2023/06/10 00:01:49 UTC
[tapestry-5] branch better-page-invalidation updated: TAP5-2742: PageClassloaderContext -> PageClassLoaderContext
This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a commit to branch better-page-invalidation
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/better-page-invalidation by this push:
new 98f7de210 TAP5-2742: PageClassloaderContext -> PageClassLoaderContext
98f7de210 is described below
commit 98f7de210793b8dc918f4eb36a6a544d0333d5e6
Author: Thiago H. de Paula Figueiredo <th...@arsmachina.com.br>
AuthorDate: Fri Jun 9 21:01:35 2023 -0300
TAP5-2742: PageClassloaderContext -> PageClassLoaderContext
---
.../internal/bindings/PropBindingFactory.java | 12 +--
.../internal/renderers/RequestRenderer.java | 14 +--
.../services/ComponentDependencyRegistryImpl.java | 10 +-
.../services/ComponentInstantiatorSourceImpl.java | 40 ++++----
.../internal/services/PageSourceImpl.java | 24 ++---
.../apache/tapestry5/modules/PageLoadModule.java | 10 +-
.../apache/tapestry5/modules/TapestryModule.java | 10 +-
...derContext.java => PageClassLoaderContext.java} | 50 +++++-----
...ger.java => PageClassLoaderContextManager.java} | 16 +--
...java => PageClassLoaderContextManagerImpl.java} | 110 ++++++++++-----------
.../integration/app1/components/Border.java | 4 +-
.../ComponentDependencyRegistryImplTest.java | 16 +--
12 files changed, 158 insertions(+), 158 deletions(-)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBindingFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBindingFactory.java
index acf7448e1..0d95b5254 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBindingFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBindingFactory.java
@@ -20,8 +20,8 @@ import org.apache.tapestry5.commons.Location;
import org.apache.tapestry5.commons.internal.services.StringInterner;
import org.apache.tapestry5.commons.internal.util.TapestryException;
import org.apache.tapestry5.services.BindingFactory;
-import org.apache.tapestry5.services.pageload.PageClassloaderContext;
-import org.apache.tapestry5.services.pageload.PageClassloaderContextManager;
+import org.apache.tapestry5.services.pageload.PageClassLoaderContext;
+import org.apache.tapestry5.services.pageload.PageClassLoaderContextManager;
/**
* Binding factory for reading and updating JavaBean properties.
@@ -35,14 +35,14 @@ public class PropBindingFactory implements BindingFactory
private final StringInterner interner;
- private final PageClassloaderContextManager pageClassloaderContextManager;
+ private final PageClassLoaderContextManager pageClassLoaderContextManager;
public PropBindingFactory(PropertyConduitSource propertyConduitSource, StringInterner interner,
- PageClassloaderContextManager pageClassloaderContextManager)
+ PageClassLoaderContextManager pageClassLoaderContextManager)
{
source = propertyConduitSource;
this.interner = interner;
- this.pageClassloaderContextManager = pageClassloaderContextManager;
+ this.pageClassLoaderContextManager = pageClassLoaderContextManager;
}
public Binding newBinding(String description, ComponentResources container,
@@ -66,7 +66,7 @@ public class PropBindingFactory implements BindingFactory
final String className = targetClass.getName();
try
{
- final PageClassloaderContext context = pageClassloaderContextManager.get(className);
+ final PageClassLoaderContext context = pageClassLoaderContextManager.get(className);
targetClass = context.getProxyFactory()
.getClassLoader().loadClass(className);
} catch (ClassNotFoundException e)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/RequestRenderer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/RequestRenderer.java
index 952ef050f..289889c08 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/RequestRenderer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/RequestRenderer.java
@@ -27,8 +27,8 @@ import org.apache.tapestry5.ioc.annotations.Symbol;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.services.ComponentClassResolver;
import org.apache.tapestry5.services.ObjectRenderer;
-import org.apache.tapestry5.services.pageload.PageClassloaderContext;
-import org.apache.tapestry5.services.pageload.PageClassloaderContextManager;
+import org.apache.tapestry5.services.pageload.PageClassLoaderContext;
+import org.apache.tapestry5.services.pageload.PageClassLoaderContextManager;
import java.util.ArrayList;
import java.util.Collections;
@@ -46,7 +46,7 @@ public class RequestRenderer implements ObjectRenderer<Request>
private final boolean productionMode;
- private final PageClassloaderContextManager pageClassloaderContextManager;
+ private final PageClassLoaderContextManager pageClassLoaderContextManager;
private final PageSource pageSource;
@@ -57,7 +57,7 @@ public class RequestRenderer implements ObjectRenderer<Request>
Context context,
@Symbol(TapestryHttpSymbolConstants.CONTEXT_PATH) String contextPath,
@Symbol(SymbolConstants.PRODUCTION_MODE) boolean productionMode,
- PageClassloaderContextManager pageClassloaderContextManager,
+ PageClassLoaderContextManager pageClassLoaderContextManager,
PageSource pageSource,
ComponentClassResolver componentClassResolver)
{
@@ -65,7 +65,7 @@ public class RequestRenderer implements ObjectRenderer<Request>
this.context = context;
this.contextPath = contextPath;
this.productionMode = productionMode;
- this.pageClassloaderContextManager = pageClassloaderContextManager;
+ this.pageClassLoaderContextManager = pageClassLoaderContextManager;
this.pageSource = pageSource;
this.componentClassResolver = componentClassResolver;
}
@@ -281,7 +281,7 @@ public class RequestRenderer implements ObjectRenderer<Request>
// {
// section(writer, "Page Classloader Context");
// writer.element("ul");
-// render(pageClassloaderContextManager.getRoot(), writer);
+// render(pageClassLoaderContextManager.getRoot(), writer);
// writer.end(); // ul
// }
// }
@@ -349,7 +349,7 @@ public class RequestRenderer implements ObjectRenderer<Request>
// writer.write(page.getName());
// writer.end(); // td
// writer.element("td");
-// writer.write(pageClassloaderContextManager.getRoot().findByClassName(componentClassResolver.getClassName(page.getName())).toString());
+// writer.write(pageClassLoaderContextManager.getRoot().findByClassName(componentClassResolver.getClassName(page.getName())).toString());
// writer.end(); // td
// writer.end(); // tr
// }
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentDependencyRegistryImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentDependencyRegistryImpl.java
index ec6d61cb6..d6d5d99f3 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentDependencyRegistryImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentDependencyRegistryImpl.java
@@ -63,7 +63,7 @@ import org.apache.tapestry5.plastic.PlasticField;
import org.apache.tapestry5.plastic.PlasticManager;
import org.apache.tapestry5.runtime.Component;
import org.apache.tapestry5.services.ComponentClassResolver;
-import org.apache.tapestry5.services.pageload.PageClassloaderContextManager;
+import org.apache.tapestry5.services.pageload.PageClassLoaderContextManager;
import org.apache.tapestry5.services.templates.ComponentTemplateLocator;
import org.slf4j.Logger;
@@ -72,7 +72,7 @@ public class ComponentDependencyRegistryImpl implements ComponentDependencyRegis
private static final List<String> EMPTY_LIST = Collections.emptyList();
- final private PageClassloaderContextManager pageClassloaderContextManager;
+ final private PageClassLoaderContextManager pageClassLoaderContextManager;
private static final String META_ATTRIBUTE = "injectedComponentDependencies";
@@ -102,13 +102,13 @@ public class ComponentDependencyRegistryImpl implements ComponentDependencyRegis
final private boolean storedDependencyInformationPresent;
public ComponentDependencyRegistryImpl(
- final PageClassloaderContextManager pageClassloaderContextManager,
+ final PageClassLoaderContextManager pageClassLoaderContextManager,
final PlasticManager plasticManager,
final ComponentClassResolver componentClassResolver,
final TemplateParser templateParser,
final ComponentTemplateLocator componentTemplateLocator)
{
- this.pageClassloaderContextManager = pageClassloaderContextManager;
+ this.pageClassLoaderContextManager = pageClassLoaderContextManager;
map = new HashMap<>();
alreadyProcessed = new HashSet<>();
this.plasticManager = plasticManager;
@@ -604,7 +604,7 @@ public class ComponentDependencyRegistryImpl implements ComponentDependencyRegis
// Don't invalidate component dependency information when
// PageClassloaderContextManager is merging contexts
// TODO: is this still needed since the inception of INVALIDATIONS_ENABLED?
- else if (!pageClassloaderContextManager.isMerging())
+ else if (!pageClassLoaderContextManager.isMerging())
{
furtherDependents = new ArrayList<>();
for (String resource : resources)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImpl.java
index 4d0fa42ea..b38bf2991 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImpl.java
@@ -80,8 +80,8 @@ import org.apache.tapestry5.runtime.PageLifecycleListener;
import org.apache.tapestry5.services.ComponentClassResolver;
import org.apache.tapestry5.services.ComponentEventHandler;
import org.apache.tapestry5.services.TransformConstants;
-import org.apache.tapestry5.services.pageload.PageClassloaderContext;
-import org.apache.tapestry5.services.pageload.PageClassloaderContextManager;
+import org.apache.tapestry5.services.pageload.PageClassLoaderContext;
+import org.apache.tapestry5.services.pageload.PageClassLoaderContextManager;
import org.apache.tapestry5.services.transform.ComponentClassTransformWorker2;
import org.apache.tapestry5.services.transform.ControlledPackageType;
import org.apache.tapestry5.services.transform.TransformationSupport;
@@ -113,9 +113,9 @@ public final class ComponentInstantiatorSourceImpl implements ComponentInstantia
private final ComponentClassResolver resolver;
- private final PageClassloaderContextManager pageClassloaderContextManager;
+ private final PageClassLoaderContextManager pageClassLoaderContextManager;
- private PageClassloaderContext rootPageClassloaderContext;
+ private PageClassLoaderContext rootPageClassloaderContext;
private PlasticProxyFactoryProxy plasticProxyFactoryProxy;
@@ -166,7 +166,7 @@ public final class ComponentInstantiatorSourceImpl implements ComponentInstantia
InternalComponentInvalidationEventHub invalidationHub,
- PageClassloaderContextManager pageClassloaderContextManager,
+ PageClassLoaderContextManager pageClassLoaderContextManager,
ComponentDependencyRegistry componentDependencyRegistry
)
@@ -180,7 +180,7 @@ public final class ComponentInstantiatorSourceImpl implements ComponentInstantia
this.invalidationHub = invalidationHub;
this.productionMode = productionMode;
this.resolver = resolver;
- this.pageClassloaderContextManager = pageClassloaderContextManager;
+ this.pageClassLoaderContextManager = pageClassLoaderContextManager;
this.componentDependencyRegistry = componentDependencyRegistry;
// For now, we just need the keys of the configuration. When there are more types of controlled
@@ -190,7 +190,7 @@ public final class ComponentInstantiatorSourceImpl implements ComponentInstantia
initializeService();
- pageClassloaderContextManager.initialize(
+ pageClassLoaderContextManager.initialize(
rootPageClassloaderContext,
ComponentInstantiatorSourceImpl.this::createPlasticProxyFactory);
@@ -215,10 +215,10 @@ public final class ComponentInstantiatorSourceImpl implements ComponentInstantia
for (String className : classNames)
{
- final PageClassloaderContext context = rootPageClassloaderContext.findByClassName(className);
+ final PageClassLoaderContext context = rootPageClassloaderContext.findByClassName(className);
if (context != rootPageClassloaderContext && context != null)
{
- classesToInvalidate.addAll(pageClassloaderContextManager.invalidate(context));
+ classesToInvalidate.addAll(pageClassLoaderContextManager.invalidate(context));
}
}
@@ -262,7 +262,7 @@ public final class ComponentInstantiatorSourceImpl implements ComponentInstantia
{
changeTracker.clear();
invalidationHub.classInControlledPackageHasChanged();
- pageClassloaderContextManager.clear();
+ pageClassLoaderContextManager.clear();
classToModel.clear();
}
@@ -271,7 +271,7 @@ public final class ComponentInstantiatorSourceImpl implements ComponentInstantia
changeTracker.clear();
classToInstantiator.clear();
classToModel.clear();
- pageClassloaderContextManager.clear();
+ pageClassLoaderContextManager.clear();
initializeService();
}
@@ -283,17 +283,17 @@ public final class ComponentInstantiatorSourceImpl implements ComponentInstantia
private void initializeService()
{
- pageClassloaderContextManager.clear();
+ pageClassLoaderContextManager.clear();
if (rootPageClassloaderContext == null)
{
logger.info("Initializing page pool");
- pageClassloaderContextManager.clear();
+ pageClassLoaderContextManager.clear();
PlasticProxyFactory proxyFactory = createPlasticProxyFactory(parent);
- rootPageClassloaderContext = new PageClassloaderContext(
- "root", null, Collections.emptySet(), proxyFactory, pageClassloaderContextManager::get);
+ rootPageClassloaderContext = new PageClassLoaderContext(
+ "root", null, Collections.emptySet(), proxyFactory, pageClassLoaderContextManager::get);
}
else
{
@@ -341,10 +341,10 @@ public final class ComponentInstantiatorSourceImpl implements ComponentInstantia
OPEN_INSTANTIATORS.get().add(className);
componentDependencyRegistry.disableInvalidations();
- PageClassloaderContext context;
+ PageClassLoaderContext context;
try
{
- context = pageClassloaderContextManager.get(className);
+ context = pageClassLoaderContextManager.get(className);
}
finally
{
@@ -557,7 +557,7 @@ public final class ComponentInstantiatorSourceImpl implements ComponentInstantia
{
try
{
- final PageClassloaderContext context = pageClassloaderContextManager.get(typeName);
+ final PageClassLoaderContext context = pageClassLoaderContextManager.get(typeName);
return PlasticInternalUtils.toClass(context.getPlasticManager().getClassLoader(), typeName);
} catch (ClassNotFoundException ex)
{
@@ -767,10 +767,10 @@ public final class ComponentInstantiatorSourceImpl implements ComponentInstantia
@Override
public PlasticProxyFactory getProxyFactory(String className)
{
- PageClassloaderContext context = rootPageClassloaderContext.findByClassName(className);
+ PageClassLoaderContext context = rootPageClassloaderContext.findByClassName(className);
if (context == null)
{
- context = pageClassloaderContextManager.get(className);
+ context = pageClassLoaderContextManager.get(className);
}
return context.getProxyFactory();
}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageSourceImpl.java
index f0c5936dd..a4a8cdea8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageSourceImpl.java
@@ -40,8 +40,8 @@ import org.apache.tapestry5.services.ComponentMessages;
import org.apache.tapestry5.services.ComponentTemplates;
import org.apache.tapestry5.services.pageload.ComponentRequestSelectorAnalyzer;
import org.apache.tapestry5.services.pageload.ComponentResourceSelector;
-import org.apache.tapestry5.services.pageload.PageClassloaderContext;
-import org.apache.tapestry5.services.pageload.PageClassloaderContextManager;
+import org.apache.tapestry5.services.pageload.PageClassLoaderContext;
+import org.apache.tapestry5.services.pageload.PageClassLoaderContextManager;
import org.slf4j.Logger;
public class PageSourceImpl implements PageSource
@@ -54,7 +54,7 @@ public class PageSourceImpl implements PageSource
private final ComponentClassResolver componentClassResolver;
- private final PageClassloaderContextManager pageClassloaderContextManager;
+ private final PageClassLoaderContextManager pageClassLoaderContextManager;
private final Logger logger;
@@ -103,7 +103,7 @@ public class PageSourceImpl implements PageSource
public PageSourceImpl(PageLoader pageLoader, ComponentRequestSelectorAnalyzer selectorAnalyzer,
ComponentDependencyRegistry componentDependencyRegistry,
ComponentClassResolver componentClassResolver,
- PageClassloaderContextManager pageClassloaderContextManager,
+ PageClassLoaderContextManager pageClassLoaderContextManager,
@Symbol(SymbolConstants.PRODUCTION_MODE) boolean productionMode,
Logger logger)
{
@@ -112,7 +112,7 @@ public class PageSourceImpl implements PageSource
this.componentDependencyRegistry = componentDependencyRegistry;
this.componentClassResolver = componentClassResolver;
this.productionMode = productionMode;
- this.pageClassloaderContextManager = pageClassloaderContextManager;
+ this.pageClassLoaderContextManager = pageClassLoaderContextManager;
this.logger = logger;
}
@@ -159,7 +159,7 @@ public class PageSourceImpl implements PageSource
// Avoiding problems in PlasticClassPool.createTransformation()
// when the class being loaded has a page superclass
final String className = componentClassResolver.resolvePageNameToClassName(canonicalPageName);
-// PageClassloaderContext context = pageClassloaderContextManager.get(className);
+// PageClassloaderContext context = pageClassLoaderContextManager.get(className);
// final Class<?> superclass = getSuperclass(className, context);
// final String superclassName = superclass.getName();
// if (componentClassResolver.isPage(superclassName))
@@ -188,15 +188,15 @@ public class PageSourceImpl implements PageSource
final ComponentPageElement rootElement = page.getRootElement();
componentDependencyRegistry.clear(rootElement);
componentDependencyRegistry.register(rootElement);
- PageClassloaderContext context = pageClassloaderContextManager.get(className);
+ PageClassLoaderContext context = pageClassLoaderContextManager.get(className);
if (context.isUnknown())
{
this.pageCache.remove(key);
if (invalidateUnknownContext)
{
-// pageClassloaderContextManager.invalidate(context);
- pageClassloaderContextManager.invalidateAndFireInvalidationEvents(context);
+// pageClassLoaderContextManager.invalidate(context);
+ pageClassLoaderContextManager.invalidateAndFireInvalidationEvents(context);
preprocessPageDependencies(className);
}
// context.getClassNames().remove(className);
@@ -234,10 +234,10 @@ public class PageSourceImpl implements PageSource
private void preprocessPageClassLoaderContexts(String className, final List<String> pageDependencies) {
for (int i = 0; i < 5; i++)
{
- pageClassloaderContextManager.get(className);
+ pageClassLoaderContextManager.get(className);
for (String pageClassName : pageDependencies)
{
- final PageClassloaderContext context = pageClassloaderContextManager.get(pageClassName);
+ final PageClassLoaderContext context = pageClassLoaderContextManager.get(pageClassName);
if (i == 1)
{
try
@@ -255,7 +255,7 @@ public class PageSourceImpl implements PageSource
// {
// try
// {
-// pageClassloaderContextManager.get(pageClassName).getClassLoader().loadClass(pageClassName);
+// pageClassLoaderContextManager.get(pageClassName).getClassLoader().loadClass(pageClassName);
// } catch (ClassNotFoundException e)
// {
// throw new RuntimeException(e);
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/modules/PageLoadModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/modules/PageLoadModule.java
index a431900f5..f67e50d68 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/modules/PageLoadModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/modules/PageLoadModule.java
@@ -27,8 +27,8 @@ import org.apache.tapestry5.ioc.annotations.Symbol;
import org.apache.tapestry5.services.Core;
import org.apache.tapestry5.services.pageload.ComponentRequestSelectorAnalyzer;
import org.apache.tapestry5.services.pageload.ComponentResourceLocator;
-import org.apache.tapestry5.services.pageload.PageClassloaderContextManager;
-import org.apache.tapestry5.services.pageload.PageClassloaderContextManagerImpl;
+import org.apache.tapestry5.services.pageload.PageClassLoaderContextManager;
+import org.apache.tapestry5.services.pageload.PageClassLoaderContextManagerImpl;
import org.apache.tapestry5.services.pageload.PagePreloader;
import org.apache.tapestry5.services.pageload.PreloaderMode;
@@ -44,7 +44,7 @@ public class PageLoadModule
binder.bind(ComponentResourceLocator.class, DefaultComponentResourceLocator.class);
binder.bind(ComponentTemplateSource.class, ComponentTemplateSourceImpl.class);
binder.bind(PagePreloader.class, PagePreloaderImpl.class);
- binder.bind(PageClassloaderContextManager.class, PageClassloaderContextManagerImpl.class);
+ binder.bind(PageClassLoaderContextManager.class, PageClassLoaderContextManagerImpl.class);
}
@Startup
@@ -62,7 +62,7 @@ public class PageLoadModule
@Startup
public void preloadPageClassLoaderContexts(
- PageClassloaderContextManager pageClassloaderContextManager,
+ PageClassLoaderContextManager pageClassLoaderContextManager,
ComponentDependencyRegistry componentDependencyRegistry,
@Symbol(SymbolConstants.PRODUCTION_MODE) boolean productionMode)
{
@@ -74,7 +74,7 @@ public class PageLoadModule
System.out.println();
for (String className : componentDependencyRegistry.getClassNames())
{
- pageClassloaderContextManager.get(className);
+ pageClassLoaderContextManager.get(className);
}
}
}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
index b044523be..467bcd2a3 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
@@ -372,8 +372,8 @@ import org.apache.tapestry5.services.messages.PropertiesFileParser;
import org.apache.tapestry5.services.meta.FixedExtractor;
import org.apache.tapestry5.services.meta.MetaDataExtractor;
import org.apache.tapestry5.services.meta.MetaWorker;
-import org.apache.tapestry5.services.pageload.PageClassloaderContextManager;
-import org.apache.tapestry5.services.pageload.PageClassloaderContextManagerImpl;
+import org.apache.tapestry5.services.pageload.PageClassLoaderContextManager;
+import org.apache.tapestry5.services.pageload.PageClassLoaderContextManagerImpl;
import org.apache.tapestry5.services.pageload.PreloaderMode;
import org.apache.tapestry5.services.rest.MappedEntityManager;
import org.apache.tapestry5.services.rest.OpenApiDescriptionGenerator;
@@ -969,7 +969,7 @@ public final class TapestryModule
@Symbol(TapestryHttpSymbolConstants.PRODUCTION_MODE)
boolean productionMode,
- final PageClassloaderContextManager pageClassloaderContextManager)
+ final PageClassLoaderContextManager pageClassLoaderContextManager)
{
RequestFilter staticFilesFilter = new StaticFilesFilter(context);
@@ -2787,7 +2787,7 @@ public final class TapestryModule
InternalComponentInvalidationEventHub internalComponentInvalidationEventHub,
ResourceChangeTracker resourceChangeTracker,
ComponentTemplateSource componentTemplateSource,
- PageClassloaderContextManager pageClassloaderContextManager,
+ PageClassLoaderContextManager pageClassLoaderContextManager,
ComponentInstantiatorSource componentInstantiatorSource,
ComponentClassResolver componentClassResolver,
TemplateParser templateParser,
@@ -2796,7 +2796,7 @@ public final class TapestryModule
{
ComponentDependencyRegistryImpl componentDependencyRegistry =
new ComponentDependencyRegistryImpl(
- pageClassloaderContextManager,
+ pageClassLoaderContextManager,
componentInstantiatorSource.getProxyFactory().getPlasticManager(),
componentClassResolver,
templateParser,
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassloaderContext.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassLoaderContext.java
similarity index 86%
rename from tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassloaderContext.java
rename to tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassLoaderContext.java
index 30b3e5afb..7ebb41424 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassloaderContext.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassLoaderContext.java
@@ -33,26 +33,26 @@ import org.slf4j.LoggerFactory;
* Each instance contains basically a classloader, a set of classnames, a parent
* context (possibly null) and child contexts (possibly empty).
*/
-public class PageClassloaderContext
+public class PageClassLoaderContext
{
- private static final Logger LOGGER = LoggerFactory.getLogger(PageClassloaderContext.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PageClassLoaderContext.class);
private final String name;
- private final PageClassloaderContext parent;
+ private final PageClassLoaderContext parent;
private final Set<String> classNames = new HashSet<>();
- private final Set<PageClassloaderContext> children;
+ private final Set<PageClassLoaderContext> children;
private final PlasticManager plasticManager;
private final PlasticProxyFactory proxyFactory;
- private PageClassloaderContext root;
+ private PageClassLoaderContext root;
- private final Function<String, PageClassloaderContext> provider;
+ private final Function<String, PageClassLoaderContext> provider;
/**
* Name of the <code>unknown</code> context (i.e. the one for controlled classes
@@ -60,11 +60,11 @@ public class PageClassloaderContext
*/
public static final String UNKOWN_CONTEXT_NAME = "unknown";
- public PageClassloaderContext(String name,
- PageClassloaderContext parent,
+ public PageClassLoaderContext(String name,
+ PageClassLoaderContext parent,
Set<String> classNames,
PlasticProxyFactory plasticProxyFactory,
- Function<String, PageClassloaderContext> provider)
+ Function<String, PageClassLoaderContext> provider)
{
super();
this.name = name;
@@ -92,7 +92,7 @@ public class PageClassloaderContext
{
Class<?> clasz = null;
setRootFieldIfNeeded();
- PageClassloaderContext context = root.findByClassName(
+ PageClassLoaderContext context = root.findByClassName(
PlasticUtils.getEnclosingClassName(className));
if (isRoot() && context == null)
{
@@ -152,7 +152,7 @@ public class PageClassloaderContext
/**
* Returns the parent of this context.
*/
- public PageClassloaderContext getParent()
+ public PageClassLoaderContext getParent()
{
return parent;
}
@@ -168,7 +168,7 @@ public class PageClassloaderContext
/**
* Returns the children of this context.
*/
- public Set<PageClassloaderContext> getChildren()
+ public Set<PageClassLoaderContext> getChildren()
{
return children;
}
@@ -200,7 +200,7 @@ public class PageClassloaderContext
/**
* Adds a child context.
*/
- public void addChild(PageClassloaderContext context)
+ public void addChild(PageClassLoaderContext context)
{
children.add(context);
}
@@ -208,7 +208,7 @@ public class PageClassloaderContext
/**
* Removes a child context.
*/
- public void removeChildren(PageClassloaderContext context)
+ public void removeChildren(PageClassLoaderContext context)
{
children.remove(context);
}
@@ -216,16 +216,16 @@ public class PageClassloaderContext
/**
* Searches for the context that contains the given class in itself and recursivel in its children.
*/
- public PageClassloaderContext findByClassName(String className)
+ public PageClassLoaderContext findByClassName(String className)
{
- PageClassloaderContext context = null;
+ PageClassLoaderContext context = null;
if (classNames.contains(className))
{
context = this;
}
else
{
- for (PageClassloaderContext child : children) {
+ for (PageClassLoaderContext child : children) {
context = child.findByClassName(className);
if (context != null)
{
@@ -246,11 +246,11 @@ public class PageClassloaderContext
/**
* Invalidates this context and its children recursively. This shouldn't
- * be called directly, just through {@link PageClassloaderContextManager#invalidate(PageClassloaderContext...)}.
+ * be called directly, just through {@link PageClassLoaderContextManager#invalidate(PageClassLoaderContext...)}.
*/
public void invalidate()
{
- for (PageClassloaderContext child : new ArrayList<>(children))
+ for (PageClassLoaderContext child : new ArrayList<>(children))
{
child.invalidate();
}
@@ -282,9 +282,9 @@ public class PageClassloaderContext
* Returns the set of descendents (children and their children recursively
* of this context.
*/
- public Set<PageClassloaderContext> getDescendents()
+ public Set<PageClassLoaderContext> getDescendents()
{
- Set<PageClassloaderContext> descendents;
+ Set<PageClassLoaderContext> descendents;
if (children.isEmpty())
{
descendents = Collections.emptySet();
@@ -292,7 +292,7 @@ public class PageClassloaderContext
else
{
descendents = new HashSet<>(children);
- for (PageClassloaderContext child : children)
+ for (PageClassLoaderContext child : children)
{
descendents.addAll(child.getDescendents());
}
@@ -310,10 +310,10 @@ public class PageClassloaderContext
if (this == obj) {
return true;
}
- if (!(obj instanceof PageClassloaderContext)) {
+ if (!(obj instanceof PageClassLoaderContext)) {
return false;
}
- PageClassloaderContext other = (PageClassloaderContext) obj;
+ PageClassLoaderContext other = (PageClassLoaderContext) obj;
return Objects.equals(name, other.name);
}
@@ -343,7 +343,7 @@ public class PageClassloaderContext
builder.append(" : ");
builder.append(classNames);
builder.append("\n");
- for (PageClassloaderContext child : children) {
+ for (PageClassLoaderContext child : children) {
child.toRecursiveString(builder, tabs + "\t");
}
}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassloaderContextManager.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassLoaderContextManager.java
similarity index 85%
rename from tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassloaderContextManager.java
rename to tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassLoaderContextManager.java
index 375d0526f..c6e63676c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassloaderContextManager.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassLoaderContextManager.java
@@ -20,39 +20,39 @@ import org.apache.tapestry5.commons.services.PlasticProxyFactory;
import org.apache.tapestry5.internal.services.ComponentInstantiatorSource;
/**
- * Service that creates {@linkplain PageClassloaderContext} instances (except the root one)
+ * Service that creates {@linkplain PageClassLoaderContext} instances (except the root one)
* when a class in a controlled page is first used in the Tapestry page pool. Existing
* contexts may be reused for a given class, specially when in production mode.
*
* @see ComponentInstantiatorSource
* @since 5.8.3
*/
-public interface PageClassloaderContextManager
+public interface PageClassLoaderContextManager
{
/**
* Processes a class, given its class name and the root context.
* @param className the class fully qualified name.
* {@linkplain} ClassLoader} and returns a new {@linkplain PlasticProxyFactory}.
- * @return the {@link PageClassloaderContext} associated with that class.
+ * @return the {@link PageClassLoaderContext} associated with that class.
*/
- PageClassloaderContext get(String className);
+ PageClassLoaderContext get(String className);
/**
* Invalidates page classloader contexts and returns a set containing the names
* of all classes that should be invalidated.
*/
- Set<String> invalidate(PageClassloaderContext... contexts);
+ Set<String> invalidate(PageClassLoaderContext... contexts);
/**
* Invalidates page classloader contexts and invalidates the classes in the context as well.
*/
- void invalidateAndFireInvalidationEvents(PageClassloaderContext... contexts);
+ void invalidateAndFireInvalidationEvents(PageClassLoaderContext... contexts);
/**
* Returns the root context.
*/
- PageClassloaderContext getRoot();
+ PageClassLoaderContext getRoot();
/**
* Clears any state held by this manager.
@@ -74,7 +74,7 @@ public interface PageClassloaderContextManager
* Initializes this service with the root context and a Plastic proxy factory provider.
* Method can only be called once. None of the parameters may be null.
*/
- void initialize(PageClassloaderContext root, Function<ClassLoader, PlasticProxyFactory> plasticProxyFactoryProvider);
+ void initialize(PageClassLoaderContext root, Function<ClassLoader, PlasticProxyFactory> plasticProxyFactoryProvider);
/**
* Returns the Class instance appropriate for a given component given a page name.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassloaderContextManagerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassLoaderContextManagerImpl.java
similarity index 85%
rename from tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassloaderContextManagerImpl.java
rename to tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassLoaderContextManagerImpl.java
index c257695b8..06da36917 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassloaderContextManagerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassLoaderContextManagerImpl.java
@@ -37,14 +37,14 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Default {@linkplain PageClassloaderContextManager} implementation.
+ * Default {@linkplain PageClassLoaderContextManager} implementation.
*
* @since 5.8.3
*/
-public class PageClassloaderContextManagerImpl implements PageClassloaderContextManager
+public class PageClassLoaderContextManagerImpl implements PageClassLoaderContextManager
{
- private static final Logger LOGGER = LoggerFactory.getLogger(PageClassloaderContextManager.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PageClassLoaderContextManager.class);
private final ComponentDependencyRegistry componentDependencyRegistry;
@@ -62,9 +62,9 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
private Function<ClassLoader, PlasticProxyFactory> plasticProxyFactoryProvider;
- private PageClassloaderContext root;
+ private PageClassLoaderContext root;
- public PageClassloaderContextManagerImpl(
+ public PageClassLoaderContextManagerImpl(
final ComponentDependencyRegistry componentDependencyRegistry,
final ComponentClassResolver componentClassResolver,
final InternalComponentInvalidationEventHub invalidationHub,
@@ -84,7 +84,7 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
{
synchronized (this) {
markAsNotInvalidatingContext();
- for (PageClassloaderContext context : root.getChildren())
+ for (PageClassLoaderContext context : root.getChildren())
{
if (context.isUnknown())
{
@@ -111,7 +111,7 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
@Override
public void initialize(
- final PageClassloaderContext root,
+ final PageClassLoaderContext root,
final Function<ClassLoader, PlasticProxyFactory> plasticProxyFactoryProvider)
{
if (this.root != null)
@@ -126,9 +126,9 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
}
@Override
- public PageClassloaderContext get(final String className)
+ public PageClassLoaderContext get(final String className)
{
- PageClassloaderContext context;
+ PageClassLoaderContext context;
final String enclosingClassName = PlasticUtils.getEnclosingClassName(className);
context = root.findByClassName(enclosingClassName);
@@ -160,15 +160,15 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
}
- private PageClassloaderContext getUnknownContext(final PageClassloaderContext root,
+ private PageClassLoaderContext getUnknownContext(final PageClassLoaderContext root,
final Function<ClassLoader, PlasticProxyFactory> plasticProxyFactoryProvider)
{
- PageClassloaderContext unknownContext = null;
+ PageClassLoaderContext unknownContext = null;
- for (PageClassloaderContext child : root.getChildren())
+ for (PageClassLoaderContext child : root.getChildren())
{
- if (child.getName().equals(PageClassloaderContext.UNKOWN_CONTEXT_NAME))
+ if (child.getName().equals(PageClassLoaderContext.UNKOWN_CONTEXT_NAME))
{
unknownContext = child;
break;
@@ -177,7 +177,7 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
if (unknownContext == null)
{
- unknownContext = new PageClassloaderContext(PageClassloaderContext.UNKOWN_CONTEXT_NAME, root,
+ unknownContext = new PageClassLoaderContext(PageClassLoaderContext.UNKOWN_CONTEXT_NAME, root,
Collections.emptySet(),
plasticProxyFactoryProvider.apply(root.getClassLoader()),
this::get);
@@ -187,19 +187,19 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
return unknownContext;
}
- private PageClassloaderContext processUsingDependencies(
+ private PageClassLoaderContext processUsingDependencies(
String className,
- PageClassloaderContext root,
- Supplier<PageClassloaderContext> unknownContextProvider,
+ PageClassLoaderContext root,
+ Supplier<PageClassLoaderContext> unknownContextProvider,
Function<ClassLoader, PlasticProxyFactory> plasticProxyFactoryProvider, Set<String> classesToInvalidate)
{
return processUsingDependencies(className, root, unknownContextProvider, plasticProxyFactoryProvider, classesToInvalidate, new HashSet<>());
}
- private PageClassloaderContext processUsingDependencies(
+ private PageClassLoaderContext processUsingDependencies(
String className,
- PageClassloaderContext root,
- Supplier<PageClassloaderContext> unknownContextProvider,
+ PageClassLoaderContext root,
+ Supplier<PageClassLoaderContext> unknownContextProvider,
Function<ClassLoader, PlasticProxyFactory> plasticProxyFactoryProvider,
Set<String> classesToInvalidate,
Set<String> alreadyProcessed)
@@ -209,16 +209,16 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
}
- private PageClassloaderContext processUsingDependencies(
+ private PageClassLoaderContext processUsingDependencies(
String className,
- PageClassloaderContext root,
- Supplier<PageClassloaderContext> unknownContextProvider,
+ PageClassLoaderContext root,
+ Supplier<PageClassLoaderContext> unknownContextProvider,
Function<ClassLoader, PlasticProxyFactory> plasticProxyFactoryProvider,
Set<String> classesToInvalidate,
Set<String> alreadyProcessed,
boolean processCircularDependencies)
{
- PageClassloaderContext context = root.findByClassName(className);
+ PageClassLoaderContext context = root.findByClassName(className);
if (context == null)
{
@@ -258,10 +258,10 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
}
// Collect context dependencies
- Set<PageClassloaderContext> contextDependencies = new HashSet<>();
+ Set<PageClassLoaderContext> contextDependencies = new HashSet<>();
for (String dependency : dependencies)
{
- PageClassloaderContext dependencyContext = root.findByClassName(dependency);
+ PageClassLoaderContext dependencyContext = root.findByClassName(dependency);
if (dependencyContext == null)
{
dependencyContext = processUsingDependencies(dependency, root, unknownContextProvider,
@@ -276,7 +276,7 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
if (contextDependencies.size() == 0)
{
- context = new PageClassloaderContext(
+ context = new PageClassLoaderContext(
getContextName(className),
root,
Collections.singleton(className),
@@ -285,7 +285,7 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
}
else
{
- PageClassloaderContext parentContext;
+ PageClassLoaderContext parentContext;
if (contextDependencies.size() == 1)
{
parentContext = contextDependencies.iterator().next();
@@ -294,7 +294,7 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
{
parentContext = merge(contextDependencies, plasticProxyFactoryProvider, root, classesToInvalidate);
}
- context = new PageClassloaderContext(
+ context = new PageClassLoaderContext(
getContextName(className),
parentContext,
Collections.singleton(className),
@@ -329,7 +329,7 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
return componentDependencyRegistry.getDependencies(className, DependencyType.USAGE);
}
- private Class<?> loadClass(String className, PageClassloaderContext context)
+ private Class<?> loadClass(String className, PageClassLoaderContext context)
{
try
{
@@ -340,10 +340,10 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
}
}
- private PageClassloaderContext merge(
- Set<PageClassloaderContext> contextDependencies,
+ private PageClassLoaderContext merge(
+ Set<PageClassLoaderContext> contextDependencies,
Function<ClassLoader, PlasticProxyFactory> plasticProxyFactoryProvider,
- PageClassloaderContext root, Set<String> classesToInvalidate)
+ PageClassLoaderContext root, Set<String> classesToInvalidate)
{
NESTED_MERGE_COUNT.set(NESTED_MERGE_COUNT.get() + 1);
@@ -356,7 +356,7 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
String classes;
StringBuilder builder = new StringBuilder();
builder.append("Merging the following page classloader contexts into one:\n");
- for (PageClassloaderContext context : contextDependencies)
+ for (PageClassLoaderContext context : contextDependencies)
{
classes = context.getClassNames().stream()
.map(this::getContextName)
@@ -367,28 +367,28 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
LOGGER.debug(builder.toString().trim());
}
- Set<PageClassloaderContext> allContextsIncludingDescendents = new HashSet<>();
- for (PageClassloaderContext context : contextDependencies)
+ Set<PageClassLoaderContext> allContextsIncludingDescendents = new HashSet<>();
+ for (PageClassLoaderContext context : contextDependencies)
{
allContextsIncludingDescendents.add(context);
allContextsIncludingDescendents.addAll(context.getDescendents());
}
- PageClassloaderContext merged;
+ PageClassLoaderContext merged;
// Collect the classes in these dependencies, then invalidate the contexts
- Set<PageClassloaderContext> furtherDependencies = new HashSet<>();
+ Set<PageClassLoaderContext> furtherDependencies = new HashSet<>();
Set<String> classNames = new HashSet<>();
- for (PageClassloaderContext context : contextDependencies)
+ for (PageClassLoaderContext context : contextDependencies)
{
if (!context.isRoot())
{
classNames.addAll(context.getClassNames());
}
- final PageClassloaderContext parent = context.getParent();
+ final PageClassLoaderContext parent = context.getParent();
// We don't want the merged context to have a further dependency on
// the root context (it's not mergeable) nor on itself.
if (!parent.isRoot() &&
@@ -398,16 +398,16 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
}
}
- final List<PageClassloaderContext> contextsToInvalidate = contextDependencies.stream()
+ final List<PageClassLoaderContext> contextsToInvalidate = contextDependencies.stream()
.filter(c -> !c.isRoot())
.collect(Collectors.toList());
if (!contextsToInvalidate.isEmpty())
{
- classesToInvalidate.addAll(invalidate(contextsToInvalidate.toArray(new PageClassloaderContext[contextsToInvalidate.size()])));
+ classesToInvalidate.addAll(invalidate(contextsToInvalidate.toArray(new PageClassLoaderContext[contextsToInvalidate.size()])));
}
- PageClassloaderContext parent;
+ PageClassLoaderContext parent;
// No context dependencies, so parent is going to be the root one
if (furtherDependencies.size() == 0)
@@ -430,7 +430,7 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
}
}
- merged = new PageClassloaderContext(
+ merged = new PageClassLoaderContext(
"merged " + MERGED_COUNTER.getAndIncrement(),
parent,
classNames,
@@ -456,7 +456,7 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
@Override
public void clear(String className)
{
- final PageClassloaderContext context = root.findByClassName(className);
+ final PageClassLoaderContext context = root.findByClassName(className);
if (context != null)
{
// invalidationHub.fireInvalidationEvent(new ArrayList<>(invalidate(context)));
@@ -475,10 +475,10 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
}
@Override
- public Set<String> invalidate(PageClassloaderContext ... contexts)
+ public Set<String> invalidate(PageClassLoaderContext ... contexts)
{
Set<String> classNames = new HashSet<>();
- for (PageClassloaderContext context : contexts) {
+ for (PageClassLoaderContext context : contexts) {
addClassNames(context, classNames);
context.invalidate();
if (context.getParent() != null)
@@ -495,10 +495,10 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
{
return Collections.emptyList();
}
- Set<PageClassloaderContext> contextsToInvalidate = new HashSet<>();
+ Set<PageClassLoaderContext> contextsToInvalidate = new HashSet<>();
for (String resource : resources)
{
- PageClassloaderContext context = root.findByClassName(resource);
+ PageClassLoaderContext context = root.findByClassName(resource);
if (context != null && !context.isRoot())
{
contextsToInvalidate.add(context);
@@ -506,7 +506,7 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
}
Set<String> furtherResources = invalidate(contextsToInvalidate.toArray(
- new PageClassloaderContext[contextsToInvalidate.size()]));
+ new PageClassLoaderContext[contextsToInvalidate.size()]));
// We don't want to invalidate resources more than once
furtherResources.removeAll(resources);
@@ -515,7 +515,7 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
}
@Override
- public void invalidateAndFireInvalidationEvents(PageClassloaderContext... contexts) {
+ public void invalidateAndFireInvalidationEvents(PageClassLoaderContext... contexts) {
final Set<String> classNames = invalidate(contexts);
markAsInvalidatingContext();
invalidate(classNames);
@@ -554,15 +554,15 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
}
}
- private void addClassNames(PageClassloaderContext context, Set<String> classNames) {
+ private void addClassNames(PageClassLoaderContext context, Set<String> classNames) {
classNames.addAll(context.getClassNames());
- for (PageClassloaderContext child : context.getChildren()) {
+ for (PageClassLoaderContext child : context.getChildren()) {
addClassNames(child, classNames);
}
}
@Override
- public PageClassloaderContext getRoot() {
+ public PageClassLoaderContext getRoot() {
return root;
}
@@ -581,7 +581,7 @@ public class PageClassloaderContextManagerImpl implements PageClassloaderContext
public Class<?> getClassInstance(Class<?> clasz, String pageName)
{
final String className = clasz.getName();
- PageClassloaderContext context = root.findByClassName(className);
+ PageClassLoaderContext context = root.findByClassName(className);
if (context == null)
{
context = get(className);
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Border.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Border.java
index 0d5007513..78430dd88 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Border.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Border.java
@@ -17,7 +17,7 @@ import org.apache.tapestry5.annotations.Import;
import org.apache.tapestry5.annotations.Property;
import org.apache.tapestry5.http.services.Request;
import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.services.pageload.PageClassloaderContextManager;
+import org.apache.tapestry5.services.pageload.PageClassLoaderContextManager;
import java.util.Calendar;
@@ -36,7 +36,7 @@ public class Border
private ComponentResources resources;
@Inject @Property
- private PageClassloaderContextManager pccm;
+ private PageClassLoaderContextManager pccm;
public static final int year;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentDependencyRegistryImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentDependencyRegistryImplTest.java
index aea62e595..5ee5af228 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentDependencyRegistryImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentDependencyRegistryImplTest.java
@@ -81,7 +81,7 @@ import org.apache.tapestry5.ioc.internal.QuietOperationTracker;
import org.apache.tapestry5.modules.TapestryModule;
import org.apache.tapestry5.plastic.PlasticManager;
import org.apache.tapestry5.services.ComponentClassResolver;
-import org.apache.tapestry5.services.pageload.PageClassloaderContextManager;
+import org.apache.tapestry5.services.pageload.PageClassLoaderContextManager;
import org.apache.tapestry5.services.templates.ComponentTemplateLocator;
import org.easymock.EasyMock;
import org.testng.annotations.BeforeMethod;
@@ -95,7 +95,7 @@ public class ComponentDependencyRegistryImplTest
private ComponentDependencyRegistryImpl componentDependencyRegistry;
- private PageClassloaderContextManager pageClassloaderContextManager;
+ private PageClassLoaderContextManager pageClassLoaderContextManager;
private ComponentClassResolver resolver;
@@ -162,7 +162,7 @@ public class ComponentDependencyRegistryImplTest
return string.contains(".pages.");
}).anyTimes();
- pageClassloaderContextManager = EasyMock.createMock(PageClassloaderContextManager.class);
+ pageClassLoaderContextManager = EasyMock.createMock(PageClassLoaderContextManager.class);
plasticManager = EasyMock.createMock(PlasticManager.class);
EasyMock.expect(plasticManager.shouldInterceptClassLoading(EasyMock.anyString()))
.andAnswer(() -> {
@@ -172,9 +172,9 @@ public class ComponentDependencyRegistryImplTest
}).anyTimes();
componentDependencyRegistry = new ComponentDependencyRegistryImpl(
- pageClassloaderContextManager, plasticManager, resolver, templateParser,
+ pageClassLoaderContextManager, plasticManager, resolver, templateParser,
componentTemplateLocator);
- EasyMock.replay(pageClassloaderContextManager, plasticManager, resolver);
+ EasyMock.replay(pageClassLoaderContextManager, plasticManager, resolver);
}
private void expectResolveComponent(final Class<?> clasz) {
@@ -191,9 +191,9 @@ public class ComponentDependencyRegistryImplTest
private void configurePCCM(boolean merging)
{
- EasyMock.reset(pageClassloaderContextManager);
- EasyMock.expect(pageClassloaderContextManager.isMerging()).andReturn(merging).anyTimes();
- EasyMock.replay(pageClassloaderContextManager);
+ EasyMock.reset(pageClassLoaderContextManager);
+ EasyMock.expect(pageClassLoaderContextManager.isMerging()).andReturn(merging).anyTimes();
+ EasyMock.replay(pageClassLoaderContextManager);
}
@Test(timeOut = 5000)