Fixes for javadoc

cuioss · Aug 28, 2024 · f46e952 · f46e952
1 parent 693442c
commit f46e952
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 21 deletions.
diff --git a/...entication-oauth/src/main/java/de/cuioss/portal/authentication/oauth/OAuthConfigKeys.java b/...entication-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.
- * <p>
  *
  * @author Matthias Walliczek
  */

diff --git a/...ion/src/main/java/de/cuioss/portal/configuration/connections/impl/ConnectionMetadata.java b/...ion/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/...rc/main/java/de/cuioss/portal/configuration/impl/producer/ConnectionMetadataProducer.java b/...rc/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,30 +120,30 @@ 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);
 
         builder.keyStoreInfo(getKeystoreInformation(properties).orElse(null));
         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,25 +179,25 @@ 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;
             case TOKEN_APPLICATION:
                 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<KeyStoreProvider> getTruststoreInformation(final Map<Str
         log.trace("Resolving TruststoreInformation");
         final var truststoreLocation = filteredProperties.get(ConnectionMetadataKeys.TRANSPORT_TRUSTSTORE_LOCATION);
         final var truststorePassword = extractFirstKeyValue(filteredProperties,
-            ConnectionMetadataKeys.TRANSPORT_TRUSTSTORE_PASSWORD);
+                ConnectionMetadataKeys.TRANSPORT_TRUSTSTORE_PASSWORD);
 
         if (null == truststoreLocation || truststorePassword.isEmpty()) {
             if (log.isDebugEnabled()) {
@@ -245,15 +245,15 @@ private static Optional<KeyStoreProvider> getTruststoreInformation(final Map<Str
         }
 
         return Optional.of(KeyStoreProvider.builder().keyStoreType(KeyStoreType.TRUST_STORE)
-            .location(new File(truststoreLocation)).storePassword(truststorePassword.get()).build());
+                .location(new File(truststoreLocation)).storePassword(truststorePassword.get()).build());
     }
 
     private static Optional<KeyStoreProvider> getKeystoreInformation(final Map<String, String> filteredProperties) {
         log.trace("Resolving KeystoreInformation");
         final var keystoreLocation = extractKeystoreLocation(filteredProperties);
         final var keystorePassword = extractFirstKeyValue(filteredProperties,
-            ConnectionMetadataKeys.AUTH_CERTIFICATE_KEYSTORE_PASSWORD,
-            ConnectionMetadataKeys.TRANSPORT_KEYSTORE_KEYPASSWORD);
+                ConnectionMetadataKeys.AUTH_CERTIFICATE_KEYSTORE_PASSWORD,
+                ConnectionMetadataKeys.TRANSPORT_KEYSTORE_KEYPASSWORD);
 
         if (keystoreLocation.isEmpty() || keystorePassword.isEmpty()) {
             if (log.isDebugEnabled()) {
@@ -268,12 +268,12 @@ private static Optional<KeyStoreProvider> getKeystoreInformation(final Map<Strin
         }
 
         final var keyPassword = extractFirstKeyValue(filteredProperties,
-            ConnectionMetadataKeys.AUTH_CERTIFICATE_KEYSTORE_KEYPASSWORD,
-            ConnectionMetadataKeys.TRANSPORT_KEYSTORE_KEYPASSWORD).orElse(keystorePassword.get());
+                ConnectionMetadataKeys.AUTH_CERTIFICATE_KEYSTORE_KEYPASSWORD,
+                ConnectionMetadataKeys.TRANSPORT_KEYSTORE_KEYPASSWORD).orElse(keystorePassword.get());
 
         return Optional.of(KeyStoreProvider.builder().keyStoreType(KeyStoreType.KEY_STORE)
-            .location(new File(keystoreLocation.get())).storePassword(keystorePassword.get())
-            .keyPassword(keyPassword).build());
+                .location(new File(keystoreLocation.get())).storePassword(keystorePassword.get())
+                .keyPassword(keyPassword).build());
     }
 
     private static Optional<String> extractKeystoreLocation(final Map<String, String> filteredProperties) {