This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/master by this push:
new 0a621b642 TAP5-2770: component dependencies missing superclass in
0a621b642 is described below
commit 0a621b6423cd0b4e0935ca5764452903c7f7c189
Author: Thiago H. de Paula Figueiredo <[email protected]>
AuthorDate: Sat Nov 25 16:41:57 2023 -0300
TAP5-2770: component dependencies missing superclass in
PageClassLoaderContextManagerImpl
---
.../pageload/PageClassLoaderContextManagerImpl.java | 5 ++++-
.../app1/components/SubclassWithImport.java | 8 ++++++++
.../app1/components/SuperclassWithImport.java | 8 ++++++++
.../app1/pages/ComponentHierarchyWithImports.java | 19 +++++++++++++++++++
.../app1/pages/ComponentHierarchyWithImports.tml | 5 +++++
5 files changed, 44 insertions(+), 1 deletion(-)
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
index 05df15c08..5a9b52e39 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
@@ -325,7 +325,10 @@ public class PageClassLoaderContextManagerImpl implements
PageClassLoaderContext
private Set<String> getDependenciesWithoutPages(String className)
{
- return componentDependencyRegistry.getDependencies(className,
DependencyType.USAGE);
+ Set<String> dependencies = new HashSet<>();
+
dependencies.addAll(componentDependencyRegistry.getDependencies(className,
DependencyType.USAGE));
+
dependencies.addAll(componentDependencyRegistry.getDependencies(className,
DependencyType.SUPERCLASS));
+ return Collections.unmodifiableSet(dependencies);
}
private Class<?> loadClass(String className, PageClassLoaderContext
context)
diff --git
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/SubclassWithImport.java
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/SubclassWithImport.java
new file mode 100644
index 000000000..f2ba5940a
--- /dev/null
+++
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/SubclassWithImport.java
@@ -0,0 +1,8 @@
+package org.apache.tapestry5.integration.app1.components;
+
+import org.apache.tapestry5.annotations.Import;
+
+@Import(stylesheet = "context:css/ie-only.css")
+public class SubclassWithImport extends SuperclassWithImport {
+
+}
diff --git
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/SuperclassWithImport.java
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/SuperclassWithImport.java
new file mode 100644
index 000000000..7909cc880
--- /dev/null
+++
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/SuperclassWithImport.java
@@ -0,0 +1,8 @@
+package org.apache.tapestry5.integration.app1.components;
+
+import org.apache.tapestry5.annotations.Import;
+
+@Import(stylesheet = "context:css/via-import.css")
+public class SuperclassWithImport {
+
+}
diff --git
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ComponentHierarchyWithImports.java
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ComponentHierarchyWithImports.java
new file mode 100644
index 000000000..82f42d281
--- /dev/null
+++
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ComponentHierarchyWithImports.java
@@ -0,0 +1,19 @@
+// Copyright 2023 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.integration.app1.pages;
+
+public class ComponentHierarchyWithImports
+{
+}
diff --git
a/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/ComponentHierarchyWithImports.tml
b/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/ComponentHierarchyWithImports.tml
new file mode 100644
index 000000000..b2f721c16
--- /dev/null
+++
b/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/ComponentHierarchyWithImports.tml
@@ -0,0 +1,5 @@
+<html t:type="Border"
xmlns:t="http://tapestry.apache.org/schema/tapestry_5_3.xsd";>
+
+ <t:SubclassWithImport/>
+
+</html>
