This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v3
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/v3 by this push:
new a7187d36548 provisioning fixes post Spring upgrade
a7187d36548 is described below
commit a7187d36548c373a9714e6da3a15c9ce971d05ba
Author: andi-huber <[email protected]>
AuthorDate: Mon Dec 1 11:32:49 2025 +0100
provisioning fixes post Spring upgrade
(same as in v4)
---
.../testdomain/conf/Configuration_usingWicket.java | 44 +++++++---------------
1 file changed, 13 insertions(+), 31 deletions(-)
diff --git
a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
index d833ce9d51e..3a833592ae2 100644
---
a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
+++
b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
@@ -23,8 +23,6 @@
import java.util.function.Predicate;
import java.util.stream.Collectors;
-import jakarta.inject.Inject;
-
import org.apache.wicket.Component;
import org.apache.wicket.IPageFactory;
import org.apache.wicket.Page;
@@ -54,7 +52,6 @@
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.testdomain.util.dto.BookDto;
import org.apache.causeway.testdomain.util.dto.IBook;
-import
org.apache.causeway.viewer.wicket.model.causeway.WicketApplicationInitializer;
import org.apache.causeway.viewer.wicket.model.models.PageType;
import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
import
org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
@@ -79,20 +76,12 @@
@Configuration
@Import({
CausewayModuleViewerWicketViewer.class,
-
Configuration_usingWicket.WicketViewerOutputMarkupContainerClassNameEnable.class
})
public class Configuration_usingWicket {
-
- @Configuration
- public class WicketViewerOutputMarkupContainerClassNameEnable
- implements WicketApplicationInitializer {
-
- @Override
- public void init(final WebApplication webApplication) {
- webApplication.getDebugSettings()
- .setComponentPathAttributeName("wicket-tester-path")
-
.setOutputMarkupContainerClassNameStrategy(ClassOutputStrategy.HTML_COMMENT);
- }
+
+ @Bean
+ public WicketTesterFactory wicketTesterFactory(final MetaModelContext mmc)
{
+ return new WicketTesterFactory(mmc);
}
public static class DomainObjectPageTester
@@ -206,18 +195,13 @@ default String editInlinePromptFormOk() {
// --
- @Getter
- private final MetaModelContext metaModelContext;
private final Function<BookDto, IBook> bookFactory;
public DomainObjectPageTester(
- final MetaModelContext metaModelContext,
+ final MetaModelContext mmc,
final Function<BookDto, IBook> bookFactory) {
- super(newWicketApplication(metaModelContext));
- this.metaModelContext = metaModelContext;
- metaModelContext.injectServicesInto(this);
+ super(newWicketApplication(mmc));
this.bookFactory = bookFactory;
-
}
public PageParameters createPageParameters(final Object entityOrVm) {
@@ -294,21 +278,16 @@ public DomainObjectPage startDomainObjectPage(final
PageParameters pageParameter
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
public static class WicketTesterFactory {
- private final MetaModelContext commonContext;
+ private final MetaModelContext mmc;
public DomainObjectPageTester createTester(final Function<BookDto,
IBook> bookFactory) {
- return new DomainObjectPageTester(commonContext, bookFactory);
+ return new DomainObjectPageTester(mmc, bookFactory);
}
}
- @Bean @Inject
- public WicketTesterFactory wicketTesterFactory(final MetaModelContext
commonContext) {
- return new WicketTesterFactory(commonContext);
- }
-
// -- HELPER -- APPLICATION (WICKET)
- private static WebApplication newWicketApplication(final MetaModelContext
commonContext) {
- var wicketApplication = new
WicketApplication_forTesting(commonContext);
+ private static WebApplication newWicketApplication(final MetaModelContext
mmc) {
+ var wicketApplication = new WicketApplication_forTesting(mmc);
ThreadContext.setApplication(wicketApplication);
return wicketApplication;
}
@@ -361,6 +340,9 @@ protected void init() {
new ResourceAggregator(new
JavaScriptFilteredIntoFooterHeaderResponse(response, "footerJS")));
//XXX set to false for less strict testing
getDebugSettings().setComponentUseCheck(false);
+ getDebugSettings()
+ .setComponentPathAttributeName("wicket-tester-path")
+
.setOutputMarkupContainerClassNameStrategy(ClassOutputStrategy.HTML_COMMENT);
}
@Getter
