diff --git a/modules/authentication/portal-authentication-oauth/src/main/java/de/cuioss/portal/authentication/oauth/OAuthConfigKeys.java b/modules/authentication/portal-authentication-oauth/src/main/java/de/cuioss/portal/authentication/oauth/OAuthConfigKeys.java index 166bfb8f..9d32862f 100644 --- a/modules/authentication/portal-authentication-oauth/src/main/java/de/cuioss/portal/authentication/oauth/OAuthConfigKeys.java +++ b/modules/authentication/portal-authentication-oauth/src/main/java/de/cuioss/portal/authentication/oauth/OAuthConfigKeys.java @@ -19,7 +19,6 @@ /** * Provide the keys for the application.properties to configure oauth2. - *
*
* @author Matthias Walliczek
*/
diff --git a/modules/core/portal-configuration/src/main/java/de/cuioss/portal/configuration/connections/impl/ConnectionMetadata.java b/modules/core/portal-configuration/src/main/java/de/cuioss/portal/configuration/connections/impl/ConnectionMetadata.java
index 58bfa943..38868dea 100644
--- a/modules/core/portal-configuration/src/main/java/de/cuioss/portal/configuration/connections/impl/ConnectionMetadata.java
+++ b/modules/core/portal-configuration/src/main/java/de/cuioss/portal/configuration/connections/impl/ConnectionMetadata.java
@@ -280,4 +280,8 @@ public void validate() throws ConnectionConfigurationException {
throw new ConnectionConfigurationException(ErrorReason.INVALID_PROXY);
}
}
+
+ public static class ConnectionMetadataBuilder {
+ // Needed for lombok-builder plus javadoc
+ }
}
diff --git a/modules/core/portal-configuration/src/main/java/de/cuioss/portal/configuration/impl/producer/ConnectionMetadataProducer.java b/modules/core/portal-configuration/src/main/java/de/cuioss/portal/configuration/impl/producer/ConnectionMetadataProducer.java
index f4a07f0c..400ecdcd 100644
--- a/modules/core/portal-configuration/src/main/java/de/cuioss/portal/configuration/impl/producer/ConnectionMetadataProducer.java
+++ b/modules/core/portal-configuration/src/main/java/de/cuioss/portal/configuration/impl/producer/ConnectionMetadataProducer.java
@@ -88,7 +88,7 @@ public class ConnectionMetadataProducer {
@ConfigAsConnectionMetadata(baseName = "unused")
ConnectionMetadata produceConnectionMetadata(final InjectionPoint injectionPoint) {
final var metaData = ConfigurationHelper.resolveAnnotation(injectionPoint, ConfigAsConnectionMetadata.class)
- .orElseThrow(() -> new IllegalStateException("Invalid usage"));
+ .orElseThrow(() -> new IllegalStateException("Invalid usage"));
log.trace("Producing configuration for '{}'", metaData.baseName());
final var failOnInvalidConfiguration = metaData.failOnInvalidConfiguration();
return createConnectionMetadata(metaData.baseName(), failOnInvalidConfiguration);
@@ -120,10 +120,10 @@ public static ConnectionMetadata createConnectionMetadata(final String baseName,
builder.serviceUrl(properties.get(ConnectionMetadataKeys.URL_KEY));
builder.disableHostNameVerification(parseBoolean(
- properties.getOrDefault(ConnectionMetadataKeys.TRANSPORT_DISABLE_HOSTNAME_VALIDATION, "false")));
+ properties.getOrDefault(ConnectionMetadataKeys.TRANSPORT_DISABLE_HOSTNAME_VALIDATION, "false")));
builder.connectionType(ConnectionType.resolveFrom(
- properties.getOrDefault(ConnectionMetadataKeys.TYPE_KEY, ConnectionType.UNDEFINED.name())));
+ properties.getOrDefault(ConnectionMetadataKeys.TYPE_KEY, ConnectionType.UNDEFINED.name())));
handleAuthentication(name, failOnInvalidConfiguration, builder, properties);
@@ -131,19 +131,19 @@ public static ConnectionMetadata createConnectionMetadata(final String baseName,
builder.trustStoreInfo(getTruststoreInformation(properties).orElse(null));
getPositiveLong(name + ConnectionMetadataKeys.CONNECTION_TIMEOUT,
- properties.get(ConnectionMetadataKeys.CONNECTION_TIMEOUT), failOnInvalidConfiguration)
- .ifPresent(builder::connectionTimeout);
+ properties.get(ConnectionMetadataKeys.CONNECTION_TIMEOUT), failOnInvalidConfiguration)
+ .ifPresent(builder::connectionTimeout);
getPositiveLong(name + ConnectionMetadataKeys.READ_TIMEOUT, properties.get(ConnectionMetadataKeys.READ_TIMEOUT),
- failOnInvalidConfiguration).ifPresent(builder::readTimeout);
+ failOnInvalidConfiguration).ifPresent(builder::readTimeout);
builder.proxyHost(properties.get(ConnectionMetadataKeys.PROXY_HOST));
getPositiveInt(name + ConnectionMetadataKeys.PROXY_PORT, properties.get(ConnectionMetadataKeys.PROXY_PORT),
- failOnInvalidConfiguration).ifPresent(builder::proxyPort);
+ failOnInvalidConfiguration).ifPresent(builder::proxyPort);
final var meta = builder.build();
meta.getContextMap().putAll(ConfigurationHelper.getFilteredPropertyMap(properties,
- suffixNameWithDot(ConnectionMetadataKeys.CONFIG_KEY), true));
+ suffixNameWithDot(ConnectionMetadataKeys.CONFIG_KEY), true));
log.debug("Created Connection Metadata '{}'", meta);
if (!failOnInvalidConfiguration) {
return meta;
@@ -179,12 +179,12 @@ private static void handleAuthentication(final String baseName, final boolean fa
final var userName = filteredProperties.get(ConnectionMetadataKeys.AUTH_BASIC_USER_NAME);
if (MoreStrings.isEmpty(userName)) {
handleMissingProperty(suffixNameWithDot(baseName) + ConnectionMetadataKeys.AUTH_BASIC_USER_NAME,
- MISSING_BASIC_AUTH_CONFIG_MSG + "Username", failOnInvalidConfiguration);
+ MISSING_BASIC_AUTH_CONFIG_MSG + "Username", failOnInvalidConfiguration);
}
final var password = filteredProperties.get(ConnectionMetadataKeys.AUTH_BASIC_USER_PASSWORD);
if (MoreStrings.isEmpty(password)) {
handleMissingProperty(suffixNameWithDot(baseName) + ConnectionMetadataKeys.AUTH_BASIC_USER_PASSWORD,
- MISSING_BASIC_AUTH_CONFIG_MSG + "Password", failOnInvalidConfiguration);
+ MISSING_BASIC_AUTH_CONFIG_MSG + "Password", failOnInvalidConfiguration);
}
builder.loginCredentials(LoginCredentials.builder().username(userName).password(password).build());
break;
@@ -192,12 +192,12 @@ private static void handleAuthentication(final String baseName, final boolean fa
final var key = filteredProperties.get(ConnectionMetadataKeys.AUTH_TOKEN_APPLICATION_KEY);
if (MoreStrings.isEmpty(key)) {
handleMissingProperty(suffixNameWithDot(baseName) + ConnectionMetadataKeys.AUTH_TOKEN_APPLICATION_KEY,
- MISSING_TOKEN_CONFIG_MSG + "Key", failOnInvalidConfiguration);
+ MISSING_TOKEN_CONFIG_MSG + "Key", failOnInvalidConfiguration);
}
final var token = filteredProperties.get(ConnectionMetadataKeys.AUTH_TOKEN_APPLICATION_TOKEN);
if (MoreStrings.isEmpty(token)) {
handleMissingProperty(suffixNameWithDot(baseName) + ConnectionMetadataKeys.AUTH_TOKEN_APPLICATION_TOKEN,
- MISSING_TOKEN_CONFIG_MSG + "Token", failOnInvalidConfiguration);
+ MISSING_TOKEN_CONFIG_MSG + "Token", failOnInvalidConfiguration);
}
builder.tokenResolver(new StaticTokenResolver(key, token));
break;
@@ -226,7 +226,7 @@ private static Optional