Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Config reference documentation update #9045

Closed
wants to merge 9 commits into from
Closed

Config reference documentation update #9045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0b21430
JSON writer and parser for Helidon metadata.
tomas-langer Jul 28, 2024
ccd972e
Fix for builder codegen to only generate service.loader if there are …
tomas-langer Jul 28, 2024
58655fd
Update of config-metadata module:
tomas-langer Jul 28, 2024
21ce352
Fixes to all pom files to use the new config metadata codegen
tomas-langer Jul 28, 2024
f8fa2d9
Logging now correctly prints information in JUL.
tomas-langer Jul 28, 2024
064e57c
Docs update:
tomas-langer Jul 28, 2024
4731668
Updated config reference documentation.
tomas-langer Jul 28, 2024
c2b9a35
Fixed document reference (deleted original file).
tomas-langer Jul 28, 2024
fd7d340
Added test for escaped characters.
tomas-langer Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,16 @@
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata-processor</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.config.metadata</groupId>
<artifactId>helidon-config-metadata-codegen</artifactId>
</dependency>
<!-- this module cannot be part of this pom file, as it is used to generate documentation of all modules
<dependency>
<groupId>io.helidon.config.metadata</groupId>
<artifactId>helidon-config-metadata-docs</artifactId>
</dependency>
-->
<dependency>
<groupId>io.helidon.security</groupId>
<artifactId>helidon-security</artifactId>
Expand Down Expand Up @@ -1098,6 +1108,10 @@
<groupId>io.helidon.service</groupId>
<artifactId>helidon-service-codegen</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.metadata</groupId>
<artifactId>helidon-metadata-hjson</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.integrations.oci.sdk</groupId>
<artifactId>helidon-integrations-oci-sdk-processor</artifactId>
Expand Down
17 changes: 17 additions & 0 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,16 @@
<artifactId>helidon-config-metadata-processor</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.config.metadata</groupId>
<artifactId>helidon-config-metadata-codegen</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.config.metadata</groupId>
<artifactId>helidon-config-metadata-docs</artifactId>
<version>${helidon.version}</version>
</dependency>
<!-- security -->
<dependency>
<groupId>io.helidon.security</groupId>
Expand Down Expand Up @@ -1447,6 +1457,13 @@
<version>${helidon.version}</version>
</dependency>

<!-- Metadata -->
<dependency>
<groupId>io.helidon.metadata</groupId>
<artifactId>helidon-metadata-hjson</artifactId>
<version>${helidon.version}</version>
</dependency>

<!-- Injection Integrations related -->
<dependency>
<groupId>io.helidon.integrations.oci.sdk</groupId>
Expand Down
8 changes: 6 additions & 2 deletions builder/codegen/src/main/java/io/helidon/builder/codegen/BuilderCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,18 @@ private void updateServiceLoaderResource() {
if (lines.isEmpty()) {
lines.add("# List of service contracts we want to support either from service registry, or from service loader");
}
boolean modified = false;
for (String serviceLoaderContract : this.serviceLoaderContracts) {
if (!lines.contains(serviceLoaderContract)) {
modified = true;
lines.add(serviceLoaderContract);
}
}

serviceLoaderResource.lines(lines);
serviceLoaderResource.write();
if (modified) {
serviceLoaderResource.lines(lines);
serviceLoaderResource.write();
}
}

private void process(RoundContext roundContext, TypeInfo blueprint) {
Expand Down
16 changes: 8 additions & 8 deletions common/configurable/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,13 @@
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<annotationProcessorPaths>
<path>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata-processor</artifactId>
<groupId>io.helidon.codegen</groupId>
<artifactId>helidon-codegen-apt</artifactId>
<version>${helidon.version}</version>
</path>
<path>
<groupId>io.helidon.codegen</groupId>
<artifactId>helidon-codegen-apt</artifactId>
<groupId>io.helidon.config.metadata</groupId>
<artifactId>helidon-config-metadata-codegen</artifactId>
<version>${helidon.version}</version>
</path>
<path>
Expand Down Expand Up @@ -130,13 +130,13 @@
</executions>
<dependencies>
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata-processor</artifactId>
<groupId>io.helidon.codegen</groupId>
<artifactId>helidon-codegen-apt</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.codegen</groupId>
<artifactId>helidon-codegen-apt</artifactId>
<groupId>io.helidon.config.metadata</groupId>
<artifactId>helidon-config-metadata-codegen</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions ...n/configurable/src/main/java/io/helidon/common/configurable/AllowListConfigBlueprint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 Oracle and/or its affiliates.
* Copyright (c) 2023, 2024 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -87,7 +87,7 @@ interface AllowListConfigBlueprint extends Prototype.Factory<AllowList> {
/**
* Exact strings to deny.
*
* @return exact strings to allow
* @return exact strings to deny
*/
@Option.Configured("deny.exact")
@Option.Singular
Expand Down
8 changes: 4 additions & 4 deletions common/key-util/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@
<configuration>
<annotationProcessorPaths>
<path>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata-processor</artifactId>
<groupId>io.helidon.config.metadata</groupId>
<artifactId>helidon-config-metadata-codegen</artifactId>
<version>${helidon.version}</version>
</path>
<path>
Expand All @@ -104,8 +104,8 @@
</configuration>
<dependencies>
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata-processor</artifactId>
<groupId>io.helidon.config.metadata</groupId>
<artifactId>helidon-config-metadata-codegen</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions common/socket/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<annotationProcessorPaths>
<path>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata-processor</artifactId>
<groupId>io.helidon.config.metadata</groupId>
<artifactId>helidon-config-metadata-codegen</artifactId>
<version>${helidon.version}</version>
</path>
<path>
Expand All @@ -94,8 +94,8 @@
</configuration>
<dependencies>
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata-processor</artifactId>
<groupId>io.helidon.config.metadata</groupId>
<artifactId>helidon-config-metadata-codegen</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
Expand Down
16 changes: 8 additions & 8 deletions common/tls/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@
<configuration>
<annotationProcessorPaths>
<path>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata-processor</artifactId>
<groupId>io.helidon.codegen</groupId>
<artifactId>helidon-codegen-apt</artifactId>
<version>${helidon.version}</version>
</path>
<path>
<groupId>io.helidon.codegen</groupId>
<artifactId>helidon-codegen-apt</artifactId>
<groupId>io.helidon.config.metadata</groupId>
<artifactId>helidon-config-metadata-codegen</artifactId>
<version>${helidon.version}</version>
</path>
<path>
Expand All @@ -104,13 +104,13 @@
</configuration>
<dependencies>
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata-processor</artifactId>
<groupId>io.helidon.codegen</groupId>
<artifactId>helidon-codegen-apt</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.codegen</groupId>
<artifactId>helidon-codegen-apt</artifactId>
<groupId>io.helidon.config.metadata</groupId>
<artifactId>helidon-config-metadata-codegen</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion common/tls/src/main/java/io/helidon/common/tls/TlsConfigBlueprint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ static List<X509Certificate> createTrust(Keys config) {
/**
* Enabled cipher suites for TLS communication.
*
* @return cipher suits to enable, by default (or if list is empty), all available cipher suites
* @return cipher suites to enable, by default (or if list is empty), all available cipher suites
* are enabled
*/
@Option.Configured("cipher-suite")
Expand Down
28 changes: 24 additions & 4 deletions config/config-mp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,36 @@
<configuration>
<annotationProcessorPaths>
<path>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata-processor</artifactId>
<groupId>io.helidon.codegen</groupId>
<artifactId>helidon-codegen-apt</artifactId>
<version>${helidon.version}</version>
</path>
<path>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-processor</artifactId>
<version>${helidon.version}</version>
</path>
<path>
<groupId>io.helidon.config.metadata</groupId>
<artifactId>helidon-config-metadata-codegen</artifactId>
<version>${helidon.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
<dependencies>
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-metadata-processor</artifactId>
<groupId>io.helidon.codegen</groupId>
<artifactId>helidon-codegen-apt</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.common.features</groupId>
<artifactId>helidon-common-features-processor</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.config.metadata</groupId>
<artifactId>helidon-config-metadata-codegen</artifactId>
<version>${helidon.version}</version>
</dependency>
</dependencies>
Expand Down
42 changes: 0 additions & 42 deletions config/metadata-processor/src/main/java/io/helidon/config/metadata/processor/JArray.java
View file
Open in desktop

This file was deleted.

Loading