Pr 826

api/src/main/java/io/smallrye/stork/api/LoadBalancer.java

@@ -14,7 +14,7 @@ public interface LoadBalancer {
      * Select a single {@link ServiceInstance} from the given list.
      *
      * @param serviceInstances instances to choose from
-     * 
+     *
      * @return a ServiceInstance
      *
      * @throws NoServiceInstanceFoundException if the incoming collection is empty or all the service instances in the

api/src/main/java/io/smallrye/stork/api/NoServiceInstanceFoundException.java

@@ -8,7 +8,7 @@ public class NoServiceInstanceFoundException extends RuntimeException {
 
     /**
      * Creates a new NoServiceInstanceFoundException.
-     * 
+     *
      * @param message the error message
      */
     public NoServiceInstanceFoundException(String message) {

api/src/main/java/io/smallrye/stork/api/config/ConfigWithType.java

@@ -18,7 +18,7 @@ public interface ConfigWithType {
 
     /**
      * Load Balancer parameters.
-     * 
+     *
      * @return map of parameters of the load balancer
      */
     Map<String, String> parameters();

api/src/main/java/io/smallrye/stork/api/config/LoadBalancerAttribute.java

@@ -30,21 +30,21 @@
 
     /**
      * Default value for the attribute. If not provided and user didn't set the value - null will be passed
-     * 
+     *
      * @return the default value
      */
     String defaultValue() default Constants.DEFAULT_VALUE;
 
     /**
      * Description of the attribute. Works best in the documentation if it starts with a capital letter and ends with period.
-     * 
+     *
      * @return the description
      */
     String description();
 
     /**
      * Whether the attribute is mandatory or optional
-     * 
+     *
      * @return true if the attribute is required, false otherwise
      */
     boolean required() default false;

api/src/main/java/io/smallrye/stork/api/config/ServiceConfig.java

@@ -20,14 +20,14 @@ public interface ServiceConfig {
 
     /**
      * ServiceDiscovery configuration for the service
-     * 
+     *
      * @return (required) service discovery configuration
      */
     ConfigWithType serviceDiscovery();
 
     /**
      * Whether the communication should use a secure connection (e.g. HTTPS)
-     * 
+     *
      * @return true if SSL, TLS, etc. should be used for the communication
      * @deprecated Use the service discovery 'secure' attribute instead
      */

api/src/main/java/io/smallrye/stork/api/config/ServiceDiscoveryAttribute.java

@@ -31,21 +31,21 @@
 
     /**
      * Default value for the attribute. If not provided and user didn't set the value - null will be passed
-     * 
+     *
      * @return the default value
      */
     String defaultValue() default Constants.DEFAULT_VALUE;
 
     /**
      * Description of the attribute. Works best in the documentation if it starts with a capital letter and ends with period.
-     * 
+     *
      * @return the description
      */
     String description();
 
     /**
      * Whether the attribute is mandatory or optional
-     * 
+     *
      * @return true if the attribute is required, false otherwise
      */
     boolean required() default false;

api/src/main/java/io/smallrye/stork/api/config/ServiceRegistrarAttribute.java

@@ -31,21 +31,21 @@
 
     /**
      * Default value for the attribute. If not provided and user didn't set the value - null will be passed
-     * 
+     *
      * @return the default value
      */
     String defaultValue() default Constants.DEFAULT_VALUE;
 
     /**
      * Description of the attribute. Works best in the documentation if it starts with a capital letter and ends with period.
-     * 
+     *
      * @return the description
      */
     String description();
 
     /**
      * Whether the attribute is mandatory or optional
-     * 
+     *
      * @return true if the attribute is required, false otherwise
      */
     boolean required() default false;

api/src/main/java/io/smallrye/stork/spi/ElementWithType.java

@@ -6,7 +6,7 @@
 public interface ElementWithType {
     /**
      * Gets the type.
-     * 
+     *
      * @return the type, must not be {@code null}, must not be blank
      */
     String type();

api/src/main/java/io/smallrye/stork/spi/StorkInfrastructure.java

@@ -4,16 +4,16 @@
 
 /**
  * A provider for "utility" objects used by service discovery and load balancer implementations.
- * 
+ *
  * The default implementation, {@code DefaultStorkInfrastructure} provides objects created by the passed supplier.
  * Vendors can implement their own version of this class to provide custom objects.
- * 
+ *
  * E.g. Quarkus uses a single Vert.x instance throughout the project and overrides this to return this Vert.x instance
  */
 public interface StorkInfrastructure {
     /**
      * Get an instance of a "utility" class
-     * 
+     *
      * @param utilityClass class of the requested object
      * @param defaultSupplier should be used by the implementation to create an object if the environment doesn't provide one,
      *        the result value can be cached.

core/src/main/java/io/smallrye/stork/impl/CachingServiceDiscovery.java

@@ -52,7 +52,7 @@ public CachingServiceDiscovery(String refreshPeriod) {
     /***
      * Configures the period to keep service instances in the cache. Elements will be refetched after the given period.
      * This method can be extended by the provider in order to change the logic for caching service instances.
-     * 
+     *
      * @param uni service instances retrieved from backing discovery source
      * @return cached list of service instances in form of Uni
      */

core/src/test/java/io/smallrye/stork/test/ProgrammaticApiTest.java

@@ -84,7 +84,7 @@ void testInvalidConfig() {
         Stork.initialize();
         assertThatThrownBy(() -> Stork.getInstance().defineIfAbsent(null,
                 ServiceDefinition.of(new FakeConfiguration().withSecure("true"), new SingleConfiguration())))
-                        .isInstanceOf(IllegalArgumentException.class);
+                .isInstanceOf(IllegalArgumentException.class);
 
         assertThatThrownBy(() -> Stork.getInstance().defineIfAbsent("acme",
                 ServiceDefinition.of(null, new SingleConfiguration()))).isInstanceOf(IllegalArgumentException.class);

load-balancer/sticky/src/main/java/io/smallrye/stork/loadbalancer/random/StickyLoadBalancer.java

@@ -50,7 +50,7 @@ public StickyLoadBalancer(Duration failureBackOff) {
 
     /**
      * Selects the service instance
-     * 
+     *
      * @param serviceInstances instances to choose from
      *
      * @return the selected instance

pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-parent</artifactId>
-        <version>38</version>
+        <version>43</version>
     </parent>
 
     <groupId>io.smallrye.stork</groupId>

service-discovery/composite/src/main/java/io/smallrye/stork/servicediscovery/composite/CompositeServiceDiscovery.java

@@ -27,7 +27,7 @@ public class CompositeServiceDiscovery implements ServiceDiscovery {
 
     /**
      * Creates a new CompositeServiceDiscovery
-     * 
+     *
      * @param serviceName the service name
      * @param serviceNames the composed service names
      */

service-discovery/composite/src/test/java/io/smallrye/stork/servicediscovery/composite/CompositeServiceDiscoveryTest.java

@@ -115,7 +115,7 @@ void shouldFailOnUnknownServiceDuringFirstLookup() {
         assertThatThrownBy(() -> stork.getService("third-service")
                 .getInstances()
                 .await().atMost(Duration.ofSeconds(5))).isInstanceOf(NoSuchServiceDefinitionException.class)
-                        .hasMessageContaining("second-service");
+                .hasMessageContaining("second-service");
 
         stork.defineIfAbsent("second-service",
                 ServiceDefinition.of(new StaticConfiguration().withAddressList("localhost:8082")));

service-discovery/consul/src/main/java/io/smallrye/stork/servicediscovery/consul/ConsulMetadataKey.java

@@ -24,7 +24,7 @@ public enum ConsulMetadataKey implements MetadataKey {
 
     /**
      * Creates a new ConsulMetadataKey
-     * 
+     *
      * @param name the name
      */
     ConsulMetadataKey(String name) {

service-discovery/dns/src/main/java/io/smallrye/stork/servicediscovery/dns/DnsMetadataKey.java

@@ -21,7 +21,7 @@ public enum DnsMetadataKey implements MetadataKey {
 
     /**
      * Creates a new DnsMetadataKey
-     * 
+     *
      * @param name the name
      */
     DnsMetadataKey(String name) {

service-discovery/eureka/src/main/java/io/smallrye/stork/servicediscovery/eureka/EurekaMetadataKey.java

@@ -16,7 +16,7 @@ public enum EurekaMetadataKey implements MetadataKey {
 
     /**
      * Creates a new ConsulMetadataKey
-     * 
+     *
      * @param name the name
      */
     EurekaMetadataKey(String name) {

service-discovery/static-list/src/test/java/io/smallrye/stork/servicediscovery/staticlist/StaticListServiceDiscoveryProgrammaticApiTest.java

@@ -100,8 +100,9 @@ void shouldFailOnMissingService() {
     void shouldFailOnInvalidFormat() {
         assertThatThrownBy(() -> stork.defineIfAbsent("broken-service", ServiceDefinition.of(
                 new StaticConfiguration()
-                        .withAddressList("localhost:8080, localhost:8081, , ")))).isInstanceOf(IllegalArgumentException.class)
-                                .hasMessageContaining("Address not parseable");
+                        .withAddressList("localhost:8080, localhost:8081, , "))))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining("Address not parseable");
     }
 
 }