Skip to content

Commit bab4a5a

Browse files
committed
Fix some invalid configuration cases
TransactionManagerConfiguration was just plain weird so fixed it. For the others, we need to mark the interfaces as being config or we won't generate the Javadoc for them.
1 parent 30d733f commit bab4a5a

File tree

4 files changed

+48
-42
lines changed

4 files changed

+48
-42
lines changed

extensions/container-image/container-image-docker-common/deployment/src/main/java/io/quarkus/container/image/docker/common/deployment/CommonConfig.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66

77
import io.quarkus.runtime.annotations.ConfigDocDefault;
88
import io.quarkus.runtime.annotations.ConfigDocMapKey;
9+
import io.quarkus.runtime.annotations.ConfigGroup;
910

11+
@ConfigGroup
1012
public interface CommonConfig {
1113
/**
1214
* Path to the JVM Dockerfile.

extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/TransactionManagerConfiguration.java

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -72,47 +72,47 @@ public final class TransactionManagerConfiguration {
7272
*/
7373
@ConfigItem
7474
public ObjectStoreConfig objectStore;
75-
}
76-
77-
@ConfigGroup
78-
class ObjectStoreConfig {
79-
/**
80-
* The name of the directory where the transaction logs will be stored when using the {@code file-system} object store.
81-
* If the value is not absolute then the directory is relative
82-
* to the <em>user.dir</em> system property.
83-
*/
84-
@ConfigItem(defaultValue = "ObjectStore")
85-
public String directory;
86-
87-
/**
88-
* The type of object store.
89-
*/
90-
@ConfigItem(defaultValue = "file-system")
91-
public ObjectStoreType type;
92-
93-
/**
94-
* The name of the datasource where the transaction logs will be stored when using the {@code jdbc} object store.
95-
* <p>
96-
* If undefined, it will use the default datasource.
97-
*/
98-
@ConfigItem
99-
public Optional<String> datasource = Optional.empty();
10075

101-
/**
102-
* Whether to create the table if it does not exist.
103-
*/
104-
@ConfigItem(defaultValue = "false")
105-
public boolean createTable;
106-
107-
/**
108-
* Whether to drop the table on startup.
109-
*/
110-
@ConfigItem(defaultValue = "false")
111-
public boolean dropTable;
112-
113-
/**
114-
* The prefix to apply to the table.
115-
*/
116-
@ConfigItem(defaultValue = "quarkus_")
117-
public String tablePrefix;
76+
@ConfigGroup
77+
public static class ObjectStoreConfig {
78+
/**
79+
* The name of the directory where the transaction logs will be stored when using the {@code file-system} object store.
80+
* If the value is not absolute then the directory is relative
81+
* to the <em>user.dir</em> system property.
82+
*/
83+
@ConfigItem(defaultValue = "ObjectStore")
84+
public String directory;
85+
86+
/**
87+
* The type of object store.
88+
*/
89+
@ConfigItem(defaultValue = "file-system")
90+
public ObjectStoreType type;
91+
92+
/**
93+
* The name of the datasource where the transaction logs will be stored when using the {@code jdbc} object store.
94+
* <p>
95+
* If undefined, it will use the default datasource.
96+
*/
97+
@ConfigItem
98+
public Optional<String> datasource = Optional.empty();
99+
100+
/**
101+
* Whether to create the table if it does not exist.
102+
*/
103+
@ConfigItem(defaultValue = "false")
104+
public boolean createTable;
105+
106+
/**
107+
* Whether to drop the table on startup.
108+
*/
109+
@ConfigItem(defaultValue = "false")
110+
public boolean dropTable;
111+
112+
/**
113+
* The prefix to apply to the table.
114+
*/
115+
@ConfigItem(defaultValue = "quarkus_")
116+
public String tablePrefix;
117+
}
118118
}

extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/config/OidcClientCommonConfig.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
import java.util.Optional;
55

66
import io.quarkus.runtime.annotations.ConfigDocMapKey;
7+
import io.quarkus.runtime.annotations.ConfigGroup;
78
import io.smallrye.config.WithDefault;
89

10+
@ConfigGroup
911
public interface OidcClientCommonConfig extends OidcCommonConfig {
1012
/**
1113
* The OIDC token endpoint that issues access and refresh tokens;

extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/config/OidcCommonConfig.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
import java.util.OptionalInt;
77

88
import io.quarkus.runtime.annotations.ConfigDocDefault;
9+
import io.quarkus.runtime.annotations.ConfigGroup;
910
import io.smallrye.config.WithDefault;
1011

12+
@ConfigGroup
1113
public interface OidcCommonConfig {
1214
/**
1315
* The base URL of the OpenID Connect (OIDC) server, for example, `https://host:port/auth`.

0 commit comments

Comments
 (0)