diff --git a/extensions/qute/deployment/pom.xml b/extensions/qute/deployment/pom.xml index 893c79f081a83..bb8d8d92415bc 100644 --- a/extensions/qute/deployment/pom.xml +++ b/extensions/qute/deployment/pom.xml @@ -80,9 +80,6 @@ ${project.version} - - -AlegacyConfigRoot=true - diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java index 4336adb550da2..84f9fa9c85ef4 100644 --- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java +++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java @@ -548,7 +548,7 @@ public String apply(String id) { TemplateAnalysis templateAnalysis = exprEntry.getKey(); String path = templateAnalysis.path; - for (String suffix : config.suffixes) { + for (String suffix : config.suffixes()) { if (path.endsWith(suffix)) { path = path.substring(0, path.length() - (suffix.length() + 1)); break; diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java index f758d84af02ce..8b533481e5002 100644 --- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java +++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java @@ -802,7 +802,7 @@ public void beforeParsing(ParserHelper parserHelper) { } private String templatePathWithoutSuffix(String path, QuteConfig config) { - for (String suffix : config.suffixes) { + for (String suffix : config.suffixes()) { if (path.endsWith(suffix)) { // Remove the suffix path = path.substring(0, path.length() - (suffix.length() + 1)); @@ -911,7 +911,7 @@ void validateCheckedFragments(List validatio @BuildStep(onlyIf = IsTest.class) SyntheticBeanBuildItem registerRenderedResults(QuteConfig config) { - if (config.testMode.recordRenderedResults) { + if (config.testMode().recordRenderedResults()) { return SyntheticBeanBuildItem.configure(RenderedResults.class) .unremovable() .scope(Singleton.class) @@ -1131,7 +1131,7 @@ private CheckedTemplateBuildItem findCheckedTemplate(QuteConfig config, Template List checkedTemplates) { // Try to find the checked template String path = analysis.path; - for (String suffix : config.suffixes) { + for (String suffix : config.suffixes()) { if (path.endsWith(suffix)) { path = path.substring(0, path.length() - (suffix.length() + 1)); break; @@ -1638,19 +1638,19 @@ private static boolean isInvalidCheckedTemplateExpression(QuteConfig config, Che if (!expression.hasNamespace() && expression.getParts().size() == 1 && ITERATION_METADATA_KEYS.contains(expression.getParts().get(0).getName())) { String prefixInfo; - if (config.iterationMetadataPrefix + if (config.iterationMetadataPrefix() .equals(LoopSectionHelper.Factory.ITERATION_METADATA_PREFIX_ALIAS_UNDERSCORE)) { prefixInfo = String.format( "based on the iteration alias, i.e. the correct key should be something like {it_%1$s} or {element_%1$s}", expression.getParts().get(0).getName()); - } else if (config.iterationMetadataPrefix + } else if (config.iterationMetadataPrefix() .equals(LoopSectionHelper.Factory.ITERATION_METADATA_PREFIX_ALIAS_QM)) { prefixInfo = String.format( "based on the iteration alias, i.e. the correct key should be something like {it?%1$s} or {element?%1$s}", expression.getParts().get(0).getName()); } else { - prefixInfo = ": " + config.iterationMetadataPrefix + ", i.e. the correct key should be: " - + config.iterationMetadataPrefix + expression.getParts().get(0).getName(); + prefixInfo = ": " + config.iterationMetadataPrefix() + ", i.e. the correct key should be: " + + config.iterationMetadataPrefix() + expression.getParts().get(0).getName(); } incorrectExpressions.produce(new IncorrectExpressionBuildItem(expression.toOriginalString(), "An invalid iteration metadata key is probably used\n\t- The configured iteration metadata prefix is " @@ -2241,7 +2241,7 @@ private void scanPathTree(PathTree pathTree, TemplateRootsBuildItem templateRoot // remove templateRoot + / final String relativePath = visit.getRelativePath(); String templatePath = relativePath.substring(templateRoot.length() + 1); - if (config.templatePathExclude.matcher(templatePath).matches()) { + if (config.templatePathExclude().matcher(templatePath).matches()) { LOGGER.debugf("Template file excluded: %s", visit.getPath()); return; } @@ -2261,7 +2261,7 @@ TemplateFilePathsBuildItem collectTemplateFilePaths(QuteConfig config, List> excludes) { diff --git a/extensions/qute/runtime/pom.xml b/extensions/qute/runtime/pom.xml index 83a329d2a9ca5..fb04f6aa86ff8 100644 --- a/extensions/qute/runtime/pom.xml +++ b/extensions/qute/runtime/pom.xml @@ -57,9 +57,6 @@ ${project.version} - - -AlegacyConfigRoot=true - diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/ContentTypes.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/ContentTypes.java index cb62d34d281f0..5cb933b3f585c 100644 --- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/ContentTypes.java +++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/ContentTypes.java @@ -31,7 +31,7 @@ public String getContentType(String templatePath) { int dotIdx = fileName.lastIndexOf('.'); if (dotIdx != -1) { String suffix = fileName.substring(dotIdx + 1, fileName.length()); - String additionalContentType = config.contentTypes.get(suffix); + String additionalContentType = config.contentTypes().get(suffix); if (additionalContentType != null) { return additionalContentType; } diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/EngineProducer.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/EngineProducer.java index aeba46a8cd3d8..4192873666210 100644 --- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/EngineProducer.java +++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/EngineProducer.java @@ -93,13 +93,13 @@ public EngineProducer(QuteContext context, QuteConfig config, QuteRuntimeConfig @All List> sectionHelperFactories, @All List valueResolvers, @All List namespaceResolvers, @All List parserHooks) { this.contentTypes = contentTypes; - this.suffixes = config.suffixes; + this.suffixes = config.suffixes(); this.templateRoots = context.getTemplateRoots(); this.templateContents = Map.copyOf(context.getTemplateContents()); this.tags = context.getTags(); - this.templatePathExclude = config.templatePathExclude; + this.templatePathExclude = config.templatePathExclude(); this.defaultLocale = locales.defaultLocale().orElse(Locale.getDefault()); - this.defaultCharset = config.defaultCharset; + this.defaultCharset = config.defaultCharset(); this.container = Arc.container(); LOGGER.debugf("Initializing Qute [templates: %s, tags: %s, resolvers: %s", context.getTemplatePaths(), tags, @@ -127,13 +127,13 @@ public EngineProducer(QuteContext context, QuteConfig config, QuteRuntimeConfig } // Enable/disable strict rendering - if (runtimeConfig.strictRendering) { + if (runtimeConfig.strictRendering()) { builder.strictRendering(true); } else { builder.strictRendering(false); // If needed, use a specific result mapper for the selected strategy - if (runtimeConfig.propertyNotFoundStrategy.isPresent()) { - switch (runtimeConfig.propertyNotFoundStrategy.get()) { + if (runtimeConfig.propertyNotFoundStrategy().isPresent()) { + switch (runtimeConfig.propertyNotFoundStrategy().get()) { case THROW_EXCEPTION: builder.addResultMapper(new PropertyNotFoundThrowException()); break; @@ -156,7 +156,7 @@ public EngineProducer(QuteContext context, QuteConfig config, QuteRuntimeConfig } // Escape some characters for HTML/XML templates - builder.addResultMapper(new HtmlEscaper(List.copyOf(config.escapeContentTypes))); + builder.addResultMapper(new HtmlEscaper(List.copyOf(config.escapeContentTypes()))); // Escape some characters for JSON templates builder.addResultMapper(new JsonEscaper()); @@ -165,10 +165,10 @@ public EngineProducer(QuteContext context, QuteConfig config, QuteRuntimeConfig builder.addValueResolver(new ReflectionValueResolver()); // Remove standalone lines if desired - builder.removeStandaloneLines(runtimeConfig.removeStandaloneLines); + builder.removeStandaloneLines(runtimeConfig.removeStandaloneLines()); // Iteration metadata prefix - builder.iterationMetadataPrefix(config.iterationMetadataPrefix); + builder.iterationMetadataPrefix(config.iterationMetadataPrefix()); // Default section helpers builder.addDefaultSectionHelpers(); @@ -257,8 +257,8 @@ public void run() { } }); - builder.timeout(runtimeConfig.timeout); - builder.useAsyncTimeout(runtimeConfig.useAsyncTimeout); + builder.timeout(runtimeConfig.timeout()); + builder.useAsyncTimeout(runtimeConfig.useAsyncTimeout()); engine = builder.build(); @@ -267,7 +267,7 @@ public void run() { for (String path : context.getTemplatePaths()) { Template template = engine.getTemplate(path); if (template != null) { - for (String suffix : config.suffixes) { + for (String suffix : config.suffixes()) { if (path.endsWith(suffix)) { String pathNoSuffix = path.substring(0, path.length() - (suffix.length() + 1)); List