diff --git a/CHANGELOG.md b/CHANGELOG.md index da389a7f0..7d8244f13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 2.0.0 +### Backward incompatible changes +#### Common +- Flow API is now used from `java.util.concurrent.Flow`, Helidon specific `Flow` class is now removed + ## [1.4.0] ### Notes diff --git a/common/common/src/test/java/io/helidon/common/InputStreamHelperTest.java b/common/common/src/test/java/io/helidon/common/InputStreamHelperTest.java index 3b6801dbb..a58d999db 100644 --- a/common/common/src/test/java/io/helidon/common/InputStreamHelperTest.java +++ b/common/common/src/test/java/io/helidon/common/InputStreamHelperTest.java @@ -16,16 +16,16 @@ package io.helidon.common; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotSame; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; - /** * Unit tests for class {@link InputStreamHelper}. * diff --git a/common/configurable/src/test/java/io/helidon/common/configurable/ScheduledThreadPoolSupplierTest.java b/common/configurable/src/test/java/io/helidon/common/configurable/ScheduledThreadPoolSupplierTest.java index 861016336..d5d2c7698 100644 --- a/common/configurable/src/test/java/io/helidon/common/configurable/ScheduledThreadPoolSupplierTest.java +++ b/common/configurable/src/test/java/io/helidon/common/configurable/ScheduledThreadPoolSupplierTest.java @@ -21,6 +21,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.atomic.AtomicReference; import io.helidon.config.Config; + import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/common/http/src/main/java/io/helidon/common/http/Content.java b/common/http/src/main/java/io/helidon/common/http/Content.java index 4e9839dfd..3bc2ca046 100644 --- a/common/http/src/main/java/io/helidon/common/http/Content.java +++ b/common/http/src/main/java/io/helidon/common/http/Content.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,11 +17,10 @@ package io.helidon.common.http; import java.util.concurrent.CompletionStage; +import java.util.concurrent.Flow; import java.util.function.Function; import java.util.function.Predicate; -import io.helidon.common.reactive.Flow; - /** * Represents an HTTP entity as a {@link Flow.Publisher publisher} of {@link DataChunk chunks} with specific * features. diff --git a/common/http/src/main/java/io/helidon/common/http/Reader.java b/common/http/src/main/java/io/helidon/common/http/Reader.java index b7e78dd0a..f6c1f3c12 100644 --- a/common/http/src/main/java/io/helidon/common/http/Reader.java +++ b/common/http/src/main/java/io/helidon/common/http/Reader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,10 +17,9 @@ package io.helidon.common.http; import java.util.concurrent.CompletionStage; +import java.util.concurrent.Flow; import java.util.function.BiFunction; -import io.helidon.common.reactive.Flow; - /** * The Reader transforms a {@link DataChunk} publisher into a completion stage of the associated type. * diff --git a/common/http/src/test/java/io/helidon/common/http/AsciiTest.java b/common/http/src/test/java/io/helidon/common/http/AsciiTest.java index bba9e4499..45067fa4a 100644 --- a/common/http/src/test/java/io/helidon/common/http/AsciiTest.java +++ b/common/http/src/test/java/io/helidon/common/http/AsciiTest.java @@ -16,12 +16,12 @@ package io.helidon.common.http; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.jupiter.api.Test; - /** * Unit tests for class {@link Ascii}. * diff --git a/common/http/src/test/java/io/helidon/common/http/FormParamsTest.java b/common/http/src/test/java/io/helidon/common/http/FormParamsTest.java index 26e45dc15..2155bafed 100644 --- a/common/http/src/test/java/io/helidon/common/http/FormParamsTest.java +++ b/common/http/src/test/java/io/helidon/common/http/FormParamsTest.java @@ -15,19 +15,18 @@ */ package io.helidon.common.http; -import io.helidon.common.CollectionsHelper; -import org.hamcrest.CoreMatchers; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -import static org.hamcrest.CoreMatchers.*; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.assertThrows; - - import java.util.List; import java.util.Optional; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.hasItems; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class FormParamsTest { private static final String KEY1 = "key1"; diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/BaseProcessor.java b/common/reactive/src/main/java/io/helidon/common/reactive/BaseProcessor.java index b4bd4eeb8..969c1734f 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/BaseProcessor.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/BaseProcessor.java @@ -16,13 +16,12 @@ package io.helidon.common.reactive; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Flow.Processor; +import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.Subscriber; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.atomic.AtomicBoolean; -import io.helidon.common.reactive.Flow.Processor; -import io.helidon.common.reactive.Flow.Publisher; -import io.helidon.common.reactive.Flow.Subscriber; -import io.helidon.common.reactive.Flow.Subscription; - /** * A generic processor used for the implementation of {@link Multi} and {@link Single}. * diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/EmptySubscription.java b/common/reactive/src/main/java/io/helidon/common/reactive/EmptySubscription.java index cf6477488..9da47776c 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/EmptySubscription.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/EmptySubscription.java @@ -15,7 +15,7 @@ */ package io.helidon.common.reactive; -import io.helidon.common.reactive.Flow.Subscription; +import java.util.concurrent.Flow.Subscription; /** * Empty subscription singleton. diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/FixedItemsPublisher.java b/common/reactive/src/main/java/io/helidon/common/reactive/FixedItemsPublisher.java index 6187a1ac7..036d3af7e 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/FixedItemsPublisher.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/FixedItemsPublisher.java @@ -18,11 +18,11 @@ package io.helidon.common.reactive; import java.util.Collection; import java.util.LinkedList; import java.util.Queue; +import java.util.concurrent.Flow; +import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.atomic.AtomicBoolean; -import io.helidon.common.reactive.Flow.Publisher; -import io.helidon.common.reactive.Flow.Subscriber; - /** * Fixed items publisher implementation. */ diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/Flow.java b/common/reactive/src/main/java/io/helidon/common/reactive/Flow.java deleted file mode 100644 index 3cad58a99..000000000 --- a/common/reactive/src/main/java/io/helidon/common/reactive/Flow.java +++ /dev/null @@ -1,294 +0,0 @@ -/* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.helidon.common.reactive; - -/** - * Interrelated interfaces and static methods for establishing - * flow-controlled components in which {@link Publisher Publishers} - * produce items consumed by one or more {@link Subscriber - * Subscribers}, each managed by a {@link Subscription - * Subscription}. - * - *

These interfaces correspond to the reactive-streams - * specification. They apply in both concurrent and distributed - * asynchronous settings: All (seven) methods are defined in {@code - * void} "one-way" message style. Communication relies on a simple form - * of flow control (method {@link Subscription#request}) that can be - * used to avoid resource management problems that may otherwise occur - * in "push" based systems. - * - *

Examples. A {@link Publisher} usually defines its own - * {@link Subscription} implementation; constructing one in method - * {@code subscribe} and issuing it to the calling {@link - * Subscriber}. It publishes items to the subscriber asynchronously, - * normally using an {@link java.util.concurrent.Executor}. For example, here is a very - * simple publisher that only issues (when requested) a single {@code - * TRUE} item to a single subscriber. Because the subscriber receives - * only a single item, this class does not use buffering and ordering - * control required in most implementations (for example {@link - * SubmissionPublisher}). - * - * 

 {@code
- * class OneShotPublisher implements Publisher {
- *   private final ExecutorService executor = ForkJoinPool.commonPool(); // daemon-based
- *   private boolean subscribed; // true after first subscribe
- *   public synchronized void subscribe(Subscriber subscriber) {
- *     if (subscribed)
- *       subscriber.onError(new IllegalStateException()); // only one allowed
- *     else {
- *       subscribed = true;
- *       subscriber.onSubscribe(new OneShotSubscription(subscriber, executor));
- *     }
- *   }
- *   static class OneShotSubscription implements Subscription {
- *     private final Subscriber subscriber;
- *     private final ExecutorService executor;
- *     private Future future; // to allow cancellation
- *     private boolean completed;
- *     OneShotSubscription(Subscriber subscriber,
- *                         ExecutorService executor) {
- *       this.subscriber = subscriber;
- *       this.executor = executor;
- *     }
- *     public synchronized void request(long n) {
- *       if (n != 0 && !completed) {
- *         completed = true;
- *         if (n < 0) {
- *           IllegalArgumentException ex = new IllegalArgumentException();
- *           executor.execute(() -> subscriber.onError(ex));
- *         } else {
- *           future = executor.submit(() -> {
- *             subscriber.onNext(Boolean.TRUE);
- *             subscriber.onComplete();
- *           });
- *         }
- *       }
- *     }
- *     public synchronized void cancel() {
- *       completed = true;
- *       if (future != null) future.cancel(false);
- *     }
- *   }
- * }}
- * - *

A {@link Subscriber} arranges that items be requested and - * processed. Items (invocations of {@link Subscriber#onNext}) are - * not issued unless requested, but multiple items may be requested. - * Many Subscriber implementations can arrange this in the style of - * the following example, where a buffer size of 1 single-steps, and - * larger sizes usually allow for more efficient overlapped processing - * with less communication; for example with a value of 64, this keeps - * total outstanding requests between 32 and 64. - * Because Subscriber method invocations for a given {@link - * Subscription} are strictly ordered, there is no need for these - * methods to use locks or volatiles unless a Subscriber maintains - * multiple Subscriptions (in which case it is better to instead - * define multiple Subscribers, each with its own Subscription). - * - * 

 {@code
- * class SampleSubscriber implements Subscriber {
- *   final Consumer consumer;
- *   Subscription subscription;
- *   final long bufferSize;
- *   long count;
- *   SampleSubscriber(long bufferSize, Consumer consumer) {
- *     this.bufferSize = bufferSize;
- *     this.consumer = consumer;
- *   }
- *   public void onSubscribe(Subscription subscription) {
- *     long initialRequestSize = bufferSize;
- *     count = bufferSize - bufferSize / 2; // re-request when half consumed
- *     (this.subscription = subscription).request(initialRequestSize);
- *   }
- *   public void onNext(T item) {
- *     if (--count <= 0)
- *       subscription.request(count = bufferSize - bufferSize / 2);
- *     consumer.accept(item);
- *   }
- *   public void onError(Throwable ex) { ex.printStackTrace(); }
- *   public void onComplete() {}
- * }}
- * - *

The default value of {@link #defaultBufferSize} may provide a - * useful starting point for choosing request sizes and capacities in - * Flow components based on expected rates, resources, and usages. - * Or, when flow control is never needed, a subscriber may initially - * request an effectively unbounded number of items, as in: - * - * 

 {@code
- * class UnboundedSubscriber implements Subscriber {
- *   public void onSubscribe(Subscription subscription) {
- *     subscription.request(Long.MAX_VALUE); // effectively unbounded
- *   }
- *   public void onNext(T item) { use(item); }
- *   public void onError(Throwable ex) { ex.printStackTrace(); }
- *   public void onComplete() {}
- *   void use(T item) { ... }
- * }}
- * - */ -public final class Flow { - - private Flow() {} // uninstantiable - - /** - * A producer of items (and related control messages) received by - * Subscribers. Each current {@link Subscriber} receives the same - * items (via method {@code onNext}) in the same order, unless - * drops or errors are encountered. If a Publisher encounters an - * error that does not allow items to be issued to a Subscriber, - * that Subscriber receives {@code onError}, and then receives no - * further messages. Otherwise, when it is known that no further - * messages will be issued to it, a subscriber receives {@code - * onComplete}. Publishers ensure that Subscriber method - * invocations for each subscription are strictly ordered in happens-before - * order. - * - *

Publishers may vary in policy about whether drops (failures - * to issue an item because of resource limitations) are treated - * as unrecoverable errors. Publishers may also vary about - * whether Subscribers receive items that were produced or - * available before they subscribed. - * - * @param the published item type - */ - @FunctionalInterface - public interface Publisher { - /** - * Adds the given Subscriber if possible. If already - * subscribed, or the attempt to subscribe fails due to policy - * violations or errors, the Subscriber's {@code onError} - * method is invoked with an {@link IllegalStateException}. - * Otherwise, the Subscriber's {@code onSubscribe} method is - * invoked with a new {@link Subscription}. Subscribers may - * enable receiving items by invoking the {@code request} - * method of this Subscription, and may unsubscribe by - * invoking its {@code cancel} method. - * - * @param subscriber the subscriber - * @throws NullPointerException if subscriber is null - */ - void subscribe(Subscriber subscriber); - } - - /** - * A receiver of messages. The methods in this interface are - * invoked in strict sequential order for each {@link - * Subscription}. - * - * @param the subscribed item type - */ - public interface Subscriber { - /** - * Method invoked prior to invoking any other Subscriber - * methods for the given Subscription. If this method throws - * an exception, resulting behavior is not guaranteed, but may - * cause the Subscription not to be established or to be cancelled. - * - *

Typically, implementations of this method invoke {@code - * subscription.request} to enable receiving items. - * - * @param subscription a new subscription - */ - void onSubscribe(Subscription subscription); - - /** - * Method invoked with a Subscription's next item. If this - * method throws an exception, resulting behavior is not - * guaranteed, but may cause the Subscription to be cancelled. - * - * @param item the item - */ - void onNext(T item); - - /** - * Method invoked upon an unrecoverable error encountered by a - * Publisher or Subscription, after which no other Subscriber - * methods are invoked by the Subscription. If this method - * itself throws an exception, resulting behavior is - * undefined. - * - * @param throwable the exception - */ - void onError(Throwable throwable); - - /** - * Method invoked when it is known that no additional - * Subscriber method invocations will occur for a Subscription - * that is not already terminated by error, after which no - * other Subscriber methods are invoked by the Subscription. - * If this method throws an exception, resulting behavior is - * undefined. - */ - void onComplete(); - } - - /** - * Message control linking a {@link Publisher} and {@link - * Subscriber}. Subscribers receive items only when requested, - * and may cancel at any time. The methods in this interface are - * intended to be invoked only by their Subscribers; usages in - * other contexts have undefined effects. - */ - public interface Subscription { - /** - * Adds the given number {@code n} of items to the current - * unfulfilled demand for this subscription. If {@code n} is - * less than or equal to zero, the Subscriber will receive an - * {@code onError} signal with an {@link - * IllegalArgumentException} argument. Otherwise, the - * Subscriber will receive up to {@code n} additional {@code - * onNext} invocations (or fewer if terminated). - * - * @param n the increment of demand; a value of {@code - * Long.MAX_VALUE} may be considered as effectively unbounded - */ - void request(long n); - - /** - * Causes the Subscriber to (eventually) stop receiving - * messages. Implementation is best-effort -- additional - * messages may be received after invoking this method. - * A cancelled subscription need not ever receive an - * {@code onComplete} or {@code onError} signal. - */ - void cancel(); - } - - /** - * A component that acts as both a Subscriber and Publisher. - * - * @param the subscribed item type - * @param the published item type - */ - public interface Processor extends Subscriber, Publisher { - } - - static final int DEFAULT_BUFFER_SIZE = 256; - - /** - * Returns a default value for Publisher or Subscriber buffering, - * that may be used in the absence of other constraints. - * - * @return the buffer size value - */ - public static int defaultBufferSize() { - return DEFAULT_BUFFER_SIZE; - } -} diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/FunctionalSubscriber.java b/common/reactive/src/main/java/io/helidon/common/reactive/FunctionalSubscriber.java index 2bfd9ea89..0aba0e5a3 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/FunctionalSubscriber.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/FunctionalSubscriber.java @@ -15,11 +15,10 @@ */ package io.helidon.common.reactive; +import java.util.concurrent.Flow.Subscriber; +import java.util.concurrent.Flow.Subscription; import java.util.function.Consumer; -import io.helidon.common.reactive.Flow.Subscriber; -import io.helidon.common.reactive.Flow.Subscription; - /** * A subscriber delegated java functions for each of the subscriber methods. */ diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/Multi.java b/common/reactive/src/main/java/io/helidon/common/reactive/Multi.java index 183549739..4012600eb 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/Multi.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/Multi.java @@ -17,10 +17,10 @@ package io.helidon.common.reactive; import java.util.Collection; import java.util.List; +import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.Subscriber; import io.helidon.common.mapper.Mapper; -import io.helidon.common.reactive.Flow.Publisher; -import io.helidon.common.reactive.Flow.Subscriber; import static io.helidon.common.CollectionsHelper.listOf; diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/MultiEmpty.java b/common/reactive/src/main/java/io/helidon/common/reactive/MultiEmpty.java index 5a7045812..c23ea4b18 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/MultiEmpty.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/MultiEmpty.java @@ -15,8 +15,8 @@ */ package io.helidon.common.reactive; -import io.helidon.common.reactive.Flow.Publisher; -import io.helidon.common.reactive.Flow.Subscriber; +import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.Subscriber; /** * Implementation of {@link Multi} that represents the absence of a value by invoking {@link Subscriber#onComplete() } during diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/MultiError.java b/common/reactive/src/main/java/io/helidon/common/reactive/MultiError.java index 228079407..b9b842777 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/MultiError.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/MultiError.java @@ -16,9 +16,8 @@ package io.helidon.common.reactive; import java.util.Objects; - -import io.helidon.common.reactive.Flow.Publisher; -import io.helidon.common.reactive.Flow.Subscriber; +import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.Subscriber; /** * Implementation of {@link Multi} that represents an error, raised during {@link Publisher#subscribe(Subscriber)} by invoking diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/MultiFromPublisher.java b/common/reactive/src/main/java/io/helidon/common/reactive/MultiFromPublisher.java index 9eb6b4100..9b6494120 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/MultiFromPublisher.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/MultiFromPublisher.java @@ -16,9 +16,9 @@ package io.helidon.common.reactive; import java.util.Objects; - -import io.helidon.common.reactive.Flow.Publisher; -import io.helidon.common.reactive.Flow.Subscriber; +import java.util.concurrent.Flow; +import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.Subscriber; /** * Implementation of {@link Multi} that is backed by a {@link Publisher}. diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/MultiMappingProcessor.java b/common/reactive/src/main/java/io/helidon/common/reactive/MultiMappingProcessor.java index 9f7c78d6b..2fed3725f 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/MultiMappingProcessor.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/MultiMappingProcessor.java @@ -16,9 +16,9 @@ package io.helidon.common.reactive; import java.util.Objects; +import java.util.concurrent.Flow.Publisher; import io.helidon.common.mapper.Mapper; -import io.helidon.common.reactive.Flow.Publisher; /** * Processor of {@link Publisher} to {@link Single} that publishes and maps each received item. diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/MultiNever.java b/common/reactive/src/main/java/io/helidon/common/reactive/MultiNever.java index 28734e766..9bba462a3 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/MultiNever.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/MultiNever.java @@ -15,7 +15,7 @@ */ package io.helidon.common.reactive; -import io.helidon.common.reactive.Flow.Subscriber; +import java.util.concurrent.Flow.Subscriber; /** * Implementation of {@link Multi} that never invokes {@link Subscriber#onComplete()} or diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/OriginThreadPublisher.java b/common/reactive/src/main/java/io/helidon/common/reactive/OriginThreadPublisher.java index f24604bf8..3fe1258bd 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/OriginThreadPublisher.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/OriginThreadPublisher.java @@ -18,16 +18,16 @@ package io.helidon.common.reactive; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Flow; +import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.Subscriber; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Logger; -import io.helidon.common.reactive.Flow.Publisher; -import io.helidon.common.reactive.Flow.Subscriber; -import io.helidon.common.reactive.Flow.Subscription; - /** * The OriginThreadPublisher's nature is to always run {@link Subscriber#onNext(Object)} on the very same thread as * {@link #submit(Object)}. In other words, whenever the source of chunks sends data, the same thread is used to deliver the data diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/OutputStreamPublisher.java b/common/reactive/src/main/java/io/helidon/common/reactive/OutputStreamPublisher.java index 08e076b01..d168c1ddb 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/OutputStreamPublisher.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/OutputStreamPublisher.java @@ -22,9 +22,10 @@ import java.nio.ByteBuffer; import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Flow; /** - * Output stream that {@link io.helidon.common.reactive.Flow.Publisher} publishes any data written to it as {@link ByteBuffer} + * Output stream that {@link java.util.concurrent.Flow.Publisher} publishes any data written to it as {@link ByteBuffer} * events. */ @SuppressWarnings("WeakerAccess") diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/ReactiveStreamsAdapter.java b/common/reactive/src/main/java/io/helidon/common/reactive/ReactiveStreamsAdapter.java index f11cd90a7..206486650 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/ReactiveStreamsAdapter.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/ReactiveStreamsAdapter.java @@ -16,6 +16,8 @@ package io.helidon.common.reactive; +import java.util.concurrent.Flow; + import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/RequestedCounter.java b/common/reactive/src/main/java/io/helidon/common/reactive/RequestedCounter.java index a3f6b7192..6d602e805 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/RequestedCounter.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/RequestedCounter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import java.util.function.Consumer; * Requested event counter. * * This utility class helps to safely track and tryProcess the back-pressure of - * {@link io.helidon.common.reactive.Flow.Subscriber}s. + * {@link java.util.concurrent.Flow.Subscriber}s. */ public class RequestedCounter { diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/RetrySchema.java b/common/reactive/src/main/java/io/helidon/common/reactive/RetrySchema.java index 453837c05..5130aa338 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/RetrySchema.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/RetrySchema.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package io.helidon.common.reactive; /** - * Defines delay for next read/poll operation in a polling {@link io.helidon.common.reactive.Flow.Publisher publisher}. + * Defines delay for next read/poll operation in a polling {@link java.util.concurrent.Flow.Publisher publisher}. *

* Schema defines a delay before next poll if the last one did not get new data. *

diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/Single.java b/common/reactive/src/main/java/io/helidon/common/reactive/Single.java index d70056a02..86070daed 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/Single.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/Single.java @@ -19,12 +19,12 @@ import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import io.helidon.common.mapper.Mapper; -import io.helidon.common.reactive.Flow.Publisher; -import io.helidon.common.reactive.Flow.Subscriber; /** * Single item publisher utility. diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/SingleEmpty.java b/common/reactive/src/main/java/io/helidon/common/reactive/SingleEmpty.java index 7b4f2f6c2..a083ab2a6 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/SingleEmpty.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/SingleEmpty.java @@ -15,10 +15,12 @@ */ package io.helidon.common.reactive; +import java.util.concurrent.Flow; + /** * Implementation of {@link Single} that represents the absence of a value by - * invoking {@link Subscriber#onComplete() } during - * {@link Publisher#subscribe(Subscriber)}. + * invoking {@link java.util.concurrent.Flow.Subscriber#onComplete() } during + * {@link java.util.concurrent.Flow.Publisher#subscribe(java.util.concurrent.Flow.Subscriber)}. */ final class SingleEmpty implements Single { diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/SingleError.java b/common/reactive/src/main/java/io/helidon/common/reactive/SingleError.java index 2aa8db2be..e7739e09f 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/SingleError.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/SingleError.java @@ -16,9 +16,8 @@ package io.helidon.common.reactive; import java.util.Objects; - -import io.helidon.common.reactive.Flow.Publisher; -import io.helidon.common.reactive.Flow.Subscriber; +import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.Subscriber; /** * Implementation of {@link Single} that represents an error, raised during diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/SingleJust.java b/common/reactive/src/main/java/io/helidon/common/reactive/SingleJust.java index 320cb0478..dd31a8d5d 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/SingleJust.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/SingleJust.java @@ -16,8 +16,7 @@ package io.helidon.common.reactive; import java.util.Objects; - -import io.helidon.common.reactive.Flow.Subscriber; +import java.util.concurrent.Flow.Subscriber; /** * Implementation of {@link Single} that represents a non {@code null} value. diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/SingleMappingProcessor.java b/common/reactive/src/main/java/io/helidon/common/reactive/SingleMappingProcessor.java index aff946162..24d69b5df 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/SingleMappingProcessor.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/SingleMappingProcessor.java @@ -16,9 +16,9 @@ package io.helidon.common.reactive; import java.util.Objects; +import java.util.concurrent.Flow.Publisher; import io.helidon.common.mapper.Mapper; -import io.helidon.common.reactive.Flow.Publisher; /** * Processor of {@link Publisher} to {@link Single} that only processes the first diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/SingleMultiMappingProcessor.java b/common/reactive/src/main/java/io/helidon/common/reactive/SingleMultiMappingProcessor.java index b2b96293f..81b65dd05 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/SingleMultiMappingProcessor.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/SingleMultiMappingProcessor.java @@ -16,9 +16,9 @@ package io.helidon.common.reactive; import java.util.Objects; +import java.util.concurrent.Flow.Publisher; import io.helidon.common.mapper.Mapper; -import io.helidon.common.reactive.Flow.Publisher; /** * Processor of {@link Single} to {@link Publisher} that expands the first (and diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/SingleNever.java b/common/reactive/src/main/java/io/helidon/common/reactive/SingleNever.java index 0a1f1af9a..20127150e 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/SingleNever.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/SingleNever.java @@ -15,7 +15,7 @@ */ package io.helidon.common.reactive; -import io.helidon.common.reactive.Flow.Subscriber; +import java.util.concurrent.Flow.Subscriber; /** * Implementation of {@link Single} that never invokes diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/SingleSubscriberHolder.java b/common/reactive/src/main/java/io/helidon/common/reactive/SingleSubscriberHolder.java index ecfc59af0..7d7fe4c0f 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/SingleSubscriberHolder.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/SingleSubscriberHolder.java @@ -18,6 +18,7 @@ package io.helidon.common.reactive; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Flow; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; @@ -38,7 +39,7 @@ public class SingleSubscriberHolder { *

* In case the subscriber registration fails (e.g. the holder already holds a previously registered subscriber * or the holder has been {@link #close(Consumer) closed}), the newly registered subscriber is notified about the - * error by invoking it's {@link io.helidon.common.reactive.Flow.Subscriber#onError(Throwable) subscriber.onError} method. + * error by invoking it's {@link java.util.concurrent.Flow.Subscriber#onError(Throwable) subscriber.onError} method. * * @param subscriber subscriber to be registered in the holder. * @return {@code true} if the subscriber was successfully registered, {@code false} otherwise. @@ -67,7 +68,7 @@ public class SingleSubscriberHolder { /** * Mark the subscriber holder as closed. *

- * Invoking this method will ensure that any new attempts to {@link #register(io.helidon.common.reactive.Flow.Subscriber) + * Invoking this method will ensure that any new attempts to {@link #register(java.util.concurrent.Flow.Subscriber) * register} a new subscriber * would fail. *

diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/SingleSubscription.java b/common/reactive/src/main/java/io/helidon/common/reactive/SingleSubscription.java index 5b1a30b17..d5bbf9f5a 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/SingleSubscription.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/SingleSubscription.java @@ -15,11 +15,10 @@ */ package io.helidon.common.reactive; +import java.util.concurrent.Flow.Subscriber; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.atomic.AtomicBoolean; -import io.helidon.common.reactive.Flow.Subscriber; -import io.helidon.common.reactive.Flow.Subscription; - /** * Single fixed item subscription. */ diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/SingleToFuture.java b/common/reactive/src/main/java/io/helidon/common/reactive/SingleToFuture.java index 017211e38..ab6de5397 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/SingleToFuture.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/SingleToFuture.java @@ -17,11 +17,10 @@ package io.helidon.common.reactive; import java.util.Objects; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Flow.Subscriber; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.atomic.AtomicReference; -import io.helidon.common.reactive.Flow.Subscriber; -import io.helidon.common.reactive.Flow.Subscription; - /** * {@link Single} exposed as a {@link CompletableFuture}. */ diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/SubmissionPublisher.java b/common/reactive/src/main/java/io/helidon/common/reactive/SubmissionPublisher.java index 9338b7ae3..cb2eb77e3 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/SubmissionPublisher.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/SubmissionPublisher.java @@ -17,6 +17,7 @@ package io.helidon.common.reactive; import java.util.concurrent.Executor; +import java.util.concurrent.Flow; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BiPredicate; import java.util.function.Consumer; diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/Subscribable.java b/common/reactive/src/main/java/io/helidon/common/reactive/Subscribable.java index a39ff1336..d0c0d0499 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/Subscribable.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/Subscribable.java @@ -15,10 +15,10 @@ */ package io.helidon.common.reactive; +import java.util.concurrent.Flow; +import java.util.concurrent.Flow.Publisher; import java.util.function.Consumer; -import io.helidon.common.reactive.Flow.Publisher; - /** * Decorated publisher that allows subscribing to individual events with java functions. * @param item type diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/package-info.java b/common/reactive/src/main/java/io/helidon/common/reactive/package-info.java index e98ecbae6..30336ba91 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/package-info.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ /** * Common reactive library for Helidon projects. * - * @see io.helidon.common.reactive.Flow + * @see java.util.concurrent.Flow * @see io.helidon.common.reactive.ReactiveStreamsAdapter * @see io.helidon.common.reactive.OutputStreamPublisher * @see io.helidon.common.reactive.SubmissionPublisher diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/valve/PublisherValve.java b/common/reactive/src/main/java/io/helidon/common/reactive/valve/PublisherValve.java index 77726fae8..dd108681d 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/valve/PublisherValve.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/valve/PublisherValve.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,16 +17,15 @@ package io.helidon.common.reactive.valve; import java.util.Objects; +import java.util.concurrent.Flow; import java.util.concurrent.locks.ReentrantLock; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.logging.Level; import java.util.logging.Logger; -import io.helidon.common.reactive.Flow; - /** - * The {@link Valve} implementation on top of {@link io.helidon.common.reactive.Flow.Publisher}. + * The {@link Valve} implementation on top of {@link java.util.concurrent.Flow.Publisher}. * * @param Type of {@code Valve} and {@code Publisher} items */ diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/valve/Valve.java b/common/reactive/src/main/java/io/helidon/common/reactive/valve/Valve.java index ba7091055..96e35349a 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/valve/Valve.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/valve/Valve.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,14 +21,13 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutorService; +import java.util.concurrent.Flow; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collector; -import io.helidon.common.reactive.Flow; - /** * Represents a reactive source of data which can be {@link #pause() paused} and {@link #resume() resumed}. * @@ -199,9 +198,9 @@ public interface Valve extends Pausable { } /** - * Transforms this {@code Valve} into {@link io.helidon.common.reactive.Flow.Publisher} representation. Resulting {@code + * Transforms this {@code Valve} into {@link java.util.concurrent.Flow.Publisher} representation. Resulting {@code * Publisher} - * accepts only single {@link io.helidon.common.reactive.Flow.Subscriber}. + * accepts only single {@link java.util.concurrent.Flow.Subscriber}. * * @return a {@code Publisher} representation */ diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/valve/ValvePublisher.java b/common/reactive/src/main/java/io/helidon/common/reactive/valve/ValvePublisher.java index f99df7d24..fef0b6b3d 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/valve/ValvePublisher.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/valve/ValvePublisher.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,11 @@ package io.helidon.common.reactive.valve; +import java.util.concurrent.Flow; import java.util.concurrent.locks.ReentrantReadWriteLock; -import io.helidon.common.reactive.Flow; - /** - * The ValvePublisher provides {@link io.helidon.common.reactive.Flow.Publisher} based API for the {@link Valve}. + * The ValvePublisher provides {@link java.util.concurrent.Flow.Publisher} based API for the {@link Valve}. * This publisher accepts only a single subscriber. * * @param the type of items to be published @@ -35,10 +34,10 @@ class ValvePublisher implements Flow.Publisher { private volatile PausableFeeder pausableFeeder; /** - * Creates a {@link io.helidon.common.reactive.Flow.Publisher} wrapping a provided {@link Valve}. - * Depending on the Valve implementation, only the first {@link io.helidon.common.reactive.Flow.Subscriber} + * Creates a {@link java.util.concurrent.Flow.Publisher} wrapping a provided {@link Valve}. + * Depending on the Valve implementation, only the first {@link java.util.concurrent.Flow.Subscriber} * (subscribed to any number of such created publishers for a single {@link Valve} instance) that calls - * {@link io.helidon.common.reactive.Flow.Subscription#request(long)} will be able to consume the produced items. + * {@link java.util.concurrent.Flow.Subscription#request(long)} will be able to consume the produced items. * * @param valve the valve to wrap */ diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/valve/Valves.java b/common/reactive/src/main/java/io/helidon/common/reactive/valve/Valves.java index b9b6b3703..b100ee5db 100644 --- a/common/reactive/src/main/java/io/helidon/common/reactive/valve/Valves.java +++ b/common/reactive/src/main/java/io/helidon/common/reactive/valve/Valves.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,8 +20,7 @@ import java.io.InputStream; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.concurrent.ExecutorService; - -import io.helidon.common.reactive.Flow; +import java.util.concurrent.Flow; /** * An utility class for {@link Valve} interface. @@ -105,7 +104,7 @@ public class Valves { } /** - * Creates a {@link Valve} instance from provided {@link io.helidon.common.reactive.Flow.Publisher}. + * Creates a {@link Valve} instance from provided {@link java.util.concurrent.Flow.Publisher}. *

* If {@code publisher} parameter is {@code null} then returns an empty {@link Valve}. * diff --git a/common/reactive/src/test/java/io/helidon/common/reactive/BaseProcessorTest.java b/common/reactive/src/test/java/io/helidon/common/reactive/BaseProcessorTest.java index ab59d91e3..c64ac45a6 100644 --- a/common/reactive/src/test/java/io/helidon/common/reactive/BaseProcessorTest.java +++ b/common/reactive/src/test/java/io/helidon/common/reactive/BaseProcessorTest.java @@ -16,8 +16,8 @@ package io.helidon.common.reactive; -import io.helidon.common.reactive.Flow.Subscriber; -import io.helidon.common.reactive.Flow.Subscription; +import java.util.concurrent.Flow.Subscriber; +import java.util.concurrent.Flow.Subscription; import org.junit.jupiter.api.Test; diff --git a/common/reactive/src/test/java/io/helidon/common/reactive/MultiTest.java b/common/reactive/src/test/java/io/helidon/common/reactive/MultiTest.java index fd706345e..a7546099c 100644 --- a/common/reactive/src/test/java/io/helidon/common/reactive/MultiTest.java +++ b/common/reactive/src/test/java/io/helidon/common/reactive/MultiTest.java @@ -15,10 +15,11 @@ */ package io.helidon.common.reactive; -import java.util.List; import java.util.Collections; +import java.util.List; +import java.util.concurrent.Flow.Subscription; + import io.helidon.common.mapper.Mapper; -import io.helidon.common.reactive.Flow.Subscription; import org.junit.jupiter.api.Test; diff --git a/common/reactive/src/test/java/io/helidon/common/reactive/OriginThreadPublisherTest.java b/common/reactive/src/test/java/io/helidon/common/reactive/OriginThreadPublisherTest.java index 052d74019..ac3ec2430 100644 --- a/common/reactive/src/test/java/io/helidon/common/reactive/OriginThreadPublisherTest.java +++ b/common/reactive/src/test/java/io/helidon/common/reactive/OriginThreadPublisherTest.java @@ -19,19 +19,19 @@ package io.helidon.common.reactive; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.Flow; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; import java.util.logging.Level; import java.util.logging.Logger; -import io.helidon.common.reactive.Flow.Subscription; -import java.util.concurrent.atomic.AtomicBoolean; - import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.Test; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; diff --git a/common/reactive/src/test/java/io/helidon/common/reactive/SingleTest.java b/common/reactive/src/test/java/io/helidon/common/reactive/SingleTest.java index 242ee122c..b45cbb81c 100644 --- a/common/reactive/src/test/java/io/helidon/common/reactive/SingleTest.java +++ b/common/reactive/src/test/java/io/helidon/common/reactive/SingleTest.java @@ -16,13 +16,12 @@ package io.helidon.common.reactive; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Flow.Subscriber; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import io.helidon.common.reactive.Flow.Subscriber; -import io.helidon.common.reactive.Flow.Subscription; - import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/common/reactive/src/test/java/io/helidon/common/reactive/SubscribableTest.java b/common/reactive/src/test/java/io/helidon/common/reactive/SubscribableTest.java index 3061c8af7..5c50d8534 100644 --- a/common/reactive/src/test/java/io/helidon/common/reactive/SubscribableTest.java +++ b/common/reactive/src/test/java/io/helidon/common/reactive/SubscribableTest.java @@ -15,13 +15,16 @@ */ package io.helidon.common.reactive; +import java.util.concurrent.Flow; + +import org.junit.jupiter.api.Test; + import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.fail; -import org.junit.jupiter.api.Test; /** * {@link Subscribeable} test. diff --git a/common/reactive/src/test/java/io/helidon/common/reactive/TestPublisher.java b/common/reactive/src/test/java/io/helidon/common/reactive/TestPublisher.java index d43fd6853..f5bbc1ab2 100644 --- a/common/reactive/src/test/java/io/helidon/common/reactive/TestPublisher.java +++ b/common/reactive/src/test/java/io/helidon/common/reactive/TestPublisher.java @@ -15,12 +15,12 @@ */ package io.helidon.common.reactive; -import io.helidon.common.reactive.Flow.Publisher; -import io.helidon.common.reactive.Flow.Subscriber; -import io.helidon.common.reactive.Flow.Subscription; import java.util.Arrays; import java.util.LinkedList; import java.util.Queue; +import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.Subscriber; +import java.util.concurrent.Flow.Subscription; /** * Dummy items publisher for testing purpose. diff --git a/common/reactive/src/test/java/io/helidon/common/reactive/TestSubscriber.java b/common/reactive/src/test/java/io/helidon/common/reactive/TestSubscriber.java index 04aeaffeb..94b289f9a 100644 --- a/common/reactive/src/test/java/io/helidon/common/reactive/TestSubscriber.java +++ b/common/reactive/src/test/java/io/helidon/common/reactive/TestSubscriber.java @@ -18,6 +18,7 @@ package io.helidon.common.reactive; import java.util.LinkedList; import java.util.List; +import java.util.concurrent.Flow; /** * A dummy subscriber for testing purpose. diff --git a/common/reactive/src/test/java/io/helidon/common/reactive/TestSubscription.java b/common/reactive/src/test/java/io/helidon/common/reactive/TestSubscription.java index e041b654a..bab508f36 100644 --- a/common/reactive/src/test/java/io/helidon/common/reactive/TestSubscription.java +++ b/common/reactive/src/test/java/io/helidon/common/reactive/TestSubscription.java @@ -15,7 +15,7 @@ */ package io.helidon.common.reactive; -import io.helidon.common.reactive.Flow.Subscription; +import java.util.concurrent.Flow.Subscription; /** * Dummy subscription for testing purpose. diff --git a/common/reactive/src/test/java/io/helidon/common/reactive/WrappedOriginThreadPublisher.java b/common/reactive/src/test/java/io/helidon/common/reactive/WrappedOriginThreadPublisher.java index 82b0fd1c9..87777d525 100644 --- a/common/reactive/src/test/java/io/helidon/common/reactive/WrappedOriginThreadPublisher.java +++ b/common/reactive/src/test/java/io/helidon/common/reactive/WrappedOriginThreadPublisher.java @@ -16,6 +16,8 @@ package io.helidon.common.reactive; +import java.util.concurrent.Flow; + import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; diff --git a/common/reactive/src/test/java/io/helidon/common/reactive/valve/ValvePublisherTest.java b/common/reactive/src/test/java/io/helidon/common/reactive/valve/ValvePublisherTest.java index 710423d6a..50d0c27b3 100644 --- a/common/reactive/src/test/java/io/helidon/common/reactive/valve/ValvePublisherTest.java +++ b/common/reactive/src/test/java/io/helidon/common/reactive/valve/ValvePublisherTest.java @@ -18,12 +18,12 @@ package io.helidon.common.reactive.valve; import java.util.List; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Flow.Subscriber; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import io.helidon.common.reactive.Collector; -import io.helidon.common.reactive.Flow.Subscriber; -import io.helidon.common.reactive.Flow.Subscription; import io.helidon.common.reactive.Multi; import org.junit.jupiter.api.Test; diff --git a/config/config/src/main/java/io/helidon/config/AbstractConfigImpl.java b/config/config/src/main/java/io/helidon/config/AbstractConfigImpl.java index 967dc2a71..0ae26e70c 100644 --- a/config/config/src/main/java/io/helidon/config/AbstractConfigImpl.java +++ b/config/config/src/main/java/io/helidon/config/AbstractConfigImpl.java @@ -26,13 +26,13 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Flow; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.logging.Level; import java.util.logging.Logger; -import io.helidon.common.reactive.Flow; import io.helidon.config.internal.ConfigKeyImpl; import org.eclipse.microprofile.config.spi.ConfigSource; diff --git a/config/config/src/main/java/io/helidon/config/BuilderImpl.java b/config/config/src/main/java/io/helidon/config/BuilderImpl.java index 941f9f752..322c07087 100644 --- a/config/config/src/main/java/io/helidon/config/BuilderImpl.java +++ b/config/config/src/main/java/io/helidon/config/BuilderImpl.java @@ -30,6 +30,7 @@ import java.util.ServiceLoader; import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.Executors; +import java.util.concurrent.Flow; import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Supplier; @@ -40,7 +41,6 @@ import javax.annotation.Priority; import io.helidon.common.CollectionsHelper; import io.helidon.common.GenericType; import io.helidon.common.Prioritized; -import io.helidon.common.reactive.Flow; import io.helidon.common.serviceloader.HelidonServiceLoader; import io.helidon.common.serviceloader.Priorities; import io.helidon.config.ConfigMapperManager.MapperProviders; diff --git a/config/config/src/main/java/io/helidon/config/CompositeConfigSource.java b/config/config/src/main/java/io/helidon/config/CompositeConfigSource.java index 014f967d4..f341820fa 100644 --- a/config/config/src/main/java/io/helidon/config/CompositeConfigSource.java +++ b/config/config/src/main/java/io/helidon/config/CompositeConfigSource.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,12 +24,12 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.concurrent.Executors; +import java.util.concurrent.Flow; import java.util.concurrent.ScheduledExecutorService; import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.SubmissionPublisher; import io.helidon.config.internal.ConfigThreadFactory; import io.helidon.config.internal.ConfigUtils; diff --git a/config/config/src/main/java/io/helidon/config/Config.java b/config/config/src/main/java/io/helidon/config/Config.java index df7fe4dd2..bb91c5915 100644 --- a/config/config/src/main/java/io/helidon/config/Config.java +++ b/config/config/src/main/java/io/helidon/config/Config.java @@ -22,6 +22,7 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.concurrent.Executor; +import java.util.concurrent.Flow; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; @@ -30,7 +31,6 @@ import java.util.stream.Stream; import io.helidon.common.CollectionsHelper; import io.helidon.common.GenericType; -import io.helidon.common.reactive.Flow; import io.helidon.config.internal.ConfigKeyImpl; import io.helidon.config.spi.ConfigFilter; import io.helidon.config.spi.ConfigMapperProvider; diff --git a/config/config/src/main/java/io/helidon/config/ConfigFactory.java b/config/config/src/main/java/io/helidon/config/ConfigFactory.java index 53b8ca181..b71b65131 100644 --- a/config/config/src/main/java/io/helidon/config/ConfigFactory.java +++ b/config/config/src/main/java/io/helidon/config/ConfigFactory.java @@ -29,6 +29,7 @@ import java.util.Optional; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.Flow; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; import java.util.stream.Collectors; @@ -36,7 +37,6 @@ import java.util.stream.IntStream; import java.util.stream.Stream; import io.helidon.common.CollectionsHelper; -import io.helidon.common.reactive.Flow; import io.helidon.config.internal.ConfigKeyImpl; import io.helidon.config.spi.ConfigFilter; import io.helidon.config.spi.ConfigNode; diff --git a/config/config/src/main/java/io/helidon/config/ConfigHelper.java b/config/config/src/main/java/io/helidon/config/ConfigHelper.java index 13d291bbd..dee81ef03 100644 --- a/config/config/src/main/java/io/helidon/config/ConfigHelper.java +++ b/config/config/src/main/java/io/helidon/config/ConfigHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,11 +27,11 @@ import java.security.PrivilegedAction; import java.util.LinkedList; import java.util.List; import java.util.ServiceLoader; +import java.util.concurrent.Flow; import java.util.function.Function; import java.util.logging.Level; import java.util.logging.Logger; -import io.helidon.common.reactive.Flow; import io.helidon.config.internal.ConfigFileTypeDetector; /** diff --git a/config/config/src/main/java/io/helidon/config/ConfigSources.java b/config/config/src/main/java/io/helidon/config/ConfigSources.java index 567128e80..f1c4a704e 100644 --- a/config/config/src/main/java/io/helidon/config/ConfigSources.java +++ b/config/config/src/main/java/io/helidon/config/ConfigSources.java @@ -33,12 +33,12 @@ import java.util.Map; import java.util.Optional; import java.util.Properties; import java.util.Set; +import java.util.concurrent.Flow; import java.util.concurrent.ScheduledExecutorService; import java.util.function.Supplier; import io.helidon.common.Builder; import io.helidon.common.CollectionsHelper; -import io.helidon.common.reactive.Flow; import io.helidon.config.internal.ConfigUtils; import io.helidon.config.internal.MapConfigSource; import io.helidon.config.internal.PrefixedConfigSource; diff --git a/config/config/src/main/java/io/helidon/config/PollingStrategies.java b/config/config/src/main/java/io/helidon/config/PollingStrategies.java index 849679111..57401dab4 100644 --- a/config/config/src/main/java/io/helidon/config/PollingStrategies.java +++ b/config/config/src/main/java/io/helidon/config/PollingStrategies.java @@ -20,10 +20,10 @@ import java.nio.file.Path; import java.nio.file.WatchEvent.Modifier; import java.nio.file.WatchService; import java.time.Duration; +import java.util.concurrent.Flow; import java.util.concurrent.ScheduledExecutorService; import io.helidon.common.Builder; -import io.helidon.common.reactive.Flow; import io.helidon.config.internal.FilesystemWatchPollingStrategy; import io.helidon.config.internal.ScheduledPollingStrategy; import io.helidon.config.internal.ScheduledPollingStrategy.RegularRecurringPolicy; diff --git a/config/config/src/main/java/io/helidon/config/ProviderImpl.java b/config/config/src/main/java/io/helidon/config/ProviderImpl.java index 6a7a29863..1e050a761 100644 --- a/config/config/src/main/java/io/helidon/config/ProviderImpl.java +++ b/config/config/src/main/java/io/helidon/config/ProviderImpl.java @@ -26,13 +26,13 @@ import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Executor; +import java.util.concurrent.Flow; import java.util.function.Function; import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; import java.util.stream.Stream; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.SubmissionPublisher; import io.helidon.config.internal.ConfigKeyImpl; import io.helidon.config.internal.ConfigUtils; diff --git a/config/config/src/main/java/io/helidon/config/SuspendablePublisher.java b/config/config/src/main/java/io/helidon/config/SuspendablePublisher.java index 2a415910c..9281c8d92 100644 --- a/config/config/src/main/java/io/helidon/config/SuspendablePublisher.java +++ b/config/config/src/main/java/io/helidon/config/SuspendablePublisher.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,10 @@ package io.helidon.config; +import java.util.concurrent.Flow; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import io.helidon.common.reactive.Flow; - /** * Publisher with "suspended" and "running" behavior. *

diff --git a/config/config/src/main/java/io/helidon/config/UseFirstAvailableConfigSource.java b/config/config/src/main/java/io/helidon/config/UseFirstAvailableConfigSource.java index 581db27fa..e821c477b 100644 --- a/config/config/src/main/java/io/helidon/config/UseFirstAvailableConfigSource.java +++ b/config/config/src/main/java/io/helidon/config/UseFirstAvailableConfigSource.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ package io.helidon.config; import java.util.Arrays; import java.util.List; import java.util.Optional; +import java.util.concurrent.Flow; -import io.helidon.common.reactive.Flow; import io.helidon.config.spi.ConfigContext; import io.helidon.config.spi.ConfigNode.ObjectNode; import io.helidon.config.spi.ConfigSource; diff --git a/config/config/src/main/java/io/helidon/config/internal/FilesystemWatchPollingStrategy.java b/config/config/src/main/java/io/helidon/config/internal/FilesystemWatchPollingStrategy.java index a82766c9c..8df53863d 100644 --- a/config/config/src/main/java/io/helidon/config/internal/FilesystemWatchPollingStrategy.java +++ b/config/config/src/main/java/io/helidon/config/internal/FilesystemWatchPollingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,6 +28,7 @@ import java.util.LinkedList; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executors; +import java.util.concurrent.Flow; import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; @@ -35,7 +36,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import io.helidon.common.CollectionsHelper; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.SubmissionPublisher; import io.helidon.config.ConfigException; import io.helidon.config.ConfigHelper; diff --git a/config/config/src/main/java/io/helidon/config/internal/ScheduledPollingStrategy.java b/config/config/src/main/java/io/helidon/config/internal/ScheduledPollingStrategy.java index 1cb4241f1..a6de6e429 100644 --- a/config/config/src/main/java/io/helidon/config/internal/ScheduledPollingStrategy.java +++ b/config/config/src/main/java/io/helidon/config/internal/ScheduledPollingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ package io.helidon.config.internal; import java.time.Duration; import java.util.Objects; import java.util.concurrent.Executors; +import java.util.concurrent.Flow; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -27,7 +28,6 @@ import java.util.function.BiFunction; import java.util.logging.Level; import java.util.logging.Logger; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.SubmissionPublisher; import io.helidon.config.ConfigHelper; import io.helidon.config.spi.PollingStrategy; diff --git a/config/config/src/main/java/io/helidon/config/spi/AbstractConfigSource.java b/config/config/src/main/java/io/helidon/config/spi/AbstractConfigSource.java index b9e98fe89..8433e0357 100644 --- a/config/config/src/main/java/io/helidon/config/spi/AbstractConfigSource.java +++ b/config/config/src/main/java/io/helidon/config/spi/AbstractConfigSource.java @@ -21,11 +21,11 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.concurrent.Executor; +import java.util.concurrent.Flow; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; import io.helidon.common.OptionalHelper; -import io.helidon.common.reactive.Flow; import io.helidon.config.Config; import io.helidon.config.internal.ConfigKeyImpl; import io.helidon.config.internal.ListNodeBuilderImpl; diff --git a/config/config/src/main/java/io/helidon/config/spi/AbstractMpSource.java b/config/config/src/main/java/io/helidon/config/spi/AbstractMpSource.java index e933acbe0..6e4e7c785 100644 --- a/config/config/src/main/java/io/helidon/config/spi/AbstractMpSource.java +++ b/config/config/src/main/java/io/helidon/config/spi/AbstractMpSource.java @@ -21,10 +21,10 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.TreeMap; +import java.util.concurrent.Flow; import java.util.concurrent.atomic.AtomicReference; import io.helidon.common.CollectionsHelper; -import io.helidon.common.reactive.Flow; import org.eclipse.microprofile.config.spi.ConfigSource; diff --git a/config/config/src/main/java/io/helidon/config/spi/AbstractOverrideSource.java b/config/config/src/main/java/io/helidon/config/spi/AbstractOverrideSource.java index ef67f2b52..8da1a7125 100644 --- a/config/config/src/main/java/io/helidon/config/spi/AbstractOverrideSource.java +++ b/config/config/src/main/java/io/helidon/config/spi/AbstractOverrideSource.java @@ -17,8 +17,7 @@ package io.helidon.config.spi; import java.util.Optional; - -import io.helidon.common.reactive.Flow; +import java.util.concurrent.Flow; /** * Base abstract implementation of {@link OverrideSource}, suitable for concrete diff --git a/config/config/src/main/java/io/helidon/config/spi/AbstractSource.java b/config/config/src/main/java/io/helidon/config/spi/AbstractSource.java index 96590b2b4..1dd6dc247 100644 --- a/config/config/src/main/java/io/helidon/config/spi/AbstractSource.java +++ b/config/config/src/main/java/io/helidon/config/spi/AbstractSource.java @@ -20,12 +20,12 @@ import java.util.Objects; import java.util.Optional; import java.util.concurrent.Executor; import java.util.concurrent.Executors; +import java.util.concurrent.Flow; import java.util.function.Function; import java.util.function.Supplier; import java.util.logging.Level; import java.util.logging.Logger; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.SubmissionPublisher; import io.helidon.config.Config; import io.helidon.config.ConfigException; diff --git a/config/config/src/main/java/io/helidon/config/spi/Changeable.java b/config/config/src/main/java/io/helidon/config/spi/Changeable.java index 1faf9fbcd..6b1ce635c 100644 --- a/config/config/src/main/java/io/helidon/config/spi/Changeable.java +++ b/config/config/src/main/java/io/helidon/config/spi/Changeable.java @@ -17,8 +17,7 @@ package io.helidon.config.spi; import java.util.Optional; - -import io.helidon.common.reactive.Flow; +import java.util.concurrent.Flow; /** * A changeable component is a component that may identify a change diff --git a/config/config/src/main/java/io/helidon/config/spi/PollingStrategy.java b/config/config/src/main/java/io/helidon/config/spi/PollingStrategy.java index 8ec575719..c4f3425e6 100644 --- a/config/config/src/main/java/io/helidon/config/spi/PollingStrategy.java +++ b/config/config/src/main/java/io/helidon/config/spi/PollingStrategy.java @@ -19,9 +19,9 @@ package io.helidon.config.spi; import java.nio.file.Path; import java.time.Duration; import java.time.Instant; +import java.util.concurrent.Flow; import java.util.function.Supplier; -import io.helidon.common.reactive.Flow; import io.helidon.config.Config; import io.helidon.config.PollingStrategies; diff --git a/config/config/src/main/java/io/helidon/config/spi/Source.java b/config/config/src/main/java/io/helidon/config/spi/Source.java index 0528b76d3..ebebb6870 100644 --- a/config/config/src/main/java/io/helidon/config/spi/Source.java +++ b/config/config/src/main/java/io/helidon/config/spi/Source.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,8 +17,8 @@ package io.helidon.config.spi; import java.util.Optional; +import java.util.concurrent.Flow; -import io.helidon.common.reactive.Flow; import io.helidon.config.ConfigException; /** diff --git a/config/config/src/test/java/io/helidon/config/AbstractConfigImplTest.java b/config/config/src/test/java/io/helidon/config/AbstractConfigImplTest.java index 24265cdf1..d41b22739 100644 --- a/config/config/src/test/java/io/helidon/config/AbstractConfigImplTest.java +++ b/config/config/src/test/java/io/helidon/config/AbstractConfigImplTest.java @@ -19,12 +19,12 @@ package io.helidon.config; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.concurrent.Flow; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Stream; import io.helidon.common.GenericType; -import io.helidon.common.reactive.Flow; import io.helidon.config.internal.ConfigKeyImpl; import io.helidon.config.spi.ConfigFilter; import io.helidon.config.spi.ConfigNode; diff --git a/config/config/src/test/java/io/helidon/config/AbstractConfigImplTestBase.java b/config/config/src/test/java/io/helidon/config/AbstractConfigImplTestBase.java index fb9cc3fc3..19ce6b1d4 100644 --- a/config/config/src/test/java/io/helidon/config/AbstractConfigImplTestBase.java +++ b/config/config/src/test/java/io/helidon/config/AbstractConfigImplTestBase.java @@ -16,17 +16,18 @@ package io.helidon.config; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.Matchers.lessThan; - -import io.helidon.common.CollectionsHelper; -import org.junit.jupiter.api.Test; - import java.time.Instant; import java.util.List; import java.util.stream.Collectors; +import io.helidon.common.CollectionsHelper; + +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.lessThan; + /** * General tests of {@link Config} to be extended by test classes for missing, value, object and list node types. diff --git a/config/config/src/test/java/io/helidon/config/AssertingFilter.java b/config/config/src/test/java/io/helidon/config/AssertingFilter.java index 8423ba928..18af85c9b 100644 --- a/config/config/src/test/java/io/helidon/config/AssertingFilter.java +++ b/config/config/src/test/java/io/helidon/config/AssertingFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ import java.util.function.Supplier; import io.helidon.config.spi.ConfigFilter; import org.hamcrest.CoreMatchers; + import static org.hamcrest.MatcherAssert.assertThat; /** diff --git a/config/config/src/test/java/io/helidon/config/BuilderImplParsersTest.java b/config/config/src/test/java/io/helidon/config/BuilderImplParsersTest.java index 388b237f7..926cf4b70 100644 --- a/config/config/src/test/java/io/helidon/config/BuilderImplParsersTest.java +++ b/config/config/src/test/java/io/helidon/config/BuilderImplParsersTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,12 +25,13 @@ import io.helidon.config.internal.PropertiesConfigParser; import io.helidon.config.spi.ConfigNode.ObjectNode; import io.helidon.config.spi.ConfigParser; import io.helidon.config.spi.ConfigParserException; -import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/config/config/src/test/java/io/helidon/config/BuilderImplTest.java b/config/config/src/test/java/io/helidon/config/BuilderImplTest.java index cee106235..5a8bee5fd 100644 --- a/config/config/src/test/java/io/helidon/config/BuilderImplTest.java +++ b/config/config/src/test/java/io/helidon/config/BuilderImplTest.java @@ -17,9 +17,9 @@ package io.helidon.config; import java.util.concurrent.Executor; +import java.util.concurrent.Flow; import io.helidon.common.CollectionsHelper; -import io.helidon.common.reactive.Flow; import io.helidon.config.test.infra.RestoreSystemPropertiesExt; import org.junit.jupiter.api.Test; diff --git a/config/config/src/test/java/io/helidon/config/ClasspathConfigSourceTest.java b/config/config/src/test/java/io/helidon/config/ClasspathConfigSourceTest.java index a06c055c0..3db4140d9 100644 --- a/config/config/src/test/java/io/helidon/config/ClasspathConfigSourceTest.java +++ b/config/config/src/test/java/io/helidon/config/ClasspathConfigSourceTest.java @@ -22,8 +22,8 @@ import java.nio.file.Path; import java.util.HashSet; import java.util.Optional; import java.util.Set; +import java.util.concurrent.Flow; -import io.helidon.common.reactive.Flow; import io.helidon.config.ClasspathConfigSource.ClasspathBuilder; import io.helidon.config.spi.ConfigContext; import io.helidon.config.spi.ConfigNode.ObjectNode; diff --git a/config/config/src/test/java/io/helidon/config/ClasspathOverrideSourceTest.java b/config/config/src/test/java/io/helidon/config/ClasspathOverrideSourceTest.java index 79b83ffee..00a7167e6 100644 --- a/config/config/src/test/java/io/helidon/config/ClasspathOverrideSourceTest.java +++ b/config/config/src/test/java/io/helidon/config/ClasspathOverrideSourceTest.java @@ -19,8 +19,8 @@ package io.helidon.config; import java.net.URISyntaxException; import java.nio.file.Path; import java.util.Optional; +import java.util.concurrent.Flow; -import io.helidon.common.reactive.Flow; import io.helidon.config.ClasspathOverrideSource.ClasspathBuilder; import io.helidon.config.spi.OverrideSource; import io.helidon.config.spi.PollingStrategy; diff --git a/config/config/src/test/java/io/helidon/config/CompositeConfigSourceTest.java b/config/config/src/test/java/io/helidon/config/CompositeConfigSourceTest.java index 1e851aae0..9558966a0 100644 --- a/config/config/src/test/java/io/helidon/config/CompositeConfigSourceTest.java +++ b/config/config/src/test/java/io/helidon/config/CompositeConfigSourceTest.java @@ -22,12 +22,12 @@ import java.time.Duration; import java.time.Instant; import java.util.List; import java.util.Optional; +import java.util.concurrent.Flow; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import io.helidon.common.CollectionsHelper; -import io.helidon.common.reactive.Flow; import io.helidon.config.internal.PropertiesConfigParser; import io.helidon.config.spi.ConfigContext; import io.helidon.config.spi.ConfigNode.ObjectNode; diff --git a/config/config/src/test/java/io/helidon/config/ConfigDiffTest.java b/config/config/src/test/java/io/helidon/config/ConfigDiffTest.java index 257f8c259..5d6d3c9c5 100644 --- a/config/config/src/test/java/io/helidon/config/ConfigDiffTest.java +++ b/config/config/src/test/java/io/helidon/config/ConfigDiffTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,11 +21,12 @@ import java.util.stream.Collectors; import io.helidon.common.CollectionsHelper; +import org.junit.jupiter.api.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.empty; import static org.hamcrest.core.Is.is; -import org.junit.jupiter.api.Test; /** * Tests {@link ConfigDiff}. diff --git a/config/config/src/test/java/io/helidon/config/ConfigEmptyTest.java b/config/config/src/test/java/io/helidon/config/ConfigEmptyTest.java index b5958e223..95f45c14a 100644 --- a/config/config/src/test/java/io/helidon/config/ConfigEmptyTest.java +++ b/config/config/src/test/java/io/helidon/config/ConfigEmptyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,6 @@ import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; import static org.hamcrest.core.Is.is; -import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertThrows; /** diff --git a/config/config/src/test/java/io/helidon/config/ConfigHelperTest.java b/config/config/src/test/java/io/helidon/config/ConfigHelperTest.java index 2f538388a..8d9397f45 100644 --- a/config/config/src/test/java/io/helidon/config/ConfigHelperTest.java +++ b/config/config/src/test/java/io/helidon/config/ConfigHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,13 +19,13 @@ package io.helidon.config; import java.io.IOException; import java.io.StringReader; import java.nio.CharBuffer; +import java.util.concurrent.Flow; import java.util.function.Function; -import io.helidon.common.reactive.Flow; +import org.junit.jupiter.api.Test; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import org.junit.jupiter.api.Test; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/config/config/src/test/java/io/helidon/config/ConfigParsersTest.java b/config/config/src/test/java/io/helidon/config/ConfigParsersTest.java index 9153f4877..ae9e7e578 100644 --- a/config/config/src/test/java/io/helidon/config/ConfigParsersTest.java +++ b/config/config/src/test/java/io/helidon/config/ConfigParsersTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,11 +17,12 @@ package io.helidon.config; import io.helidon.config.internal.PropertiesConfigParser; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.instanceOf; import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.instanceOf; + /** * Tests {@link ConfigParsers}. */ diff --git a/config/config/src/test/java/io/helidon/config/ConfigSourcePollingTest.java b/config/config/src/test/java/io/helidon/config/ConfigSourcePollingTest.java index 38ed44652..b731c8a19 100644 --- a/config/config/src/test/java/io/helidon/config/ConfigSourcePollingTest.java +++ b/config/config/src/test/java/io/helidon/config/ConfigSourcePollingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,10 +18,10 @@ package io.helidon.config; import java.util.Optional; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Flow; import java.util.concurrent.TimeUnit; import java.util.stream.IntStream; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.SubmissionPublisher; import io.helidon.config.spi.ConfigContext; import io.helidon.config.spi.ConfigNode.ObjectNode; diff --git a/config/config/src/test/java/io/helidon/config/FileConfigSourceTest.java b/config/config/src/test/java/io/helidon/config/FileConfigSourceTest.java index aca3b2b0a..c5b3f7897 100644 --- a/config/config/src/test/java/io/helidon/config/FileConfigSourceTest.java +++ b/config/config/src/test/java/io/helidon/config/FileConfigSourceTest.java @@ -25,9 +25,9 @@ import java.util.HashSet; import java.util.Optional; import java.util.Set; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Flow; import java.util.concurrent.TimeUnit; -import io.helidon.common.reactive.Flow; import io.helidon.config.FileConfigSource.FileBuilder; import io.helidon.config.spi.ConfigContext; import io.helidon.config.spi.ConfigNode.ObjectNode; diff --git a/config/config/src/test/java/io/helidon/config/ListenerTest.java b/config/config/src/test/java/io/helidon/config/ListenerTest.java index 7b93e89fb..a30109baf 100644 --- a/config/config/src/test/java/io/helidon/config/ListenerTest.java +++ b/config/config/src/test/java/io/helidon/config/ListenerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ package io.helidon.config; -import io.helidon.common.reactive.Flow; +import java.util.concurrent.Flow; import org.junit.jupiter.api.Test; diff --git a/config/config/src/test/java/io/helidon/config/PollingStrategiesTest.java b/config/config/src/test/java/io/helidon/config/PollingStrategiesTest.java index f4dd8d16a..7bcc6ff6c 100644 --- a/config/config/src/test/java/io/helidon/config/PollingStrategiesTest.java +++ b/config/config/src/test/java/io/helidon/config/PollingStrategiesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,16 +16,17 @@ package io.helidon.config; -import io.helidon.common.reactive.Flow; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Flow; import java.util.concurrent.TimeUnit; import io.helidon.config.spi.PollingStrategy; +import org.junit.jupiter.api.Test; + import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import org.junit.jupiter.api.Test; /** * Tests {@link PollingStrategies}. diff --git a/config/config/src/test/java/io/helidon/config/TestingConfigChangeSubscriber.java b/config/config/src/test/java/io/helidon/config/TestingConfigChangeSubscriber.java index 4caeecbbb..88bcdc559 100644 --- a/config/config/src/test/java/io/helidon/config/TestingConfigChangeSubscriber.java +++ b/config/config/src/test/java/io/helidon/config/TestingConfigChangeSubscriber.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package io.helidon.config; /** - * Testing implementation of {@link io.helidon.common.reactive.Flow.Subscriber} on {@link Config#changes()} events. + * Testing implementation of {@link java.util.concurrent.Flow.Subscriber} on {@link Config#changes()} events. */ public class TestingConfigChangeSubscriber extends TestingSubscriber { } diff --git a/config/config/src/test/java/io/helidon/config/TestingConfigSourceChangeSubscriber.java b/config/config/src/test/java/io/helidon/config/TestingConfigSourceChangeSubscriber.java index c89b63b9d..5eecc530c 100644 --- a/config/config/src/test/java/io/helidon/config/TestingConfigSourceChangeSubscriber.java +++ b/config/config/src/test/java/io/helidon/config/TestingConfigSourceChangeSubscriber.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import io.helidon.config.spi.ConfigNode.ObjectNode; import io.helidon.config.spi.ConfigSource; /** - * Testing implementation of {@link io.helidon.common.reactive.Flow.Subscriber} on {@link ConfigSource#changes()} events. + * Testing implementation of {@link java.util.concurrent.Flow.Subscriber} on {@link ConfigSource#changes()} events. */ public class TestingConfigSourceChangeSubscriber extends TestingSubscriber> { } diff --git a/config/config/src/test/java/io/helidon/config/TestingPollingStrategy.java b/config/config/src/test/java/io/helidon/config/TestingPollingStrategy.java index 55e1b2fbb..1a9067d8d 100644 --- a/config/config/src/test/java/io/helidon/config/TestingPollingStrategy.java +++ b/config/config/src/test/java/io/helidon/config/TestingPollingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,9 +17,9 @@ package io.helidon.config; import java.time.Instant; +import java.util.concurrent.Flow; import java.util.concurrent.ForkJoinPool; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.SubmissionPublisher; import io.helidon.config.spi.PollingStrategy; diff --git a/config/config/src/test/java/io/helidon/config/TestingSubscriber.java b/config/config/src/test/java/io/helidon/config/TestingSubscriber.java index d8eee3e86..6b7cc5019 100644 --- a/config/config/src/test/java/io/helidon/config/TestingSubscriber.java +++ b/config/config/src/test/java/io/helidon/config/TestingSubscriber.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,10 +17,9 @@ package io.helidon.config; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Flow; import java.util.concurrent.TimeUnit; -import io.helidon.common.reactive.Flow; - import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; diff --git a/config/config/src/test/java/io/helidon/config/UrlConfigSourceTest.java b/config/config/src/test/java/io/helidon/config/UrlConfigSourceTest.java index 4a90630c2..d6614f4dc 100644 --- a/config/config/src/test/java/io/helidon/config/UrlConfigSourceTest.java +++ b/config/config/src/test/java/io/helidon/config/UrlConfigSourceTest.java @@ -19,8 +19,8 @@ package io.helidon.config; import java.net.MalformedURLException; import java.net.URL; import java.time.Duration; +import java.util.concurrent.Flow; -import io.helidon.common.reactive.Flow; import io.helidon.config.UrlConfigSource.UrlBuilder; import io.helidon.config.spi.ConfigContext; import io.helidon.config.spi.ConfigSource; diff --git a/config/config/src/test/java/io/helidon/config/UseFirstAvailableConfigSourceTest.java b/config/config/src/test/java/io/helidon/config/UseFirstAvailableConfigSourceTest.java index 01fbf351d..33ee7d1cf 100644 --- a/config/config/src/test/java/io/helidon/config/UseFirstAvailableConfigSourceTest.java +++ b/config/config/src/test/java/io/helidon/config/UseFirstAvailableConfigSourceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,11 +20,12 @@ import java.util.Optional; import io.helidon.common.CollectionsHelper; import io.helidon.config.spi.ConfigContext; -import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.stringContainsInOrder; -import org.junit.jupiter.api.Test; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/config/config/src/test/java/io/helidon/config/internal/AdaptiveRecurringPolicyTest.java b/config/config/src/test/java/io/helidon/config/internal/AdaptiveRecurringPolicyTest.java index cbbfbfb68..518b3d0e6 100644 --- a/config/config/src/test/java/io/helidon/config/internal/AdaptiveRecurringPolicyTest.java +++ b/config/config/src/test/java/io/helidon/config/internal/AdaptiveRecurringPolicyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,11 +17,12 @@ package io.helidon.config.internal; import java.time.Duration; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; + /** * Tests {@link ScheduledPollingStrategy.AdaptiveRecurringPolicy} */ diff --git a/config/config/src/test/java/io/helidon/config/internal/ConfigFileTypeDetectorTest.java b/config/config/src/test/java/io/helidon/config/internal/ConfigFileTypeDetectorTest.java index 0c20f27f0..d3f529c87 100644 --- a/config/config/src/test/java/io/helidon/config/internal/ConfigFileTypeDetectorTest.java +++ b/config/config/src/test/java/io/helidon/config/internal/ConfigFileTypeDetectorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,10 +19,11 @@ package io.helidon.config.internal; import java.nio.file.Paths; import io.helidon.config.ConfigHelper; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; /** * Tests {@link ConfigFileTypeDetector}. */ diff --git a/config/config/src/test/java/io/helidon/config/internal/ConfigKeyImplTest.java b/config/config/src/test/java/io/helidon/config/internal/ConfigKeyImplTest.java index 233b3bd4d..9f24d8d9d 100644 --- a/config/config/src/test/java/io/helidon/config/internal/ConfigKeyImplTest.java +++ b/config/config/src/test/java/io/helidon/config/internal/ConfigKeyImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,13 +19,14 @@ package io.helidon.config.internal; import io.helidon.config.Config; import org.hamcrest.Matcher; +import org.junit.jupiter.api.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -import org.junit.jupiter.api.Test; /** * Tests {@link ConfigKeyImpl}. */ diff --git a/config/config/src/test/java/io/helidon/config/internal/ConfigUtilsTest.java b/config/config/src/test/java/io/helidon/config/internal/ConfigUtilsTest.java index 3e031ce16..40ce8749d 100644 --- a/config/config/src/test/java/io/helidon/config/internal/ConfigUtilsTest.java +++ b/config/config/src/test/java/io/helidon/config/internal/ConfigUtilsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,14 +28,14 @@ import java.util.stream.Collectors; import javax.annotation.Priority; import io.helidon.config.internal.ConfigUtils.ScheduledTask; -import static org.hamcrest.MatcherAssert.assertThat; import org.hamcrest.Matchers; import org.hamcrest.core.IsInstanceOf; +import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import org.junit.jupiter.api.Test; /** * Tests {@link ConfigUtils}. diff --git a/config/config/src/test/java/io/helidon/config/internal/FileOverrideSourceTest.java b/config/config/src/test/java/io/helidon/config/internal/FileOverrideSourceTest.java index 04ea604f0..c53e0c434 100644 --- a/config/config/src/test/java/io/helidon/config/internal/FileOverrideSourceTest.java +++ b/config/config/src/test/java/io/helidon/config/internal/FileOverrideSourceTest.java @@ -16,14 +16,13 @@ package io.helidon.config.internal; -import java.io.File; import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; import java.time.Instant; import java.util.Optional; +import java.util.concurrent.Flow; -import io.helidon.common.reactive.Flow; import io.helidon.config.ConfigException; import io.helidon.config.OverrideSources; import io.helidon.config.internal.FileOverrideSource.FileBuilder; diff --git a/config/config/src/test/java/io/helidon/config/internal/FileSourceHelperTest.java b/config/config/src/test/java/io/helidon/config/internal/FileSourceHelperTest.java index fb5d543ae..4dd4d8f0e 100644 --- a/config/config/src/test/java/io/helidon/config/internal/FileSourceHelperTest.java +++ b/config/config/src/test/java/io/helidon/config/internal/FileSourceHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,15 +16,17 @@ package io.helidon.config.internal; -import io.helidon.config.test.infra.TemporaryFolderExt; import java.io.File; import java.nio.file.Files; +import io.helidon.config.test.infra.TemporaryFolderExt; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.not; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; /** * Tests {@link FileSourceHelper}. diff --git a/config/config/src/test/java/io/helidon/config/internal/FilesystemWatchPollingStrategyTest.java b/config/config/src/test/java/io/helidon/config/internal/FilesystemWatchPollingStrategyTest.java index 123ebadc6..9020157e3 100644 --- a/config/config/src/test/java/io/helidon/config/internal/FilesystemWatchPollingStrategyTest.java +++ b/config/config/src/test/java/io/helidon/config/internal/FilesystemWatchPollingStrategyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,10 +24,10 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.UUID; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Flow; import java.util.concurrent.TimeUnit; import io.helidon.common.CollectionsHelper; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.SubmissionPublisher; import io.helidon.config.spi.PollingStrategy; import io.helidon.config.test.infra.TemporaryFolderExt; diff --git a/config/config/src/test/java/io/helidon/config/internal/OverrideConfigFilterTest.java b/config/config/src/test/java/io/helidon/config/internal/OverrideConfigFilterTest.java index 49ba7dbb4..1135ec2fd 100644 --- a/config/config/src/test/java/io/helidon/config/internal/OverrideConfigFilterTest.java +++ b/config/config/src/test/java/io/helidon/config/internal/OverrideConfigFilterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,10 +24,11 @@ import io.helidon.common.CollectionsHelper; import io.helidon.config.Config; import io.helidon.config.spi.OverrideSource; +import org.junit.jupiter.api.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.core.Is.is; -import org.junit.jupiter.api.Test; /** * Tests {@link OverrideConfigFilter}. diff --git a/config/config/src/test/java/io/helidon/config/internal/OverrideSourcesTest.java b/config/config/src/test/java/io/helidon/config/internal/OverrideSourcesTest.java index 26b22007d..0e63dd5da 100644 --- a/config/config/src/test/java/io/helidon/config/internal/OverrideSourcesTest.java +++ b/config/config/src/test/java/io/helidon/config/internal/OverrideSourcesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,11 +24,12 @@ import io.helidon.config.Config; import io.helidon.config.OverrideSources; import io.helidon.config.spi.OverrideSource; +import org.junit.jupiter.api.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.sameInstance; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import org.junit.jupiter.api.Test; /** * Tests {@link OverrideSources}. diff --git a/config/config/src/test/java/io/helidon/config/internal/ScheduledPollingStrategyTest.java b/config/config/src/test/java/io/helidon/config/internal/ScheduledPollingStrategyTest.java index f20f799b3..204aac41c 100644 --- a/config/config/src/test/java/io/helidon/config/internal/ScheduledPollingStrategyTest.java +++ b/config/config/src/test/java/io/helidon/config/internal/ScheduledPollingStrategyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,10 +19,10 @@ package io.helidon.config.internal; import java.time.Duration; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executors; +import java.util.concurrent.Flow; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import io.helidon.common.reactive.Flow; import io.helidon.config.spi.PollingStrategy.PollingEvent; import org.junit.jupiter.api.Test; diff --git a/config/config/src/test/java/io/helidon/config/internal/UrlOverrideSourceTest.java b/config/config/src/test/java/io/helidon/config/internal/UrlOverrideSourceTest.java index 56a11f6b6..75f75407c 100644 --- a/config/config/src/test/java/io/helidon/config/internal/UrlOverrideSourceTest.java +++ b/config/config/src/test/java/io/helidon/config/internal/UrlOverrideSourceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,8 +18,8 @@ package io.helidon.config.internal; import java.net.MalformedURLException; import java.net.URL; +import java.util.concurrent.Flow; -import io.helidon.common.reactive.Flow; import io.helidon.config.ConfigException; import io.helidon.config.OverrideSources; import io.helidon.config.spi.OverrideSource; diff --git a/config/config/src/test/java/io/helidon/config/spi/AbstractConfigSourceTest.java b/config/config/src/test/java/io/helidon/config/spi/AbstractConfigSourceTest.java index 26b6e699c..9b1acc0e4 100644 --- a/config/config/src/test/java/io/helidon/config/spi/AbstractConfigSourceTest.java +++ b/config/config/src/test/java/io/helidon/config/spi/AbstractConfigSourceTest.java @@ -19,23 +19,22 @@ package io.helidon.config.spi; import java.util.Optional; import java.util.Set; import java.util.concurrent.Executor; +import java.util.concurrent.Flow; import io.helidon.common.CollectionsHelper; -import io.helidon.common.reactive.Flow; import io.helidon.config.Config; import io.helidon.config.ConfigParsers; import io.helidon.config.ConfigSources; import io.helidon.config.spi.ConfigNode.ObjectNode; +import org.junit.jupiter.api.Test; + import static io.helidon.config.ValueNodeMatcher.valueNode; import static io.helidon.config.internal.PropertiesConfigParser.MEDIA_TYPE_TEXT_JAVA_PROPERTIES; import static io.helidon.config.spi.AbstractSource.Builder.DEFAULT_CHANGES_EXECUTOR; import static org.hamcrest.MatcherAssert.assertThat; - import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.Matchers.sameInstance; -import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/config/config/src/test/java/io/helidon/config/spi/AbstractOverrideSourceTest.java b/config/config/src/test/java/io/helidon/config/spi/AbstractOverrideSourceTest.java index fd1f1acfd..f799ca244 100644 --- a/config/config/src/test/java/io/helidon/config/spi/AbstractOverrideSourceTest.java +++ b/config/config/src/test/java/io/helidon/config/spi/AbstractOverrideSourceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,14 +18,15 @@ package io.helidon.config.spi; import java.time.Instant; import java.util.Optional; +import java.util.concurrent.Flow; -import io.helidon.common.reactive.Flow; import io.helidon.config.ConfigException; import io.helidon.config.PollingStrategies; +import org.junit.jupiter.api.Test; + import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import org.junit.jupiter.api.Test; /** * Tests {@link AbstractOverrideSource}. diff --git a/config/config/src/test/java/io/helidon/config/spi/AbstractParsableConfigSourceTest.java b/config/config/src/test/java/io/helidon/config/spi/AbstractParsableConfigSourceTest.java index 96d66e332..c3f662c0f 100644 --- a/config/config/src/test/java/io/helidon/config/spi/AbstractParsableConfigSourceTest.java +++ b/config/config/src/test/java/io/helidon/config/spi/AbstractParsableConfigSourceTest.java @@ -21,11 +21,11 @@ import java.io.StringReader; import java.time.Instant; import java.util.Optional; import java.util.concurrent.Executor; +import java.util.concurrent.Flow; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import io.helidon.common.CollectionsHelper; -import io.helidon.common.reactive.Flow; import io.helidon.config.Config; import io.helidon.config.ConfigException; import io.helidon.config.ConfigParsers; diff --git a/config/config/src/test/java/io/helidon/config/spi/AbstractSourceTest.java b/config/config/src/test/java/io/helidon/config/spi/AbstractSourceTest.java index c356cda58..b42586ac0 100644 --- a/config/config/src/test/java/io/helidon/config/spi/AbstractSourceTest.java +++ b/config/config/src/test/java/io/helidon/config/spi/AbstractSourceTest.java @@ -19,11 +19,11 @@ package io.helidon.config.spi; import java.time.Instant; import java.util.Optional; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Flow; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import io.helidon.common.CollectionsHelper; -import io.helidon.common.reactive.Flow; import io.helidon.config.Config; import io.helidon.config.ConfigException; import io.helidon.config.ConfigSources; diff --git a/config/config/src/test/java/io/helidon/config/spi/ConfigSourceTest.java b/config/config/src/test/java/io/helidon/config/spi/ConfigSourceTest.java index 4980cf66f..19598e32d 100644 --- a/config/config/src/test/java/io/helidon/config/spi/ConfigSourceTest.java +++ b/config/config/src/test/java/io/helidon/config/spi/ConfigSourceTest.java @@ -19,9 +19,9 @@ package io.helidon.config.spi; import java.io.StringReader; import java.util.Optional; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Flow; import java.util.concurrent.TimeUnit; -import io.helidon.common.reactive.Flow; import io.helidon.config.ConfigParsers; import io.helidon.config.ConfigSources; import io.helidon.config.ValueNodeMatcher; diff --git a/config/config/src/test/java/io/helidon/config/spi/OverrideSourceTest.java b/config/config/src/test/java/io/helidon/config/spi/OverrideSourceTest.java index 9f0ba4df5..11fb26a3e 100644 --- a/config/config/src/test/java/io/helidon/config/spi/OverrideSourceTest.java +++ b/config/config/src/test/java/io/helidon/config/spi/OverrideSourceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,11 +20,12 @@ import java.io.IOException; import java.io.StringReader; import java.util.LinkedHashMap; +import org.junit.jupiter.api.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import org.junit.jupiter.api.Test; /** * Tests {@link OverrideSource}. diff --git a/config/config/src/test/java/io/helidon/config/spi/PollingStrategyTest.java b/config/config/src/test/java/io/helidon/config/spi/PollingStrategyTest.java index 66219ee2e..50f664a97 100644 --- a/config/config/src/test/java/io/helidon/config/spi/PollingStrategyTest.java +++ b/config/config/src/test/java/io/helidon/config/spi/PollingStrategyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,17 +17,17 @@ package io.helidon.config.spi; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Flow; import java.util.concurrent.TimeUnit; import java.util.stream.IntStream; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.SubmissionPublisher; -import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.fail; -import org.junit.jupiter.api.Test; /** * Tests {@link io.helidon.config.spi.PollingStrategy}. diff --git a/config/config/src/test/java/io/helidon/config/spi/RetryPoliciesTest.java b/config/config/src/test/java/io/helidon/config/spi/RetryPoliciesTest.java index feff0c055..a089072ff 100644 --- a/config/config/src/test/java/io/helidon/config/spi/RetryPoliciesTest.java +++ b/config/config/src/test/java/io/helidon/config/spi/RetryPoliciesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,11 +25,12 @@ import java.util.function.Supplier; import io.helidon.config.ConfigException; import io.helidon.config.RetryPolicies; -import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.jupiter.api.Test; /** * Tests {@link RetryPolicies}. diff --git a/config/config/src/test/java/io/helidon/config/spi/SourceTest.java b/config/config/src/test/java/io/helidon/config/spi/SourceTest.java index 6d3faa854..9c189887f 100644 --- a/config/config/src/test/java/io/helidon/config/spi/SourceTest.java +++ b/config/config/src/test/java/io/helidon/config/spi/SourceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,9 +20,10 @@ import java.util.Optional; import io.helidon.config.ConfigException; +import org.junit.jupiter.api.Test; + import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.jupiter.api.Test; /** * Tests default methods of {@link Source}. diff --git a/config/encryption/src/test/java/io/helidon/config/encryption/EncryptionUtilTest.java b/config/encryption/src/test/java/io/helidon/config/encryption/EncryptionUtilTest.java index d7f3c1ee3..16c86d0e1 100644 --- a/config/encryption/src/test/java/io/helidon/config/encryption/EncryptionUtilTest.java +++ b/config/encryption/src/test/java/io/helidon/config/encryption/EncryptionUtilTest.java @@ -18,7 +18,6 @@ package io.helidon.config.encryption; import java.nio.charset.StandardCharsets; import java.security.InvalidKeyException; -import java.security.Key; import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.NoSuchAlgorithmException; @@ -38,7 +37,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.fail; /** diff --git a/config/etcd/src/main/java/io/helidon/config/etcd/EtcdWatchPollingStrategy.java b/config/etcd/src/main/java/io/helidon/config/etcd/EtcdWatchPollingStrategy.java index 60860c763..bffb5320a 100644 --- a/config/etcd/src/main/java/io/helidon/config/etcd/EtcdWatchPollingStrategy.java +++ b/config/etcd/src/main/java/io/helidon/config/etcd/EtcdWatchPollingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,10 +17,10 @@ package io.helidon.config.etcd; import java.time.Instant; +import java.util.concurrent.Flow; import java.util.logging.Level; import java.util.logging.Logger; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.SubmissionPublisher; import io.helidon.config.ConfigException; import io.helidon.config.ConfigHelper; diff --git a/config/etcd/src/main/java/io/helidon/config/etcd/internal/client/EtcdClient.java b/config/etcd/src/main/java/io/helidon/config/etcd/internal/client/EtcdClient.java index a12de102d..d5fee31fc 100644 --- a/config/etcd/src/main/java/io/helidon/config/etcd/internal/client/EtcdClient.java +++ b/config/etcd/src/main/java/io/helidon/config/etcd/internal/client/EtcdClient.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,8 +17,7 @@ package io.helidon.config.etcd.internal.client; import java.util.concurrent.Executor; - -import io.helidon.common.reactive.Flow; +import java.util.concurrent.Flow; /** * Etcd client interface provides basic get operation. diff --git a/config/etcd/src/main/java/io/helidon/config/etcd/internal/client/v2/EtcdV2Client.java b/config/etcd/src/main/java/io/helidon/config/etcd/internal/client/v2/EtcdV2Client.java index 0cc2085e1..a6c889963 100644 --- a/config/etcd/src/main/java/io/helidon/config/etcd/internal/client/v2/EtcdV2Client.java +++ b/config/etcd/src/main/java/io/helidon/config/etcd/internal/client/v2/EtcdV2Client.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,12 +21,12 @@ import java.net.URI; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; +import java.util.concurrent.Flow; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.logging.Level; import java.util.logging.Logger; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.SubmissionPublisher; import io.helidon.config.etcd.internal.client.EtcdClient; import io.helidon.config.etcd.internal.client.EtcdClientException; diff --git a/config/etcd/src/main/java/io/helidon/config/etcd/internal/client/v3/EtcdV3Client.java b/config/etcd/src/main/java/io/helidon/config/etcd/internal/client/v3/EtcdV3Client.java index 1135d2ed8..c526abdc7 100644 --- a/config/etcd/src/main/java/io/helidon/config/etcd/internal/client/v3/EtcdV3Client.java +++ b/config/etcd/src/main/java/io/helidon/config/etcd/internal/client/v3/EtcdV3Client.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,11 +20,11 @@ import java.net.URI; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; +import java.util.concurrent.Flow; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.SubmissionPublisher; import io.helidon.config.etcd.internal.client.EtcdClient; import io.helidon.config.etcd.internal.client.EtcdClientException; diff --git a/config/etcd/src/test/java/io/helidon/config/etcd/EtcdConfigSourceBuilderTest.java b/config/etcd/src/test/java/io/helidon/config/etcd/EtcdConfigSourceBuilderTest.java index a2d490e69..e87a3190c 100644 --- a/config/etcd/src/test/java/io/helidon/config/etcd/EtcdConfigSourceBuilderTest.java +++ b/config/etcd/src/test/java/io/helidon/config/etcd/EtcdConfigSourceBuilderTest.java @@ -18,10 +18,10 @@ package io.helidon.config.etcd; import java.net.URI; import java.util.Set; +import java.util.concurrent.Flow; import java.util.function.Function; import io.helidon.common.CollectionsHelper; -import io.helidon.common.reactive.Flow; import io.helidon.config.Config; import io.helidon.config.ConfigParsers; import io.helidon.config.ConfigSources; diff --git a/config/etcd/src/test/java/io/helidon/config/etcd/EtcdConfigSourceIT.java b/config/etcd/src/test/java/io/helidon/config/etcd/EtcdConfigSourceIT.java index 08fed4867..bc5616897 100644 --- a/config/etcd/src/test/java/io/helidon/config/etcd/EtcdConfigSourceIT.java +++ b/config/etcd/src/test/java/io/helidon/config/etcd/EtcdConfigSourceIT.java @@ -21,9 +21,9 @@ import java.net.URI; import java.nio.charset.Charset; import java.nio.file.Files; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Flow; import java.util.concurrent.TimeUnit; -import io.helidon.common.reactive.Flow; import io.helidon.config.Config; import io.helidon.config.etcd.EtcdConfigSourceBuilder.EtcdApi; import io.helidon.config.etcd.internal.client.EtcdClient; diff --git a/config/etcd/src/test/java/io/helidon/config/etcd/EtcdWatchPollingStrategyTest.java b/config/etcd/src/test/java/io/helidon/config/etcd/EtcdWatchPollingStrategyTest.java index 8197000a5..be17e62e0 100644 --- a/config/etcd/src/test/java/io/helidon/config/etcd/EtcdWatchPollingStrategyTest.java +++ b/config/etcd/src/test/java/io/helidon/config/etcd/EtcdWatchPollingStrategyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,9 @@ package io.helidon.config.etcd; -import io.helidon.common.reactive.Flow; import java.net.URI; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Flow; import java.util.concurrent.TimeUnit; import io.helidon.config.etcd.EtcdConfigSourceBuilder.EtcdApi; @@ -27,10 +27,10 @@ import io.helidon.config.etcd.client.MockEtcdClient; import io.helidon.config.etcd.internal.client.EtcdClient; import io.helidon.config.etcd.internal.client.EtcdClientException; import io.helidon.config.spi.PollingStrategy.PollingEvent; -import static org.hamcrest.MatcherAssert.assertThat; import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; /** diff --git a/config/etcd/src/test/java/io/helidon/config/etcd/client/EtcdClientIT.java b/config/etcd/src/test/java/io/helidon/config/etcd/client/EtcdClientIT.java index 9b0c9cdec..063ef67fe 100644 --- a/config/etcd/src/test/java/io/helidon/config/etcd/client/EtcdClientIT.java +++ b/config/etcd/src/test/java/io/helidon/config/etcd/client/EtcdClientIT.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,11 +21,11 @@ import java.net.URI; import java.util.Random; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Flow; import java.util.concurrent.TimeUnit; import java.util.stream.Stream; import io.helidon.common.CollectionsHelper; -import io.helidon.common.reactive.Flow; import io.helidon.config.etcd.internal.client.EtcdClient; import io.helidon.config.etcd.internal.client.EtcdClientException; import io.helidon.config.etcd.internal.client.v2.EtcdV2Client; diff --git a/config/etcd/src/test/java/io/helidon/config/etcd/client/MockEtcdClient.java b/config/etcd/src/test/java/io/helidon/config/etcd/client/MockEtcdClient.java index 1f9e8c34d..ca32a1b6b 100644 --- a/config/etcd/src/test/java/io/helidon/config/etcd/client/MockEtcdClient.java +++ b/config/etcd/src/test/java/io/helidon/config/etcd/client/MockEtcdClient.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,9 +22,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.Flow; import java.util.concurrent.atomic.AtomicLong; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.SubmissionPublisher; import io.helidon.config.etcd.internal.client.EtcdClient; import io.helidon.config.etcd.internal.client.EtcdClientException; diff --git a/config/git/src/test/java/io/helidon/config/git/GitConfigSourceBuilderTest.java b/config/git/src/test/java/io/helidon/config/git/GitConfigSourceBuilderTest.java index b029c2729..c6bca2e07 100644 --- a/config/git/src/test/java/io/helidon/config/git/GitConfigSourceBuilderTest.java +++ b/config/git/src/test/java/io/helidon/config/git/GitConfigSourceBuilderTest.java @@ -25,11 +25,11 @@ import java.time.Duration; import java.util.Optional; import java.util.Set; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Flow; import java.util.concurrent.TimeUnit; import java.util.function.Function; import io.helidon.common.CollectionsHelper; -import io.helidon.common.reactive.Flow; import io.helidon.config.Config; import io.helidon.config.ConfigException; import io.helidon.config.ConfigParsers; diff --git a/config/tests/integration-tests/src/test/java/io/helidon/config/tests/AbstractComplexConfigTest.java b/config/tests/integration-tests/src/test/java/io/helidon/config/tests/AbstractComplexConfigTest.java index a27e4d454..ef917da01 100644 --- a/config/tests/integration-tests/src/test/java/io/helidon/config/tests/AbstractComplexConfigTest.java +++ b/config/tests/integration-tests/src/test/java/io/helidon/config/tests/AbstractComplexConfigTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,6 @@ import io.helidon.config.Config; import io.helidon.config.ConfigMappers; import io.helidon.config.ConfigSources; import io.helidon.config.ConfigValue; -import io.helidon.config.ConfigValues; import io.helidon.config.spi.ConfigParser; import org.junit.jupiter.api.Test; diff --git a/config/tests/test-mappers-1-common/src/test/java/io/helidon/config/tests/mappers1/MapperServicesEnabledTest.java b/config/tests/test-mappers-1-common/src/test/java/io/helidon/config/tests/mappers1/MapperServicesEnabledTest.java index 8ece6acf5..a6cc3067d 100644 --- a/config/tests/test-mappers-1-common/src/test/java/io/helidon/config/tests/mappers1/MapperServicesEnabledTest.java +++ b/config/tests/test-mappers-1-common/src/test/java/io/helidon/config/tests/mappers1/MapperServicesEnabledTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,11 +17,12 @@ package io.helidon.config.tests.mappers1; import java.util.Locale; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + /** * Tests ConfigMapper implementations loaded automatically from {@code module-mappers-1-base} module on path. */ diff --git a/config/tests/test-mappers-2-complex/src/test/java/io/helidon/config/tests/mappers2/MapperServicesEnabledTest.java b/config/tests/test-mappers-2-complex/src/test/java/io/helidon/config/tests/mappers2/MapperServicesEnabledTest.java index 104d8bd52..7ed12a438 100644 --- a/config/tests/test-mappers-2-complex/src/test/java/io/helidon/config/tests/mappers2/MapperServicesEnabledTest.java +++ b/config/tests/test-mappers-2-complex/src/test/java/io/helidon/config/tests/mappers2/MapperServicesEnabledTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,11 +17,12 @@ package io.helidon.config.tests.mappers2; import java.util.Locale; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + /** * Tests ConfigMapper implementations loaded automatically from {@code module-mappers-1-base} * as well as {@code module-mappers-2-override} modules on path. diff --git a/config/yaml/src/test/java/io/helidon/config/yaml/internal/YamlFileTypeDetectorTest.java b/config/yaml/src/test/java/io/helidon/config/yaml/internal/YamlFileTypeDetectorTest.java index c39327561..61c8eb973 100644 --- a/config/yaml/src/test/java/io/helidon/config/yaml/internal/YamlFileTypeDetectorTest.java +++ b/config/yaml/src/test/java/io/helidon/config/yaml/internal/YamlFileTypeDetectorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,11 +20,12 @@ import java.io.IOException; import java.nio.file.Paths; import io.helidon.config.ConfigHelper; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + /** * Tests {@link YamlFileTypeDetector}. */ diff --git a/docs/src/main/docs/images/helidon_logo_dark.svg b/docs/src/main/docs/images/helidon_logo_dark.svg index 60215440e..519f2ed08 100644 --- a/docs/src/main/docs/images/helidon_logo_dark.svg +++ b/docs/src/main/docs/images/helidon_logo_dark.svg @@ -1,19 +1,18 @@ + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="595.99438" + height="681.41913" + viewBox="0 0 157.69018 180.29215" + version="1.1" + id="svg8" + sodipodi:docname="helidon_logo_dark.svg" + inkscape:version="0.92.1 r"> - * It is also possible to register filters which can modify original {@link io.helidon.common.reactive.Flow Flow} of + * It is also possible to register filters which can modify original {@link java.util.concurrent.Flow Flow} of * {@link DataChunk RequestChunks}. */ public void filterAndProcessEntity() { diff --git a/examples/webserver/jersey/src/test/java/io/helidon/webserver/examples/jersey/HelloWorldTest.java b/examples/webserver/jersey/src/test/java/io/helidon/webserver/examples/jersey/HelloWorldTest.java index ef1ba2145..b4f21ddba 100644 --- a/examples/webserver/jersey/src/test/java/io/helidon/webserver/examples/jersey/HelloWorldTest.java +++ b/examples/webserver/jersey/src/test/java/io/helidon/webserver/examples/jersey/HelloWorldTest.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The Jersey Client based example that tests the {@link HelloWorld} resource diff --git a/examples/webserver/streaming/src/main/java/io/helidon/webserver/examples/streaming/ServerFileReader.java b/examples/webserver/streaming/src/main/java/io/helidon/webserver/examples/streaming/ServerFileReader.java index 0725dcb97..844dccfd6 100644 --- a/examples/webserver/streaming/src/main/java/io/helidon/webserver/examples/streaming/ServerFileReader.java +++ b/examples/webserver/streaming/src/main/java/io/helidon/webserver/examples/streaming/ServerFileReader.java @@ -21,10 +21,10 @@ import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.file.Path; import java.nio.file.StandardOpenOption; +import java.util.concurrent.Flow; import java.util.logging.Logger; import io.helidon.common.http.DataChunk; -import io.helidon.common.reactive.Flow; /** * Class ServerFileReader. Reads a file using NIO and produces data chunks for a diff --git a/examples/webserver/streaming/src/main/java/io/helidon/webserver/examples/streaming/ServerFileWriter.java b/examples/webserver/streaming/src/main/java/io/helidon/webserver/examples/streaming/ServerFileWriter.java index a97144789..074bca5a2 100644 --- a/examples/webserver/streaming/src/main/java/io/helidon/webserver/examples/streaming/ServerFileWriter.java +++ b/examples/webserver/streaming/src/main/java/io/helidon/webserver/examples/streaming/ServerFileWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,10 +21,10 @@ import java.nio.channels.FileChannel; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardOpenOption; +import java.util.concurrent.Flow; import java.util.logging.Logger; import io.helidon.common.http.DataChunk; -import io.helidon.common.reactive.Flow; import io.helidon.webserver.ServerResponse; /** diff --git a/examples/webserver/tutorial/src/main/java/io/helidon/webserver/examples/tutorial/CommentService.java b/examples/webserver/tutorial/src/main/java/io/helidon/webserver/examples/tutorial/CommentService.java index 4d16d199e..2b88239b6 100644 --- a/examples/webserver/tutorial/src/main/java/io/helidon/webserver/examples/tutorial/CommentService.java +++ b/examples/webserver/tutorial/src/main/java/io/helidon/webserver/examples/tutorial/CommentService.java @@ -21,11 +21,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Flow; import java.util.stream.Collectors; import io.helidon.common.http.DataChunk; import io.helidon.common.http.MediaType; -import io.helidon.common.reactive.Flow; import io.helidon.media.common.ContentWriters; import io.helidon.webserver.Routing; import io.helidon.webserver.ServerRequest; diff --git a/examples/webserver/tutorial/src/main/java/io/helidon/webserver/examples/tutorial/UpperXFilter.java b/examples/webserver/tutorial/src/main/java/io/helidon/webserver/examples/tutorial/UpperXFilter.java index 4cc06abc5..dd5848bc0 100644 --- a/examples/webserver/tutorial/src/main/java/io/helidon/webserver/examples/tutorial/UpperXFilter.java +++ b/examples/webserver/tutorial/src/main/java/io/helidon/webserver/examples/tutorial/UpperXFilter.java @@ -19,10 +19,10 @@ package io.helidon.webserver.examples.tutorial; import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import java.util.concurrent.Flow.Publisher; import java.util.function.Function; import io.helidon.common.http.DataChunk; -import io.helidon.common.reactive.Flow.Publisher; import io.helidon.common.reactive.Multi; diff --git a/examples/webserver/tutorial/src/test/java/io/helidon/webserver/examples/tutorial/user/UserFilterTest.java b/examples/webserver/tutorial/src/test/java/io/helidon/webserver/examples/tutorial/user/UserFilterTest.java index 93f97bbc6..1f099bfa2 100644 --- a/examples/webserver/tutorial/src/test/java/io/helidon/webserver/examples/tutorial/user/UserFilterTest.java +++ b/examples/webserver/tutorial/src/test/java/io/helidon/webserver/examples/tutorial/user/UserFilterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import io.helidon.webserver.testsupport.TestResponse; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Tests {@link UserFilter}. diff --git a/integrations/cdi/common-cdi/reference-counted-context/src/test/java/io/helidon/integrations/cdi/referencecountedcontext/TestReferenceCountedContext.java b/integrations/cdi/common-cdi/reference-counted-context/src/test/java/io/helidon/integrations/cdi/referencecountedcontext/TestReferenceCountedContext.java index 7fba1a636..966f19a8f 100644 --- a/integrations/cdi/common-cdi/reference-counted-context/src/test/java/io/helidon/integrations/cdi/referencecountedcontext/TestReferenceCountedContext.java +++ b/integrations/cdi/common-cdi/reference-counted-context/src/test/java/io/helidon/integrations/cdi/referencecountedcontext/TestReferenceCountedContext.java @@ -35,7 +35,6 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; @ApplicationScoped final class TestReferenceCountedContext { diff --git a/integrations/cdi/datasource-hikaricp/src/test/java/io/helidon/integrations/datasource/hikaricp/cdi/TestConfiguration.java b/integrations/cdi/datasource-hikaricp/src/test/java/io/helidon/integrations/datasource/hikaricp/cdi/TestConfiguration.java index dc73ce808..2abedff1a 100644 --- a/integrations/cdi/datasource-hikaricp/src/test/java/io/helidon/integrations/datasource/hikaricp/cdi/TestConfiguration.java +++ b/integrations/cdi/datasource-hikaricp/src/test/java/io/helidon/integrations/datasource/hikaricp/cdi/TestConfiguration.java @@ -21,7 +21,6 @@ import java.sql.SQLException; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Initialized; import javax.enterprise.event.Observes; -import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; import javax.inject.Inject; import javax.inject.Named; diff --git a/integrations/cdi/datasource-ucp/src/test/java/io/helidon/integrations/datasource/ucp/cdi/TestDataSourceAcquisition.java b/integrations/cdi/datasource-ucp/src/test/java/io/helidon/integrations/datasource/ucp/cdi/TestDataSourceAcquisition.java index d31a30de9..f0ac808f5 100644 --- a/integrations/cdi/datasource-ucp/src/test/java/io/helidon/integrations/datasource/ucp/cdi/TestDataSourceAcquisition.java +++ b/integrations/cdi/datasource-ucp/src/test/java/io/helidon/integrations/datasource/ucp/cdi/TestDataSourceAcquisition.java @@ -21,7 +21,6 @@ import java.sql.SQLException; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Initialized; import javax.enterprise.event.Observes; -import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; import javax.inject.Inject; import javax.inject.Named; diff --git a/integrations/cdi/eclipselink-cdi/src/main/java/io/helidon/integrations/cdi/eclipselink/CDISEPlatform.java b/integrations/cdi/eclipselink-cdi/src/main/java/io/helidon/integrations/cdi/eclipselink/CDISEPlatform.java index 39f598446..f525e278a 100644 --- a/integrations/cdi/eclipselink-cdi/src/main/java/io/helidon/integrations/cdi/eclipselink/CDISEPlatform.java +++ b/integrations/cdi/eclipselink-cdi/src/main/java/io/helidon/integrations/cdi/eclipselink/CDISEPlatform.java @@ -35,7 +35,7 @@ import javax.transaction.TransactionManager; import org.eclipse.persistence.exceptions.ValidationException; import org.eclipse.persistence.platform.server.JMXServerPlatformBase; -import org.eclipse.persistence.platform.server.ServerPlatformBase; // for javadoc only +import org.eclipse.persistence.platform.server.ServerPlatformBase; import org.eclipse.persistence.sessions.Connector; import org.eclipse.persistence.sessions.DatabaseLogin; import org.eclipse.persistence.sessions.DatabaseSession; diff --git a/integrations/cdi/eclipselink-cdi/src/test/java/io/helidon/integrations/cdi/eclipselink/TestManualEntityManagerAcquisition.java b/integrations/cdi/eclipselink-cdi/src/test/java/io/helidon/integrations/cdi/eclipselink/TestManualEntityManagerAcquisition.java index afe26ef80..a5d6fa2a4 100644 --- a/integrations/cdi/eclipselink-cdi/src/test/java/io/helidon/integrations/cdi/eclipselink/TestManualEntityManagerAcquisition.java +++ b/integrations/cdi/eclipselink-cdi/src/test/java/io/helidon/integrations/cdi/eclipselink/TestManualEntityManagerAcquisition.java @@ -15,24 +15,19 @@ */ package io.helidon.integrations.cdi.eclipselink; -import java.util.Map; - import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; -import javax.persistence.PersistenceException; import io.helidon.integrations.datasource.hikaricp.cdi.HikariCPBackedDataSourceExtension; -import org.eclipse.persistence.exceptions.ValidationException; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; @ApplicationScoped class TestManualEntityManagerAcquisition { diff --git a/integrations/cdi/jpa-cdi/src/main/java/io/helidon/integrations/cdi/jpa/PersistenceUnitInfoBean.java b/integrations/cdi/jpa-cdi/src/main/java/io/helidon/integrations/cdi/jpa/PersistenceUnitInfoBean.java index 65fdf6099..b1a80de46 100644 --- a/integrations/cdi/jpa-cdi/src/main/java/io/helidon/integrations/cdi/jpa/PersistenceUnitInfoBean.java +++ b/integrations/cdi/jpa-cdi/src/main/java/io/helidon/integrations/cdi/jpa/PersistenceUnitInfoBean.java @@ -35,7 +35,7 @@ import java.util.function.Supplier; import javax.persistence.SharedCacheMode; import javax.persistence.ValidationMode; import javax.persistence.spi.ClassTransformer; -import javax.persistence.spi.PersistenceProvider; // for javadoc only +import javax.persistence.spi.PersistenceProvider; import javax.persistence.spi.PersistenceUnitInfo; import javax.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; diff --git a/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/TestAnnotationRewriting.java b/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/TestAnnotationRewriting.java index 40be5fe7c..4ec755e6c 100644 --- a/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/TestAnnotationRewriting.java +++ b/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/TestAnnotationRewriting.java @@ -22,8 +22,6 @@ import java.util.Set; import javax.annotation.sql.DataSourceDefinition; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.BeforeDestroyed; -import javax.enterprise.context.Dependent; -import javax.enterprise.context.Initialized; import javax.enterprise.event.Observes; import javax.enterprise.inject.Instance; import javax.enterprise.inject.se.SeContainer; @@ -33,11 +31,11 @@ import javax.persistence.EntityManagerFactory; import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContextType; import javax.persistence.PersistenceUnit; +import javax.persistence.TransactionRequiredException; import javax.transaction.Status; import javax.transaction.SystemException; -import javax.persistence.TransactionRequiredException; -import javax.transaction.Transactional; import javax.transaction.TransactionManager; +import javax.transaction.Transactional; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/Author.java b/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/Author.java index 2662078ba..faa646c31 100644 --- a/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/Author.java +++ b/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/Author.java @@ -20,9 +20,9 @@ import java.util.Objects; import javax.persistence.Access; import javax.persistence.AccessType; -import javax.persistence.Entity; import javax.persistence.Basic; import javax.persistence.Column; +import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; diff --git a/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestExtendedSynchronizedEntityManager.java b/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestExtendedSynchronizedEntityManager.java index e4ddd7dc7..3a8b4ea22 100644 --- a/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestExtendedSynchronizedEntityManager.java +++ b/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestExtendedSynchronizedEntityManager.java @@ -15,20 +15,17 @@ */ package io.helidon.integrations.cdi.jpa.chirp; -import java.util.Objects; - import javax.annotation.sql.DataSourceDefinition; -import javax.inject.Inject; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.BeforeDestroyed; import javax.enterprise.event.Observes; import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; +import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContextType; import javax.persistence.SynchronizationType; -import javax.persistence.TransactionRequiredException; import javax.transaction.HeuristicMixedException; import javax.transaction.HeuristicRollbackException; import javax.transaction.NotSupportedException; @@ -44,7 +41,6 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; @ApplicationScoped @DataSourceDefinition( diff --git a/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestExtendedUnsynchronizedEntityManager.java b/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestExtendedUnsynchronizedEntityManager.java index 8c45582fd..3f7967d9c 100644 --- a/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestExtendedUnsynchronizedEntityManager.java +++ b/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestExtendedUnsynchronizedEntityManager.java @@ -15,20 +15,17 @@ */ package io.helidon.integrations.cdi.jpa.chirp; -import java.util.Objects; - import javax.annotation.sql.DataSourceDefinition; -import javax.inject.Inject; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.BeforeDestroyed; import javax.enterprise.event.Observes; import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; +import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContextType; import javax.persistence.SynchronizationType; -import javax.persistence.TransactionRequiredException; import javax.transaction.HeuristicMixedException; import javax.transaction.HeuristicRollbackException; import javax.transaction.NotSupportedException; @@ -44,7 +41,6 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; @ApplicationScoped @DataSourceDefinition( diff --git a/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestJpaTransactionScopedSynchronizedEntityManager.java b/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestJpaTransactionScopedSynchronizedEntityManager.java index e4a300872..fd0da6924 100644 --- a/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestJpaTransactionScopedSynchronizedEntityManager.java +++ b/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestJpaTransactionScopedSynchronizedEntityManager.java @@ -20,19 +20,16 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import java.util.Objects; - import javax.annotation.sql.DataSourceDefinition; -import javax.inject.Inject; -import javax.inject.Named; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.BeforeDestroyed; -import javax.enterprise.context.ContextNotActiveException; import javax.enterprise.context.spi.Context; import javax.enterprise.event.Observes; import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; import javax.enterprise.inject.spi.BeanManager; +import javax.inject.Inject; +import javax.inject.Named; import javax.persistence.EntityExistsException; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; diff --git a/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestJpaTransactionScopedUnsynchronizedEntityManager.java b/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestJpaTransactionScopedUnsynchronizedEntityManager.java index 265eef138..d1e7a4a2f 100644 --- a/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestJpaTransactionScopedUnsynchronizedEntityManager.java +++ b/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestJpaTransactionScopedUnsynchronizedEntityManager.java @@ -15,15 +15,13 @@ */ package io.helidon.integrations.cdi.jpa.chirp; -import java.util.Objects; - import javax.annotation.sql.DataSourceDefinition; -import javax.inject.Inject; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.BeforeDestroyed; import javax.enterprise.event.Observes; import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; +import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContextType; diff --git a/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestRollbackScenarios.java b/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestRollbackScenarios.java index 8bb3b0981..414eb2185 100644 --- a/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestRollbackScenarios.java +++ b/integrations/cdi/jpa-cdi/src/test/java/io/helidon/integrations/cdi/jpa/chirp/TestRollbackScenarios.java @@ -15,15 +15,13 @@ */ package io.helidon.integrations.cdi.jpa.chirp; -import java.util.Objects; - import javax.annotation.sql.DataSourceDefinition; -import javax.inject.Inject; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.BeforeDestroyed; import javax.enterprise.event.Observes; import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; +import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContextType; diff --git a/integrations/cdi/jpa-weld/src/test/java/io/helidon/integrations/cdi/jpa/weld/TestIntegration.java b/integrations/cdi/jpa-weld/src/test/java/io/helidon/integrations/cdi/jpa/weld/TestIntegration.java index 38e58e7d8..e68d93f55 100644 --- a/integrations/cdi/jpa-weld/src/test/java/io/helidon/integrations/cdi/jpa/weld/TestIntegration.java +++ b/integrations/cdi/jpa-weld/src/test/java/io/helidon/integrations/cdi/jpa/weld/TestIntegration.java @@ -36,7 +36,6 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; diff --git a/integrations/cdi/jta-cdi/src/main/java/io/helidon/integrations/jta/cdi/DelegatingTransactionManager.java b/integrations/cdi/jta-cdi/src/main/java/io/helidon/integrations/jta/cdi/DelegatingTransactionManager.java index af1bba75d..1879963ae 100644 --- a/integrations/cdi/jta-cdi/src/main/java/io/helidon/integrations/jta/cdi/DelegatingTransactionManager.java +++ b/integrations/cdi/jta-cdi/src/main/java/io/helidon/integrations/jta/cdi/DelegatingTransactionManager.java @@ -20,7 +20,7 @@ import javax.transaction.HeuristicRollbackException; import javax.transaction.InvalidTransactionException; import javax.transaction.NotSupportedException; import javax.transaction.RollbackException; -import javax.transaction.Status; // for javadoc only +import javax.transaction.Status; import javax.transaction.SystemException; import javax.transaction.Transaction; import javax.transaction.TransactionManager; diff --git a/integrations/cdi/jta-cdi/src/main/java/io/helidon/integrations/jta/cdi/DelegatingTransactionSynchronizationRegistry.java b/integrations/cdi/jta-cdi/src/main/java/io/helidon/integrations/jta/cdi/DelegatingTransactionSynchronizationRegistry.java index 526bd094e..456735a45 100644 --- a/integrations/cdi/jta-cdi/src/main/java/io/helidon/integrations/jta/cdi/DelegatingTransactionSynchronizationRegistry.java +++ b/integrations/cdi/jta-cdi/src/main/java/io/helidon/integrations/jta/cdi/DelegatingTransactionSynchronizationRegistry.java @@ -15,12 +15,12 @@ */ package io.helidon.integrations.jta.cdi; -import java.util.Map; // for javadoc only +import java.util.Map; -import javax.transaction.Status; // for javadoc only +import javax.transaction.Status; import javax.transaction.Synchronization; -import javax.transaction.Transaction; // for javadoc only -import javax.transaction.TransactionManager; // for javadoc only +import javax.transaction.Transaction; +import javax.transaction.TransactionManager; import javax.transaction.TransactionSynchronizationRegistry; /** diff --git a/integrations/cdi/jta-cdi/src/main/java/io/helidon/integrations/jta/cdi/NarayanaTransactionManager.java b/integrations/cdi/jta-cdi/src/main/java/io/helidon/integrations/jta/cdi/NarayanaTransactionManager.java index bafec7d5d..ba086c0ae 100644 --- a/integrations/cdi/jta-cdi/src/main/java/io/helidon/integrations/jta/cdi/NarayanaTransactionManager.java +++ b/integrations/cdi/jta-cdi/src/main/java/io/helidon/integrations/jta/cdi/NarayanaTransactionManager.java @@ -27,7 +27,7 @@ import javax.transaction.NotSupportedException; import javax.transaction.RollbackException; import javax.transaction.SystemException; import javax.transaction.Transaction; -import javax.transaction.TransactionManager; // for javadoc only +import javax.transaction.TransactionManager; import javax.transaction.TransactionScoped; import com.arjuna.ats.jta.common.JTAEnvironmentBean; diff --git a/integrations/cdi/jta-cdi/src/test/java/io/helidon/integrations/jta/cdi/TestTransactionalAnnotationSupport.java b/integrations/cdi/jta-cdi/src/test/java/io/helidon/integrations/jta/cdi/TestTransactionalAnnotationSupport.java index fc2a4804c..6e4e640bf 100644 --- a/integrations/cdi/jta-cdi/src/test/java/io/helidon/integrations/jta/cdi/TestTransactionalAnnotationSupport.java +++ b/integrations/cdi/jta-cdi/src/test/java/io/helidon/integrations/jta/cdi/TestTransactionalAnnotationSupport.java @@ -23,10 +23,9 @@ import javax.enterprise.inject.se.SeContainerInitializer; import javax.inject.Inject; import javax.transaction.Status; import javax.transaction.SystemException; -import javax.transaction.TransactionManager; -import javax.transaction.Transactional; import javax.transaction.Transaction; import javax.transaction.TransactionScoped; +import javax.transaction.Transactional; import javax.transaction.UserTransaction; import org.junit.jupiter.api.AfterEach; diff --git a/integrations/cdi/jta-weld/src/test/java/io/helidon/integrations/jta/weld/TestAutomaticUserTransactionInjection.java b/integrations/cdi/jta-weld/src/test/java/io/helidon/integrations/jta/weld/TestAutomaticUserTransactionInjection.java index 451871f1b..505664252 100644 --- a/integrations/cdi/jta-weld/src/test/java/io/helidon/integrations/jta/weld/TestAutomaticUserTransactionInjection.java +++ b/integrations/cdi/jta-weld/src/test/java/io/helidon/integrations/jta/weld/TestAutomaticUserTransactionInjection.java @@ -20,24 +20,20 @@ import javax.enterprise.context.Initialized; import javax.enterprise.event.Observes; import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; -import javax.enterprise.inject.spi.CDI; -import javax.inject.Inject; import javax.transaction.NotSupportedException; import javax.transaction.Status; import javax.transaction.SystemException; import javax.transaction.UserTransaction; -import com.arjuna.ats.jta.common.JTAEnvironmentBean; - import io.helidon.integrations.jta.cdi.NarayanaExtension; +import com.arjuna.ats.jta.common.JTAEnvironmentBean; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assumptions.assumeFalse; @ApplicationScoped public class TestAutomaticUserTransactionInjection { diff --git a/integrations/cdi/oci-objectstorage-cdi/src/test/java/io/helidon/integrations/cdi/oci/objectstorage/TestOCIObjectStorageExtension.java b/integrations/cdi/oci-objectstorage-cdi/src/test/java/io/helidon/integrations/cdi/oci/objectstorage/TestOCIObjectStorageExtension.java index 3f561b1ac..fadd49bf9 100644 --- a/integrations/cdi/oci-objectstorage-cdi/src/test/java/io/helidon/integrations/cdi/oci/objectstorage/TestOCIObjectStorageExtension.java +++ b/integrations/cdi/oci-objectstorage-cdi/src/test/java/io/helidon/integrations/cdi/oci/objectstorage/TestOCIObjectStorageExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,12 +18,8 @@ package io.helidon.integrations.cdi.oci.objectstorage; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Initialized; import javax.enterprise.event.Observes; -import javax.enterprise.inject.Instance; import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; -import javax.enterprise.inject.spi.CDI; -import javax.inject.Inject; -import javax.inject.Named; import com.oracle.bmc.objectstorage.ObjectStorage; import com.oracle.bmc.objectstorage.ObjectStorageClient; diff --git a/integrations/serviceconfiguration/serviceconfiguration-api/src/main/java/io/helidon/service/configuration/api/ServiceConfiguration.java b/integrations/serviceconfiguration/serviceconfiguration-api/src/main/java/io/helidon/service/configuration/api/ServiceConfiguration.java index 5cfc5a8be..12474f92c 100644 --- a/integrations/serviceconfiguration/serviceconfiguration-api/src/main/java/io/helidon/service/configuration/api/ServiceConfiguration.java +++ b/integrations/serviceconfiguration/serviceconfiguration-api/src/main/java/io/helidon/service/configuration/api/ServiceConfiguration.java @@ -17,7 +17,7 @@ package io.helidon.service.configuration.api; import java.util.Objects; import java.util.Properties; -import java.util.ServiceConfigurationError; // for javadoc only +import java.util.ServiceConfigurationError; import java.util.ServiceLoader; import java.util.Set; diff --git a/integrations/serviceconfiguration/serviceconfiguration-api/src/main/java/io/helidon/service/configuration/api/System.java b/integrations/serviceconfiguration/serviceconfiguration-api/src/main/java/io/helidon/service/configuration/api/System.java index 3a681347c..bf5d61ac6 100644 --- a/integrations/serviceconfiguration/serviceconfiguration-api/src/main/java/io/helidon/service/configuration/api/System.java +++ b/integrations/serviceconfiguration/serviceconfiguration-api/src/main/java/io/helidon/service/configuration/api/System.java @@ -15,7 +15,7 @@ */ package io.helidon.service.configuration.api; -import java.util.Collection; // for javadoc only +import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.Map; diff --git a/integrations/serviceconfiguration/serviceconfiguration-hikaricp-accs/src/main/java/io/helidon/service/configuration/hikaricp/accs/HikariCPServiceConfigurationACCSProvider.java b/integrations/serviceconfiguration/serviceconfiguration-hikaricp-accs/src/main/java/io/helidon/service/configuration/hikaricp/accs/HikariCPServiceConfigurationACCSProvider.java index ef49103fd..ea8557d05 100644 --- a/integrations/serviceconfiguration/serviceconfiguration-hikaricp-accs/src/main/java/io/helidon/service/configuration/hikaricp/accs/HikariCPServiceConfigurationACCSProvider.java +++ b/integrations/serviceconfiguration/serviceconfiguration-hikaricp-accs/src/main/java/io/helidon/service/configuration/hikaricp/accs/HikariCPServiceConfigurationACCSProvider.java @@ -20,7 +20,7 @@ import java.util.Objects; import java.util.Properties; import java.util.Set; -import javax.sql.DataSource; // for javadoc only +import javax.sql.DataSource; /** * A {@link diff --git a/integrations/serviceconfiguration/serviceconfiguration-hikaricp/src/test/java/io/helidon/service/configuration/hikaricp/TestPropertiesScenarios.java b/integrations/serviceconfiguration/serviceconfiguration-hikaricp/src/test/java/io/helidon/service/configuration/hikaricp/TestPropertiesScenarios.java index b9a38c9cb..d79596a7b 100644 --- a/integrations/serviceconfiguration/serviceconfiguration-hikaricp/src/test/java/io/helidon/service/configuration/hikaricp/TestPropertiesScenarios.java +++ b/integrations/serviceconfiguration/serviceconfiguration-hikaricp/src/test/java/io/helidon/service/configuration/hikaricp/TestPropertiesScenarios.java @@ -15,14 +15,12 @@ */ package io.helidon.service.configuration.hikaricp; -import java.util.Properties; import java.util.Set; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; @Deprecated public class TestPropertiesScenarios { diff --git a/integrations/serviceconfiguration/serviceconfiguration-system-kubernetes/src/test/java/io/helidon/service/configuration/kubernetes/TestKubernetesSystem.java b/integrations/serviceconfiguration/serviceconfiguration-system-kubernetes/src/test/java/io/helidon/service/configuration/kubernetes/TestKubernetesSystem.java index ef61f22c5..53b4fc10d 100644 --- a/integrations/serviceconfiguration/serviceconfiguration-system-kubernetes/src/test/java/io/helidon/service/configuration/kubernetes/TestKubernetesSystem.java +++ b/integrations/serviceconfiguration/serviceconfiguration-system-kubernetes/src/test/java/io/helidon/service/configuration/kubernetes/TestKubernetesSystem.java @@ -16,7 +16,6 @@ package io.helidon.service.configuration.kubernetes; import java.io.IOException; - import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/media/common/src/main/java/io/helidon/media/common/ContentReaders.java b/media/common/src/main/java/io/helidon/media/common/ContentReaders.java index 23a07eea3..08d71d709 100644 --- a/media/common/src/main/java/io/helidon/media/common/ContentReaders.java +++ b/media/common/src/main/java/io/helidon/media/common/ContentReaders.java @@ -23,13 +23,13 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.nio.charset.Charset; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Flow.Publisher; import io.helidon.common.http.DataChunk; import io.helidon.common.http.Reader; import io.helidon.common.http.Utils; import io.helidon.common.mapper.Mapper; import io.helidon.common.reactive.Collector; -import io.helidon.common.reactive.Flow.Publisher; import io.helidon.common.reactive.Multi; import io.helidon.common.reactive.Single; diff --git a/media/common/src/main/java/io/helidon/media/common/ContentWriters.java b/media/common/src/main/java/io/helidon/media/common/ContentWriters.java index b48d72e83..cc6eda32e 100644 --- a/media/common/src/main/java/io/helidon/media/common/ContentWriters.java +++ b/media/common/src/main/java/io/helidon/media/common/ContentWriters.java @@ -19,10 +19,10 @@ package io.helidon.media.common; import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; import java.nio.charset.Charset; +import java.util.concurrent.Flow.Publisher; import java.util.function.Function; import io.helidon.common.http.DataChunk; -import io.helidon.common.reactive.Flow.Publisher; import io.helidon.common.reactive.RetrySchema; import io.helidon.common.reactive.Single; diff --git a/media/common/src/main/java/io/helidon/media/common/PublisherInputStream.java b/media/common/src/main/java/io/helidon/media/common/PublisherInputStream.java index 74e041f9b..c29e0d01b 100644 --- a/media/common/src/main/java/io/helidon/media/common/PublisherInputStream.java +++ b/media/common/src/main/java/io/helidon/media/common/PublisherInputStream.java @@ -22,11 +22,11 @@ import java.nio.ByteBuffer; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Flow; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Logger; import io.helidon.common.http.DataChunk; -import io.helidon.common.reactive.Flow; /** * An {@link Flow.Subscriber subscriber} that can subscribe to a source of {@code ByteBuffer} data chunks and then make diff --git a/media/common/src/main/java/io/helidon/media/common/ReadableByteChannelPublisher.java b/media/common/src/main/java/io/helidon/media/common/ReadableByteChannelPublisher.java index 83042605c..c541e69df 100644 --- a/media/common/src/main/java/io/helidon/media/common/ReadableByteChannelPublisher.java +++ b/media/common/src/main/java/io/helidon/media/common/ReadableByteChannelPublisher.java @@ -19,6 +19,7 @@ package io.helidon.media.common; import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; import java.util.concurrent.Executors; +import java.util.concurrent.Flow; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -28,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import io.helidon.common.http.DataChunk; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.RequestedCounter; import io.helidon.common.reactive.RetrySchema; import io.helidon.common.reactive.SingleSubscriberHolder; diff --git a/media/common/src/main/java/io/helidon/media/common/StringContentReader.java b/media/common/src/main/java/io/helidon/media/common/StringContentReader.java index 778141349..b248eb002 100644 --- a/media/common/src/main/java/io/helidon/media/common/StringContentReader.java +++ b/media/common/src/main/java/io/helidon/media/common/StringContentReader.java @@ -21,10 +21,10 @@ import java.nio.charset.Charset; import java.nio.charset.UnsupportedCharsetException; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; +import java.util.concurrent.Flow; import io.helidon.common.http.DataChunk; import io.helidon.common.http.Reader; -import io.helidon.common.reactive.Flow; /** * The StringContentReader provides means to convert a {@link ByteBuffer} publisher to diff --git a/media/common/src/test/java/io/helidon/media/common/ContentWritersTest.java b/media/common/src/test/java/io/helidon/media/common/ContentWritersTest.java index ca2274d28..8f066cd3e 100644 --- a/media/common/src/test/java/io/helidon/media/common/ContentWritersTest.java +++ b/media/common/src/test/java/io/helidon/media/common/ContentWritersTest.java @@ -17,10 +17,10 @@ package io.helidon.media.common; import java.nio.charset.StandardCharsets; +import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.TimeUnit; import io.helidon.common.http.DataChunk; -import io.helidon.common.reactive.Flow.Publisher; -import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; diff --git a/media/common/src/test/java/io/helidon/media/common/PublisherInputStreamTest.java b/media/common/src/test/java/io/helidon/media/common/PublisherInputStreamTest.java index d2165a1d6..1260e8567 100644 --- a/media/common/src/test/java/io/helidon/media/common/PublisherInputStreamTest.java +++ b/media/common/src/test/java/io/helidon/media/common/PublisherInputStreamTest.java @@ -16,13 +16,14 @@ package io.helidon.media.common; -import io.helidon.common.http.DataChunk; -import io.helidon.common.reactive.Flow; -import io.helidon.common.reactive.Flow.Publisher; - import java.io.IOException; import java.io.InputStream; import java.util.Arrays; +import java.util.concurrent.Flow; +import java.util.concurrent.Flow.Publisher; + +import io.helidon.common.http.DataChunk; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/media/common/src/test/java/io/helidon/media/common/ReadableByteChannelPublisherTest.java b/media/common/src/test/java/io/helidon/media/common/ReadableByteChannelPublisherTest.java index 675b3bbd4..ed4686327 100644 --- a/media/common/src/test/java/io/helidon/media/common/ReadableByteChannelPublisherTest.java +++ b/media/common/src/test/java/io/helidon/media/common/ReadableByteChannelPublisherTest.java @@ -24,20 +24,20 @@ import java.nio.charset.StandardCharsets; import java.util.HashSet; import java.util.Set; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.Subscriber; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.IntFunction; import io.helidon.common.http.DataChunk; -import io.helidon.common.reactive.Flow.Publisher; -import io.helidon.common.reactive.Flow.Subscriber; -import io.helidon.common.reactive.Flow.Subscription; import io.helidon.common.reactive.RetrySchema; import org.junit.jupiter.api.Test; -import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.fail; diff --git a/media/jackson/common/src/main/java/io/helidon/media/jackson/common/JacksonProcessing.java b/media/jackson/common/src/main/java/io/helidon/media/jackson/common/JacksonProcessing.java index 1cea26904..6f15ef717 100644 --- a/media/jackson/common/src/main/java/io/helidon/media/jackson/common/JacksonProcessing.java +++ b/media/jackson/common/src/main/java/io/helidon/media/jackson/common/JacksonProcessing.java @@ -18,11 +18,11 @@ package io.helidon.media.jackson.common; import java.io.IOException; import java.nio.charset.Charset; import java.util.Objects; +import java.util.concurrent.Flow; import java.util.function.Function; import io.helidon.common.http.DataChunk; import io.helidon.common.http.Reader; -import io.helidon.common.reactive.Flow; import io.helidon.media.common.CharBuffer; import io.helidon.media.common.ContentReaders; import io.helidon.media.common.ContentWriters; diff --git a/media/jsonb/common/src/main/java/io/helidon/media/jsonb/common/JsonBinding.java b/media/jsonb/common/src/main/java/io/helidon/media/jsonb/common/JsonBinding.java index 4fc7e4eb6..836b9d1f7 100644 --- a/media/jsonb/common/src/main/java/io/helidon/media/jsonb/common/JsonBinding.java +++ b/media/jsonb/common/src/main/java/io/helidon/media/jsonb/common/JsonBinding.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; import java.util.Objects; +import java.util.concurrent.Flow; import java.util.function.Function; import javax.json.bind.Jsonb; @@ -27,7 +28,6 @@ import javax.json.bind.JsonbException; import io.helidon.common.http.DataChunk; import io.helidon.common.http.Reader; -import io.helidon.common.reactive.Flow; import io.helidon.media.common.CharBuffer; import io.helidon.media.common.ContentReaders; import io.helidon.media.common.ContentWriters; diff --git a/media/jsonp/common/src/main/java/io/helidon/media/jsonp/common/JsonProcessing.java b/media/jsonp/common/src/main/java/io/helidon/media/jsonp/common/JsonProcessing.java index f207c6718..8f9a56efc 100644 --- a/media/jsonp/common/src/main/java/io/helidon/media/jsonp/common/JsonProcessing.java +++ b/media/jsonp/common/src/main/java/io/helidon/media/jsonp/common/JsonProcessing.java @@ -20,6 +20,7 @@ import java.io.InputStream; import java.nio.charset.Charset; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.Flow; import java.util.function.Function; import javax.json.Json; @@ -32,7 +33,6 @@ import javax.json.JsonWriterFactory; import io.helidon.common.http.DataChunk; import io.helidon.common.http.Reader; -import io.helidon.common.reactive.Flow; import io.helidon.media.common.CharBuffer; import io.helidon.media.common.ContentReaders; import io.helidon.media.common.ContentWriters; diff --git a/media/jsonp/server/src/main/java/io/helidon/media/jsonp/server/JsonSupport.java b/media/jsonp/server/src/main/java/io/helidon/media/jsonp/server/JsonSupport.java index 8b0cdaa4b..a24575e2a 100644 --- a/media/jsonp/server/src/main/java/io/helidon/media/jsonp/server/JsonSupport.java +++ b/media/jsonp/server/src/main/java/io/helidon/media/jsonp/server/JsonSupport.java @@ -18,6 +18,7 @@ package io.helidon.media.jsonp.server; import java.nio.ByteBuffer; import java.nio.charset.Charset; +import java.util.concurrent.Flow; import java.util.function.Function; import javax.json.JsonReader; @@ -27,7 +28,6 @@ import javax.json.JsonWriter; import io.helidon.common.http.Content; import io.helidon.common.http.DataChunk; import io.helidon.common.http.Reader; -import io.helidon.common.reactive.Flow; import io.helidon.media.jsonp.common.JsonProcessing; import io.helidon.webserver.Handler; import io.helidon.webserver.JsonService; diff --git a/media/jsonp/server/src/test/java/io/helidon/media/jsonp/server/JsonContentReaderTest.java b/media/jsonp/server/src/test/java/io/helidon/media/jsonp/server/JsonContentReaderTest.java index e2d51c3fc..9d37b4855 100644 --- a/media/jsonp/server/src/test/java/io/helidon/media/jsonp/server/JsonContentReaderTest.java +++ b/media/jsonp/server/src/test/java/io/helidon/media/jsonp/server/JsonContentReaderTest.java @@ -18,6 +18,7 @@ package io.helidon.media.jsonp.server; import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Flow.Publisher; import java.util.concurrent.TimeUnit; import javax.json.JsonArray; @@ -25,7 +26,6 @@ import javax.json.JsonException; import javax.json.JsonObject; import io.helidon.common.http.DataChunk; -import io.helidon.common.reactive.Flow.Publisher; import io.helidon.common.reactive.Multi; import org.hamcrest.core.Is; diff --git a/metrics/metrics/src/test/java/io/helidon/metrics/HelidonHistogramTest.java b/metrics/metrics/src/test/java/io/helidon/metrics/HelidonHistogramTest.java index 49bf6d161..b4b0ba6e0 100644 --- a/metrics/metrics/src/test/java/io/helidon/metrics/HelidonHistogramTest.java +++ b/metrics/metrics/src/test/java/io/helidon/metrics/HelidonHistogramTest.java @@ -16,8 +16,6 @@ package io.helidon.metrics; -import static io.helidon.metrics.HelidonMetricsMatcher.withinTolerance; -import java.io.IOException; import java.io.LineNumberReader; import java.io.StringReader; import java.text.DecimalFormat; @@ -29,6 +27,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.Stream; + import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -37,11 +36,12 @@ import org.eclipse.microprofile.metrics.Metadata; import org.eclipse.microprofile.metrics.MetricType; import org.eclipse.microprofile.metrics.MetricUnits; import org.eclipse.microprofile.metrics.Snapshot; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import static io.helidon.metrics.HelidonMetricsMatcher.withinTolerance; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.fail; diff --git a/metrics/metrics/src/test/java/io/helidon/metrics/InternalBridgeTest.java b/metrics/metrics/src/test/java/io/helidon/metrics/InternalBridgeTest.java index be038a081..f4a6e1694 100644 --- a/metrics/metrics/src/test/java/io/helidon/metrics/InternalBridgeTest.java +++ b/metrics/metrics/src/test/java/io/helidon/metrics/InternalBridgeTest.java @@ -16,21 +16,23 @@ */ package io.helidon.metrics; -import io.helidon.common.metrics.InternalBridge; -import io.helidon.common.metrics.InternalBridge.MetricID; import java.util.Map; import java.util.Optional; + +import io.helidon.common.metrics.InternalBridge; +import io.helidon.common.metrics.InternalBridge.MetricID; + import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.Metadata; import org.eclipse.microprofile.metrics.Metric; - import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.MetricType; import org.eclipse.microprofile.metrics.MetricUnits; - -import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; /** * diff --git a/metrics/metrics/src/test/java/io/helidon/metrics/MetricsSupportTest.java b/metrics/metrics/src/test/java/io/helidon/metrics/MetricsSupportTest.java index 4aed7e687..ae10f690c 100644 --- a/metrics/metrics/src/test/java/io/helidon/metrics/MetricsSupportTest.java +++ b/metrics/metrics/src/test/java/io/helidon/metrics/MetricsSupportTest.java @@ -16,17 +16,19 @@ package io.helidon.metrics; +import javax.json.JsonObject; + import io.helidon.common.CollectionsHelper; import io.helidon.config.Config; import io.helidon.config.ConfigSources; -import javax.json.JsonObject; import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.MetricRegistry; -import static org.junit.jupiter.api.Assertions.assertFalse; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertFalse; + /** * Unit test for {@link MetricsSupport}. */ diff --git a/metrics2/metrics2/src/test/java/io/helidon/metrics/HelidonGaugeTest.java b/metrics2/metrics2/src/test/java/io/helidon/metrics/HelidonGaugeTest.java index 019393ff5..20ed651fd 100644 --- a/metrics2/metrics2/src/test/java/io/helidon/metrics/HelidonGaugeTest.java +++ b/metrics2/metrics2/src/test/java/io/helidon/metrics/HelidonGaugeTest.java @@ -15,23 +15,24 @@ */ package io.helidon.metrics; +import java.util.Collections; +import java.util.regex.Pattern; + import javax.json.Json; import javax.json.JsonBuilderFactory; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; -import java.util.Collections; -import java.util.regex.Pattern; import org.eclipse.microprofile.metrics.Gauge; import org.eclipse.microprofile.metrics.Metadata; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricType; import org.eclipse.microprofile.metrics.MetricUnits; - -import static org.hamcrest.MatcherAssert.assertThat; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; + public class HelidonGaugeTest { diff --git a/metrics2/metrics2/src/test/java/io/helidon/metrics/HelidonHistogramTest.java b/metrics2/metrics2/src/test/java/io/helidon/metrics/HelidonHistogramTest.java index 7e002937d..5623c16bd 100644 --- a/metrics2/metrics2/src/test/java/io/helidon/metrics/HelidonHistogramTest.java +++ b/metrics2/metrics2/src/test/java/io/helidon/metrics/HelidonHistogramTest.java @@ -21,20 +21,17 @@ import java.io.StringReader; import java.text.DecimalFormat; import java.text.NumberFormat; import java.text.ParseException; +import java.util.AbstractMap; import java.util.Arrays; import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import java.util.stream.Stream; import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; -import java.util.AbstractMap; -import java.util.stream.Stream; - -import static io.helidon.metrics.HelidonMetricsMatcher.withinTolerance; - import org.eclipse.microprofile.metrics.Metadata; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricType; @@ -43,6 +40,7 @@ import org.eclipse.microprofile.metrics.Snapshot; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import static io.helidon.metrics.HelidonMetricsMatcher.withinTolerance; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/metrics2/metrics2/src/test/java/io/helidon/metrics/InternalBridgeTest.java b/metrics2/metrics2/src/test/java/io/helidon/metrics/InternalBridgeTest.java index fab600339..9180e1c04 100644 --- a/metrics2/metrics2/src/test/java/io/helidon/metrics/InternalBridgeTest.java +++ b/metrics2/metrics2/src/test/java/io/helidon/metrics/InternalBridgeTest.java @@ -16,11 +16,10 @@ */ package io.helidon.metrics; -import java.util.Map; - import java.util.AbstractMap; import java.util.Arrays; import java.util.HashMap; +import java.util.Map; import java.util.SortedMap; import java.util.stream.Collectors; @@ -32,10 +31,11 @@ import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.MetricType; import org.eclipse.microprofile.metrics.MetricUnits; - -import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; /** * diff --git a/metrics2/metrics2/src/test/java/io/helidon/metrics/MetricImplTest.java b/metrics2/metrics2/src/test/java/io/helidon/metrics/MetricImplTest.java index af36c7d8b..c02064111 100644 --- a/metrics2/metrics2/src/test/java/io/helidon/metrics/MetricImplTest.java +++ b/metrics2/metrics2/src/test/java/io/helidon/metrics/MetricImplTest.java @@ -16,7 +16,6 @@ package io.helidon.metrics; -import io.helidon.common.CollectionsHelper; import java.io.StringReader; import java.util.List; import java.util.Optional; @@ -25,6 +24,8 @@ import javax.json.Json; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; +import io.helidon.common.CollectionsHelper; + import org.eclipse.microprofile.metrics.Metadata; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricType; diff --git a/metrics2/metrics2/src/test/java/io/helidon/metrics/MetricsSupportTest.java b/metrics2/metrics2/src/test/java/io/helidon/metrics/MetricsSupportTest.java index 913d04df1..e3376e346 100644 --- a/metrics2/metrics2/src/test/java/io/helidon/metrics/MetricsSupportTest.java +++ b/metrics2/metrics2/src/test/java/io/helidon/metrics/MetricsSupportTest.java @@ -16,24 +16,29 @@ package io.helidon.metrics; -import io.helidon.common.CollectionsHelper; -import io.helidon.config.Config; -import io.helidon.config.ConfigSources; import java.util.Collections; + import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonBuilderFactory; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; +import io.helidon.common.CollectionsHelper; +import io.helidon.config.Config; +import io.helidon.config.ConfigSources; + import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.Tag; -import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * Unit test for {@link MetricsSupport}. */ diff --git a/metrics2/metrics2/src/test/java/io/helidon/metrics/RegistryTest.java b/metrics2/metrics2/src/test/java/io/helidon/metrics/RegistryTest.java index 89db9d64e..6cec351b5 100644 --- a/metrics2/metrics2/src/test/java/io/helidon/metrics/RegistryTest.java +++ b/metrics2/metrics2/src/test/java/io/helidon/metrics/RegistryTest.java @@ -22,14 +22,12 @@ import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.MetricType; import org.eclipse.microprofile.metrics.MetricUnits; import org.eclipse.microprofile.metrics.Tag; - import org.hamcrest.core.IsSame; -import static org.hamcrest.Matchers.*; -import static org.hamcrest.MatcherAssert.*; - import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; import static org.junit.jupiter.api.Assertions.assertThrows; /** diff --git a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/AsynchronousCallerBean.java b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/AsynchronousCallerBean.java index 0580d1d3c..ff8e08511 100644 --- a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/AsynchronousCallerBean.java +++ b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/AsynchronousCallerBean.java @@ -16,10 +16,11 @@ package io.helidon.microprofile.faulttolerance; -import javax.enterprise.context.ApplicationScoped; import java.util.concurrent.Callable; import java.util.concurrent.CompletableFuture; +import javax.enterprise.context.ApplicationScoped; + import org.eclipse.microprofile.faulttolerance.Asynchronous; /** diff --git a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/BulkheadBean.java b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/BulkheadBean.java index d02a997e1..5a5d40ca7 100644 --- a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/BulkheadBean.java +++ b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/BulkheadBean.java @@ -16,11 +16,11 @@ package io.helidon.microprofile.faulttolerance; -import javax.enterprise.context.Dependent; - import java.util.concurrent.CompletableFuture; import java.util.concurrent.Future; +import javax.enterprise.context.Dependent; + import org.eclipse.microprofile.faulttolerance.Asynchronous; import org.eclipse.microprofile.faulttolerance.Bulkhead; import org.eclipse.microprofile.faulttolerance.Fallback; diff --git a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/CircuitBreakerBean.java b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/CircuitBreakerBean.java index d4861e896..074beda93 100644 --- a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/CircuitBreakerBean.java +++ b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/CircuitBreakerBean.java @@ -16,13 +16,13 @@ package io.helidon.microprofile.faulttolerance; -import javax.enterprise.context.Dependent; - import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Future; +import javax.enterprise.context.Dependent; + import org.eclipse.microprofile.faulttolerance.Asynchronous; import org.eclipse.microprofile.faulttolerance.Bulkhead; import org.eclipse.microprofile.faulttolerance.CircuitBreaker; diff --git a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/FaultToleranceTest.java b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/FaultToleranceTest.java index ba40b73fa..0c3c10de1 100644 --- a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/FaultToleranceTest.java +++ b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/FaultToleranceTest.java @@ -31,7 +31,6 @@ import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; import javax.enterprise.inject.spi.CDI; -import net.jodah.failsafe.FailsafeFuture; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/MetricsBean.java b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/MetricsBean.java index 4efe80ca0..944fe0b61 100644 --- a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/MetricsBean.java +++ b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/MetricsBean.java @@ -33,7 +33,9 @@ import org.eclipse.microprofile.faulttolerance.Timeout; import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.annotation.Metric; -import static io.helidon.microprofile.faulttolerance.FaultToleranceMetrics.*; +import static io.helidon.microprofile.faulttolerance.FaultToleranceMetrics.BULKHEAD_CONCURRENT_EXECUTIONS; +import static io.helidon.microprofile.faulttolerance.FaultToleranceMetrics.BULKHEAD_WAITING_QUEUE_POPULATION; +import static io.helidon.microprofile.faulttolerance.FaultToleranceMetrics.getGauge; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.is; diff --git a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/MetricsTest.java b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/MetricsTest.java index 3100c46bc..a15e1f34d 100644 --- a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/MetricsTest.java +++ b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/MetricsTest.java @@ -21,7 +21,6 @@ import java.util.concurrent.Future; import io.helidon.common.metrics.InternalBridge; import io.helidon.common.metrics.InternalBridge.Metadata.MetadataBuilder; -import io.helidon.common.metrics.InternalBridge.MetricID; import io.helidon.common.metrics.InternalBridge.MetricRegistry; import org.eclipse.microprofile.faulttolerance.exceptions.CircuitBreakerOpenException; diff --git a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/RetryTest.java b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/RetryTest.java index d3ab0a144..11ca81eda 100644 --- a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/RetryTest.java +++ b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/RetryTest.java @@ -25,14 +25,16 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.stream.Stream; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; -import static org.junit.jupiter.api.Assertions.fail; - import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.fail; + /** * Class RetryTest. */ diff --git a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/TimeoutTest.java b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/TimeoutTest.java index bc2fdc4a7..ab584d78a 100644 --- a/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/TimeoutTest.java +++ b/microprofile/fault-tolerance/src/test/java/io/helidon/microprofile/faulttolerance/TimeoutTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ package io.helidon.microprofile.faulttolerance; import org.eclipse.microprofile.faulttolerance.exceptions.TimeoutException; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertThrows; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Class TimeoutTest. diff --git a/microprofile/grpc/core/src/test/java/io/helidon/microprofile/grpc/core/AnnotatedMethodListTest.java b/microprofile/grpc/core/src/test/java/io/helidon/microprofile/grpc/core/AnnotatedMethodListTest.java index 2c458b275..0a84b4d3f 100644 --- a/microprofile/grpc/core/src/test/java/io/helidon/microprofile/grpc/core/AnnotatedMethodListTest.java +++ b/microprofile/grpc/core/src/test/java/io/helidon/microprofile/grpc/core/AnnotatedMethodListTest.java @@ -21,11 +21,6 @@ import java.util.Iterator; import java.util.List; import java.util.stream.Collectors; -import io.helidon.microprofile.grpc.core.ClientStreaming; -import io.helidon.microprofile.grpc.core.RequestType; -import io.helidon.microprofile.grpc.core.RpcMethod; -import io.helidon.microprofile.grpc.core.Unary; - import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/microprofile/grpc/core/src/test/java/io/helidon/microprofile/grpc/core/AnnotatedMethodTest.java b/microprofile/grpc/core/src/test/java/io/helidon/microprofile/grpc/core/AnnotatedMethodTest.java index eab27dc62..74d183a30 100644 --- a/microprofile/grpc/core/src/test/java/io/helidon/microprofile/grpc/core/AnnotatedMethodTest.java +++ b/microprofile/grpc/core/src/test/java/io/helidon/microprofile/grpc/core/AnnotatedMethodTest.java @@ -22,9 +22,6 @@ import java.lang.reflect.Method; import javax.inject.Inject; import javax.inject.Named; -import io.helidon.microprofile.grpc.core.RpcMethod; -import io.helidon.microprofile.grpc.core.RpcService; - import io.grpc.MethodDescriptor; import org.junit.jupiter.api.Test; diff --git a/microprofile/grpc/core/src/test/java/io/helidon/microprofile/grpc/core/BidirectionalMethodHandlerSupplierTest.java b/microprofile/grpc/core/src/test/java/io/helidon/microprofile/grpc/core/BidirectionalMethodHandlerSupplierTest.java index 964387855..4f1ac88a7 100644 --- a/microprofile/grpc/core/src/test/java/io/helidon/microprofile/grpc/core/BidirectionalMethodHandlerSupplierTest.java +++ b/microprofile/grpc/core/src/test/java/io/helidon/microprofile/grpc/core/BidirectionalMethodHandlerSupplierTest.java @@ -17,12 +17,6 @@ package io.helidon.microprofile.grpc.core; import io.helidon.grpc.core.MethodHandler; -import io.helidon.microprofile.grpc.core.Bidirectional; -import io.helidon.microprofile.grpc.core.ClientStreaming; -import io.helidon.microprofile.grpc.core.RequestType; -import io.helidon.microprofile.grpc.core.ResponseType; -import io.helidon.microprofile.grpc.core.ServerStreaming; -import io.helidon.microprofile.grpc.core.Unary; import io.grpc.MethodDescriptor; import io.grpc.stub.StreamObserver; diff --git a/microprofile/grpc/core/src/test/java/io/helidon/microprofile/grpc/core/ClientStreamingMethodHandlerSupplierTest.java b/microprofile/grpc/core/src/test/java/io/helidon/microprofile/grpc/core/ClientStreamingMethodHandlerSupplierTest.java index 88fba5bfc..a1b13c6fc 100644 --- a/microprofile/grpc/core/src/test/java/io/helidon/microprofile/grpc/core/ClientStreamingMethodHandlerSupplierTest.java +++ b/microprofile/grpc/core/src/test/java/io/helidon/microprofile/grpc/core/ClientStreamingMethodHandlerSupplierTest.java @@ -23,12 +23,6 @@ import java.util.concurrent.CompletionStage; import java.util.stream.Stream; import io.helidon.grpc.core.MethodHandler; -import io.helidon.microprofile.grpc.core.Bidirectional; -import io.helidon.microprofile.grpc.core.ClientStreaming; -import io.helidon.microprofile.grpc.core.RequestType; -import io.helidon.microprofile.grpc.core.ResponseType; -import io.helidon.microprofile.grpc.core.ServerStreaming; -import io.helidon.microprofile.grpc.core.Unary; import io.grpc.MethodDescriptor; import io.grpc.stub.StreamObserver; @@ -43,7 +37,6 @@ import static org.hamcrest.CoreMatchers.sameInstance; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyIterable; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.same; diff --git a/microprofile/grpc/core/src/test/java/io/helidon/microprofile/grpc/core/ModelHelperTest.java b/microprofile/grpc/core/src/test/java/io/helidon/microprofile/grpc/core/ModelHelperTest.java index dba5e7d1f..487a234ea 100644 --- a/microprofile/grpc/core/src/test/java/io/helidon/microprofile/grpc/core/ModelHelperTest.java +++ b/microprofile/grpc/core/src/test/java/io/helidon/microprofile/grpc/core/ModelHelperTest.java @@ -24,8 +24,6 @@ import io.helidon.grpc.core.MarshallerSupplier; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; public class ModelHelperTest { diff --git a/microprofile/grpc/metrics/src/test/java/io/helidon/microprofile/grpc/metrics/MetricsConfigurerIT.java b/microprofile/grpc/metrics/src/test/java/io/helidon/microprofile/grpc/metrics/MetricsConfigurerIT.java index 0b0a30d8e..86522fd79 100644 --- a/microprofile/grpc/metrics/src/test/java/io/helidon/microprofile/grpc/metrics/MetricsConfigurerIT.java +++ b/microprofile/grpc/metrics/src/test/java/io/helidon/microprofile/grpc/metrics/MetricsConfigurerIT.java @@ -40,8 +40,8 @@ import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.collection.IsEmptyIterable.emptyIterable; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.collection.IsEmptyIterable.emptyIterable; public class MetricsConfigurerIT { diff --git a/microprofile/grpc/metrics/src/test/java/io/helidon/microprofile/grpc/metrics/MetricsIT.java b/microprofile/grpc/metrics/src/test/java/io/helidon/microprofile/grpc/metrics/MetricsIT.java index 7aa1c1f3f..d6819e33b 100644 --- a/microprofile/grpc/metrics/src/test/java/io/helidon/microprofile/grpc/metrics/MetricsIT.java +++ b/microprofile/grpc/metrics/src/test/java/io/helidon/microprofile/grpc/metrics/MetricsIT.java @@ -27,8 +27,6 @@ import javax.enterprise.inject.spi.BeanManager; import javax.json.Json; import javax.json.JsonNumber; import javax.json.JsonObject; -import javax.json.JsonStructure; -import javax.json.JsonValue; import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.MediaType; diff --git a/microprofile/metrics/src/main/java/io/helidon/microprofile/metrics/InterceptorMetered.java b/microprofile/metrics/src/main/java/io/helidon/microprofile/metrics/InterceptorMetered.java index 42961bf11..b93465fe1 100644 --- a/microprofile/metrics/src/main/java/io/helidon/microprofile/metrics/InterceptorMetered.java +++ b/microprofile/metrics/src/main/java/io/helidon/microprofile/metrics/InterceptorMetered.java @@ -21,7 +21,6 @@ import javax.inject.Inject; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; - import org.eclipse.microprofile.metrics.Meter; import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.annotation.Metered; diff --git a/microprofile/metrics/src/main/java/io/helidon/microprofile/metrics/MetricsCdiExtension.java b/microprofile/metrics/src/main/java/io/helidon/microprofile/metrics/MetricsCdiExtension.java index 3e9f35c47..b1415d778 100644 --- a/microprofile/metrics/src/main/java/io/helidon/microprofile/metrics/MetricsCdiExtension.java +++ b/microprofile/metrics/src/main/java/io/helidon/microprofile/metrics/MetricsCdiExtension.java @@ -65,8 +65,6 @@ import org.eclipse.microprofile.metrics.annotation.Timed; import static io.helidon.microprofile.metrics.MetricUtil.LookupResult; import static io.helidon.microprofile.metrics.MetricUtil.getMetricName; import static io.helidon.microprofile.metrics.MetricUtil.lookupAnnotation; -import static io.helidon.microprofile.metrics.MetricUtil.registerMetric; -import static io.helidon.microprofile.metrics.MetricUtil.toTags; /** * MetricsCdiExtension class. diff --git a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/AbsoluteGaugeBean.java b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/AbsoluteGaugeBean.java index b7b379c57..5f9c67a5d 100644 --- a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/AbsoluteGaugeBean.java +++ b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/AbsoluteGaugeBean.java @@ -16,9 +16,10 @@ package io.helidon.microprofile.metrics; -import javax.enterprise.context.ApplicationScoped; import java.time.Duration; +import javax.enterprise.context.ApplicationScoped; + import org.eclipse.microprofile.metrics.annotation.Gauge; /** diff --git a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/MetricsTest.java b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/MetricsTest.java index bc9f583af..fea28736b 100644 --- a/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/MetricsTest.java +++ b/microprofile/metrics/src/test/java/io/helidon/microprofile/metrics/MetricsTest.java @@ -21,7 +21,6 @@ import java.util.Map; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.stream.Collectors; import java.util.stream.IntStream; import io.helidon.metrics.MetricsSupport; diff --git a/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/AbsoluteCountedBean.java b/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/AbsoluteCountedBean.java index 0038ede6c..ff230bebe 100644 --- a/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/AbsoluteCountedBean.java +++ b/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/AbsoluteCountedBean.java @@ -16,9 +16,10 @@ package io.helidon.microprofile.metrics; -import javax.enterprise.context.Dependent; import java.time.Duration; +import javax.enterprise.context.Dependent; + import org.eclipse.microprofile.metrics.annotation.Counted; /** diff --git a/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/AbsoluteGaugeBean.java b/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/AbsoluteGaugeBean.java index 8190377e5..5f9c67a5d 100644 --- a/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/AbsoluteGaugeBean.java +++ b/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/AbsoluteGaugeBean.java @@ -16,10 +16,10 @@ package io.helidon.microprofile.metrics; -import javax.enterprise.context.ApplicationScoped; - import java.time.Duration; +import javax.enterprise.context.ApplicationScoped; + import org.eclipse.microprofile.metrics.annotation.Gauge; /** diff --git a/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/BadGaugeTest.java b/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/BadGaugeTest.java index 7254d2095..4ec8c6e80 100644 --- a/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/BadGaugeTest.java +++ b/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/BadGaugeTest.java @@ -15,22 +15,18 @@ */ package io.helidon.microprofile.metrics; -import org.hamcrest.Matchers; -import org.jboss.weld.exceptions.DeploymentException; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import javax.enterprise.inject.se.SeContainer; import javax.enterprise.inject.se.SeContainerInitializer; -import static org.hamcrest.MatcherAssert.assertThat; +import org.hamcrest.Matchers; +import org.jboss.weld.exceptions.DeploymentException; +import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; - -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; public class BadGaugeTest { diff --git a/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/BadGaugedBean.java b/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/BadGaugedBean.java index 387622228..810e70a0d 100644 --- a/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/BadGaugedBean.java +++ b/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/BadGaugedBean.java @@ -18,8 +18,6 @@ package io.helidon.microprofile.metrics; import org.eclipse.microprofile.metrics.MetricUnits; import org.eclipse.microprofile.metrics.annotation.Gauge; -import javax.enterprise.context.ApplicationScoped; - public class BadGaugedBean { @Gauge(unit = MetricUnits.NONE) diff --git a/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/MetricsTest.java b/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/MetricsTest.java index d95c75b5d..e297f2982 100644 --- a/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/MetricsTest.java +++ b/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/MetricsTest.java @@ -30,8 +30,8 @@ import org.eclipse.microprofile.metrics.Timer; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; -import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.number.OrderingComparison.greaterThan; diff --git a/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/ResourceWithIllegallyReusedMetrics.java b/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/ResourceWithIllegallyReusedMetrics.java index 3addd518b..528b71cc2 100644 --- a/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/ResourceWithIllegallyReusedMetrics.java +++ b/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/ResourceWithIllegallyReusedMetrics.java @@ -18,6 +18,7 @@ package io.helidon.microprofile.metrics; import javax.ws.rs.GET; import javax.ws.rs.Path; + import org.eclipse.microprofile.metrics.annotation.Counted; /** diff --git a/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/ResourceWithLegallyReusedMetrics.java b/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/ResourceWithLegallyReusedMetrics.java index f977f221b..1463a8a75 100644 --- a/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/ResourceWithLegallyReusedMetrics.java +++ b/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/ResourceWithLegallyReusedMetrics.java @@ -19,6 +19,7 @@ package io.helidon.microprofile.metrics; import javax.enterprise.context.RequestScoped; import javax.ws.rs.GET; import javax.ws.rs.Path; + import org.eclipse.microprofile.metrics.annotation.Counted; /** diff --git a/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/ResourceWithMixedReusability.java b/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/ResourceWithMixedReusability.java index ecaa57ac3..708452014 100644 --- a/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/ResourceWithMixedReusability.java +++ b/microprofile/metrics2/src/test/java/io/helidon/microprofile/metrics/ResourceWithMixedReusability.java @@ -18,6 +18,7 @@ package io.helidon.microprofile.metrics; import javax.ws.rs.GET; import javax.ws.rs.Path; + import org.eclipse.microprofile.metrics.annotation.Counted; /** diff --git a/microprofile/openapi/src/test/java/io/helidon/microprofile/openapi/BasicServerTest.java b/microprofile/openapi/src/test/java/io/helidon/microprofile/openapi/BasicServerTest.java index 53080e0b1..9e33e2445 100644 --- a/microprofile/openapi/src/test/java/io/helidon/microprofile/openapi/BasicServerTest.java +++ b/microprofile/openapi/src/test/java/io/helidon/microprofile/openapi/BasicServerTest.java @@ -17,16 +17,17 @@ package io.helidon.microprofile.openapi; import java.net.HttpURLConnection; +import java.util.Map; import io.helidon.common.http.MediaType; import io.helidon.microprofile.server.Server; -import java.util.Map; import org.junit.jupiter.api.AfterAll; -import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * Test that MP OpenAPI support works when retrieving the OpenAPI document * from the server's /openapi endpoint. diff --git a/microprofile/openapi/src/test/java/io/helidon/microprofile/openapi/TestApp.java b/microprofile/openapi/src/test/java/io/helidon/microprofile/openapi/TestApp.java index daf3f38b9..ea007363f 100644 --- a/microprofile/openapi/src/test/java/io/helidon/microprofile/openapi/TestApp.java +++ b/microprofile/openapi/src/test/java/io/helidon/microprofile/openapi/TestApp.java @@ -16,8 +16,8 @@ */ package io.helidon.microprofile.openapi; -import io.helidon.common.CollectionsHelper; import java.util.Set; + import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.PUT; @@ -26,10 +26,11 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Application; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; + +import io.helidon.common.CollectionsHelper; + import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.ExampleObject; -import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.eclipse.microprofile.openapi.annotations.parameters.RequestBody; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; diff --git a/microprofile/openapi/src/test/java/io/helidon/microprofile/openapi/TestUtil.java b/microprofile/openapi/src/test/java/io/helidon/microprofile/openapi/TestUtil.java index 5a3b0fb37..f7ae5b70d 100644 --- a/microprofile/openapi/src/test/java/io/helidon/microprofile/openapi/TestUtil.java +++ b/microprofile/openapi/src/test/java/io/helidon/microprofile/openapi/TestUtil.java @@ -22,14 +22,16 @@ import java.net.HttpURLConnection; import java.net.URL; import java.nio.CharBuffer; import java.nio.charset.Charset; +import java.util.Map; + import javax.ws.rs.core.Application; import io.helidon.common.http.MediaType; import io.helidon.microprofile.server.Server; -import java.util.Map; + +import org.yaml.snakeyaml.Yaml; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.yaml.snakeyaml.Yaml; /** * Useful utility methods during testing. diff --git a/microprofile/tests/tck/tck-opentracing/src/test/java/io/helidon/microprofile/opentracing/tck/OpentracingJavaMockTracerBuilder.java b/microprofile/tests/tck/tck-opentracing/src/test/java/io/helidon/microprofile/opentracing/tck/OpentracingJavaMockTracerBuilder.java index 1a267d0ab..e4e08fc21 100644 --- a/microprofile/tests/tck/tck-opentracing/src/test/java/io/helidon/microprofile/opentracing/tck/OpentracingJavaMockTracerBuilder.java +++ b/microprofile/tests/tck/tck-opentracing/src/test/java/io/helidon/microprofile/opentracing/tck/OpentracingJavaMockTracerBuilder.java @@ -23,7 +23,6 @@ import io.helidon.tracing.TracerBuilder; import io.opentracing.Tracer; import io.opentracing.mock.MockTracer; -import io.opentracing.util.GlobalTracer; public final class OpentracingJavaMockTracerBuilder implements TracerBuilder { diff --git a/microprofile/tracing/src/test/java/io/helidon/microprofile/tracing/TracingTest.java b/microprofile/tracing/src/test/java/io/helidon/microprofile/tracing/TracingTest.java index 374ca7e86..ef773f657 100644 --- a/microprofile/tracing/src/test/java/io/helidon/microprofile/tracing/TracingTest.java +++ b/microprofile/tracing/src/test/java/io/helidon/microprofile/tracing/TracingTest.java @@ -32,7 +32,6 @@ import javax.ws.rs.core.Response; import io.helidon.common.CollectionsHelper; import io.helidon.microprofile.server.Server; -import io.helidon.tracing.jersey.client.ClientTracingFilter; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/openapi/src/test/java/io/helidon/openapi/OpenAPIConfigTest.java b/openapi/src/test/java/io/helidon/openapi/OpenAPIConfigTest.java index 2360c340c..1cb7dffb9 100644 --- a/openapi/src/test/java/io/helidon/openapi/OpenAPIConfigTest.java +++ b/openapi/src/test/java/io/helidon/openapi/OpenAPIConfigTest.java @@ -24,13 +24,12 @@ import io.helidon.config.ConfigSources; import io.helidon.openapi.internal.OpenAPIConfigImpl; import io.smallrye.openapi.api.OpenApiConfig; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.is; -import org.junit.jupiter.api.Test; - /** * */ diff --git a/openapi/src/test/java/io/helidon/openapi/ServerModelReaderTest.java b/openapi/src/test/java/io/helidon/openapi/ServerModelReaderTest.java index 05ca4dbc4..a4efae521 100644 --- a/openapi/src/test/java/io/helidon/openapi/ServerModelReaderTest.java +++ b/openapi/src/test/java/io/helidon/openapi/ServerModelReaderTest.java @@ -17,6 +17,7 @@ package io.helidon.openapi; import java.net.HttpURLConnection; + import javax.json.JsonException; import javax.json.JsonString; import javax.json.JsonStructure; @@ -29,10 +30,13 @@ import io.helidon.openapi.test.MyModelReader; import io.helidon.webserver.WebServer; import org.junit.jupiter.api.AfterAll; -import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * Makes sure that the app-supplied model reader participates in constructing * the OpenAPI model. diff --git a/openapi/src/test/java/io/helidon/openapi/ServerTest.java b/openapi/src/test/java/io/helidon/openapi/ServerTest.java index 485c9ee77..fde69026d 100644 --- a/openapi/src/test/java/io/helidon/openapi/ServerTest.java +++ b/openapi/src/test/java/io/helidon/openapi/ServerTest.java @@ -25,9 +25,12 @@ import io.helidon.config.Config; import io.helidon.webserver.WebServer; import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Starts a server with the default OpenAPI endpoint to test a static OpenAPI diff --git a/openapi/src/test/java/io/helidon/openapi/TestUtil.java b/openapi/src/test/java/io/helidon/openapi/TestUtil.java index b4e8864f7..b686aaec3 100644 --- a/openapi/src/test/java/io/helidon/openapi/TestUtil.java +++ b/openapi/src/test/java/io/helidon/openapi/TestUtil.java @@ -16,17 +16,23 @@ */ package io.helidon.openapi; +import java.io.IOException; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; import java.nio.CharBuffer; import java.nio.charset.Charset; +import java.util.Collections; import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.json.Json; import javax.json.JsonReader; +import javax.json.JsonReaderFactory; import javax.json.JsonStructure; import io.helidon.common.http.Http; @@ -37,16 +43,12 @@ import io.helidon.config.yaml.internal.YamlConfigParser; import io.helidon.webserver.Routing; import io.helidon.webserver.ServerConfiguration; import io.helidon.webserver.WebServer; -import java.io.IOException; -import java.util.Collections; -import java.util.logging.Logger; -import javax.json.Json; -import javax.json.JsonReaderFactory; - -import static org.junit.jupiter.api.Assertions.*; import org.yaml.snakeyaml.Yaml; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * Various utility methods used by OpenAPI tests. */ diff --git a/pom.xml b/pom.xml index 135accb0f..9c76338f9 100644 --- a/pom.xml +++ b/pom.xml @@ -198,8 +198,9 @@ maven-javadoc-plugin ${version.plugin.javadoc} - 8 - 8 + 11 + 11 + false true @@ -322,7 +323,6 @@ --add-stylesheet ${top.parent.basedir}/etc/helidon-javadoc.css - **/module-info.java target/**/*.java diff --git a/security/integration/jersey/src/main/java/io/helidon/security/integration/jersey/InputStreamPublisher.java b/security/integration/jersey/src/main/java/io/helidon/security/integration/jersey/InputStreamPublisher.java index 30b3266d8..3d83b52af 100644 --- a/security/integration/jersey/src/main/java/io/helidon/security/integration/jersey/InputStreamPublisher.java +++ b/security/integration/jersey/src/main/java/io/helidon/security/integration/jersey/InputStreamPublisher.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,10 +20,9 @@ import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Flow; import java.util.concurrent.atomic.AtomicBoolean; -import io.helidon.common.reactive.Flow; - /** * Publisher that reads data from an input stream and publishes them as {@link ByteBuffer} events. */ diff --git a/security/integration/jersey/src/main/java/io/helidon/security/integration/jersey/SecurityFilterCommon.java b/security/integration/jersey/src/main/java/io/helidon/security/integration/jersey/SecurityFilterCommon.java index e642170e2..729820330 100644 --- a/security/integration/jersey/src/main/java/io/helidon/security/integration/jersey/SecurityFilterCommon.java +++ b/security/integration/jersey/src/main/java/io/helidon/security/integration/jersey/SecurityFilterCommon.java @@ -20,6 +20,7 @@ import java.nio.ByteBuffer; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.Flow; import java.util.function.Function; import java.util.logging.Logger; @@ -29,7 +30,6 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import io.helidon.common.CollectionsHelper; -import io.helidon.common.reactive.Flow; import io.helidon.config.Config; import io.helidon.security.AuthenticationResponse; import io.helidon.security.AuthorizationResponse; diff --git a/security/integration/jersey/src/main/java/io/helidon/security/integration/jersey/SingleSubscriberHolder.java b/security/integration/jersey/src/main/java/io/helidon/security/integration/jersey/SingleSubscriberHolder.java index 2fb40a980..4f856e2e0 100644 --- a/security/integration/jersey/src/main/java/io/helidon/security/integration/jersey/SingleSubscriberHolder.java +++ b/security/integration/jersey/src/main/java/io/helidon/security/integration/jersey/SingleSubscriberHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,11 +18,10 @@ package io.helidon.security.integration.jersey; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Flow; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; -import io.helidon.common.reactive.Flow; - /** * A subscriber container that accepts only a single, one-time subscriber registration. */ diff --git a/security/integration/jersey/src/main/java/io/helidon/security/integration/jersey/SubscriberInputStream.java b/security/integration/jersey/src/main/java/io/helidon/security/integration/jersey/SubscriberInputStream.java index 8cb733f16..b7e6f5b79 100644 --- a/security/integration/jersey/src/main/java/io/helidon/security/integration/jersey/SubscriberInputStream.java +++ b/security/integration/jersey/src/main/java/io/helidon/security/integration/jersey/SubscriberInputStream.java @@ -21,8 +21,7 @@ import java.io.InputStream; import java.nio.ByteBuffer; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; - -import io.helidon.common.reactive.Flow; +import java.util.concurrent.Flow; /** * An {@link Flow.Subscriber subscriber} that can subscribe to a source of {@code ByteBuffer} data chunks and then make diff --git a/security/integration/jersey/src/main/java/io/helidon/security/integration/jersey/SubscriberOutputStream.java b/security/integration/jersey/src/main/java/io/helidon/security/integration/jersey/SubscriberOutputStream.java index 38ca7bfb6..dac924f97 100644 --- a/security/integration/jersey/src/main/java/io/helidon/security/integration/jersey/SubscriberOutputStream.java +++ b/security/integration/jersey/src/main/java/io/helidon/security/integration/jersey/SubscriberOutputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,10 +19,9 @@ package io.helidon.security.integration.jersey; import java.io.IOException; import java.io.OutputStream; import java.nio.ByteBuffer; +import java.util.concurrent.Flow; import java.util.function.Consumer; -import io.helidon.common.reactive.Flow; - /** * An {@link Flow.Subscriber subscriber} that can subscribe to a source of {@code ByteBuffer} data chunks and then * write these data chunks into an underlying {@link OutputStream output stream}. diff --git a/security/integration/jersey/src/test/java/io/helidon/security/integration/jersey/EntityModificationTest.java b/security/integration/jersey/src/test/java/io/helidon/security/integration/jersey/EntityModificationTest.java index 3509f46a5..f2dcaa23c 100644 --- a/security/integration/jersey/src/test/java/io/helidon/security/integration/jersey/EntityModificationTest.java +++ b/security/integration/jersey/src/test/java/io/helidon/security/integration/jersey/EntityModificationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ package io.helidon.security.integration.jersey; import java.nio.ByteBuffer; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Flow; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.atomic.AtomicReference; import java.util.logging.ConsoleHandler; @@ -37,7 +38,6 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.SubmissionPublisher; import io.helidon.security.AuthenticationResponse; import io.helidon.security.Principal; diff --git a/security/integration/jersey/src/test/java/io/helidon/security/integration/jersey/InputStreamPublisherTest.java b/security/integration/jersey/src/test/java/io/helidon/security/integration/jersey/InputStreamPublisherTest.java index 23cb3682b..982fd62e5 100644 --- a/security/integration/jersey/src/test/java/io/helidon/security/integration/jersey/InputStreamPublisherTest.java +++ b/security/integration/jersey/src/test/java/io/helidon/security/integration/jersey/InputStreamPublisherTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,10 +22,9 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Flow; import java.util.concurrent.TimeUnit; -import io.helidon.common.reactive.Flow; - import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; diff --git a/security/integration/webserver/src/main/java/io/helidon/security/integration/webserver/SecurityHandler.java b/security/integration/webserver/src/main/java/io/helidon/security/integration/webserver/SecurityHandler.java index 668321602..a832af311 100644 --- a/security/integration/webserver/src/main/java/io/helidon/security/integration/webserver/SecurityHandler.java +++ b/security/integration/webserver/src/main/java/io/helidon/security/integration/webserver/SecurityHandler.java @@ -30,6 +30,7 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Flow; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; @@ -40,7 +41,6 @@ import io.helidon.common.CollectionsHelper; import io.helidon.common.OptionalHelper; import io.helidon.common.http.DataChunk; import io.helidon.common.http.Http; -import io.helidon.common.reactive.Flow; import io.helidon.config.Config; import io.helidon.security.AuditEvent; import io.helidon.security.AuthenticationResponse; diff --git a/security/integration/webserver/src/test/java/io/helidon/security/integration/webserver/WebSecurityEntityModificationTest.java b/security/integration/webserver/src/test/java/io/helidon/security/integration/webserver/WebSecurityEntityModificationTest.java index 29c4f5956..bd0f2ef34 100644 --- a/security/integration/webserver/src/test/java/io/helidon/security/integration/webserver/WebSecurityEntityModificationTest.java +++ b/security/integration/webserver/src/test/java/io/helidon/security/integration/webserver/WebSecurityEntityModificationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Flow; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.TimeUnit; import java.util.logging.ConsoleHandler; @@ -32,7 +33,6 @@ import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.Entity; import javax.ws.rs.core.Response; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.SubmissionPublisher; import io.helidon.security.AuthenticationResponse; import io.helidon.security.Principal; diff --git a/security/providers/abac/src/test/java/io/helidon/security/providers/abac/Attrib1.java b/security/providers/abac/src/test/java/io/helidon/security/providers/abac/Attrib1.java index 2ef50dde4..7ccdad29d 100644 --- a/security/providers/abac/src/test/java/io/helidon/security/providers/abac/Attrib1.java +++ b/security/providers/abac/src/test/java/io/helidon/security/providers/abac/Attrib1.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,8 +23,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import io.helidon.security.providers.abac.AbacAnnotation; - /** * TODO javadoc. */ diff --git a/security/providers/common/src/test/java/io/helidon/security/providers/common/OutboundTargetTest.java b/security/providers/common/src/test/java/io/helidon/security/providers/common/OutboundTargetTest.java index d4ef9e187..2fb3ba122 100644 --- a/security/providers/common/src/test/java/io/helidon/security/providers/common/OutboundTargetTest.java +++ b/security/providers/common/src/test/java/io/helidon/security/providers/common/OutboundTargetTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,6 @@ package io.helidon.security.providers.common; import io.helidon.config.Config; import io.helidon.config.ConfigSources; -import io.helidon.security.providers.common.OutboundTarget; import org.junit.jupiter.api.Test; diff --git a/security/security/src/main/java/io/helidon/security/Entity.java b/security/security/src/main/java/io/helidon/security/Entity.java index d0c0cd402..0ff447497 100644 --- a/security/security/src/main/java/io/helidon/security/Entity.java +++ b/security/security/src/main/java/io/helidon/security/Entity.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,10 +17,9 @@ package io.helidon.security; import java.nio.ByteBuffer; +import java.util.concurrent.Flow; import java.util.function.Function; -import io.helidon.common.reactive.Flow; - /** * Access to message content (entity). * Use cases: diff --git a/security/security/src/test/java/io/helidon/security/EntityHandlingTest.java b/security/security/src/test/java/io/helidon/security/EntityHandlingTest.java index d1d35e9a0..1c5788ff9 100644 --- a/security/security/src/test/java/io/helidon/security/EntityHandlingTest.java +++ b/security/security/src/test/java/io/helidon/security/EntityHandlingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,9 +21,9 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.Optional; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Flow; import io.helidon.common.OptionalHelper; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.SubmissionPublisher; import io.helidon.security.providers.ProviderForTesting; diff --git a/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/Http2SslTest.java b/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/Http2SslTest.java index bc596621b..03ba7fdf7 100644 --- a/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/Http2SslTest.java +++ b/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/Http2SslTest.java @@ -23,7 +23,6 @@ import okhttp3.Protocol; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; - import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/MainTest.java b/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/MainTest.java index c0343c509..0eae90b05 100644 --- a/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/MainTest.java +++ b/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/MainTest.java @@ -18,7 +18,7 @@ package io.helidon.tests.apps.bookstore.se; import javax.json.Json; import javax.json.JsonObject; -import javax.json.JsonReader;; +import javax.json.JsonReader; import io.helidon.webserver.WebServer; @@ -26,7 +26,6 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; - import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -34,6 +33,8 @@ import org.junit.jupiter.api.Test; import static io.helidon.tests.apps.bookstore.se.TestServer.APPLICATION_JSON; +; + public class MainTest { private static WebServer webServer; diff --git a/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/SslTest.java b/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/SslTest.java index 49eb5e80e..5d6c10228 100644 --- a/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/SslTest.java +++ b/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/SslTest.java @@ -22,7 +22,6 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; - import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/TestServer.java b/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/TestServer.java index 9b60a7505..5f1dbeb48 100644 --- a/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/TestServer.java +++ b/tests/apps/bookstore/bookstore-se/src/test/java/io/helidon/tests/apps/bookstore/se/TestServer.java @@ -16,9 +16,6 @@ package io.helidon.tests.apps.bookstore.se; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -30,6 +27,10 @@ import java.util.Arrays; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; + import io.helidon.webserver.WebServer; import okhttp3.Interceptor; @@ -38,7 +39,6 @@ import okhttp3.OkHttpClient; import okhttp3.Protocol; import okhttp3.Request; import okhttp3.Response; - import org.junit.jupiter.api.Assertions; /** diff --git a/tests/functional/bookstore/src/test/java/io/helidon/tests/apps/bookstore/se/MainTest.java b/tests/functional/bookstore/src/test/java/io/helidon/tests/apps/bookstore/se/MainTest.java index d223c17c3..89cb7a1ec 100644 --- a/tests/functional/bookstore/src/test/java/io/helidon/tests/apps/bookstore/se/MainTest.java +++ b/tests/functional/bookstore/src/test/java/io/helidon/tests/apps/bookstore/se/MainTest.java @@ -16,11 +16,6 @@ package io.helidon.tests.apps.bookstore.se; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.stream.JsonParser; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -35,6 +30,12 @@ import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; +import javax.json.Json; +import javax.json.JsonArray; +import javax.json.JsonObject; +import javax.json.JsonReader; +import javax.json.stream.JsonParser; + import com.oracle.bedrock.runtime.Application; import com.oracle.bedrock.runtime.LocalPlatform; import com.oracle.bedrock.runtime.options.Arguments; @@ -45,8 +46,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; class MainTest { diff --git a/tests/functional/context-propagation/src/test/java/io/helidon/tests/functional/context/hello/HelloTest.java b/tests/functional/context-propagation/src/test/java/io/helidon/tests/functional/context/hello/HelloTest.java index bcf6fbe5a..2be96f275 100644 --- a/tests/functional/context-propagation/src/test/java/io/helidon/tests/functional/context/hello/HelloTest.java +++ b/tests/functional/context-propagation/src/test/java/io/helidon/tests/functional/context/hello/HelloTest.java @@ -16,14 +16,16 @@ package io.helidon.tests.functional.context.hello; +import java.io.IOException; +import java.util.logging.LogManager; + import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response; -import java.io.IOException; -import java.util.logging.LogManager; import io.helidon.microprofile.server.Server; + import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/tests/functional/jax-rs-subresource/src/main/java/io/helidon/tests/functional/jaxrs/subresource/MpSubResource.java b/tests/functional/jax-rs-subresource/src/main/java/io/helidon/tests/functional/jaxrs/subresource/MpSubResource.java index 8ff713a20..6c768514a 100644 --- a/tests/functional/jax-rs-subresource/src/main/java/io/helidon/tests/functional/jaxrs/subresource/MpSubResource.java +++ b/tests/functional/jax-rs-subresource/src/main/java/io/helidon/tests/functional/jaxrs/subresource/MpSubResource.java @@ -20,8 +20,6 @@ import javax.annotation.security.RolesAllowed; import javax.ws.rs.GET; import javax.ws.rs.Path; -import io.helidon.security.abac.role.RoleValidator; - /** * A sub-resource does not have a Path annotation. */ diff --git a/tests/integration/health/mp-disabled/src/test/java/io/helidon/tests/integration/health/mp/disabled/HealthDisabledMainTest.java b/tests/integration/health/mp-disabled/src/test/java/io/helidon/tests/integration/health/mp/disabled/HealthDisabledMainTest.java index efba3f388..73c2fad00 100644 --- a/tests/integration/health/mp-disabled/src/test/java/io/helidon/tests/integration/health/mp/disabled/HealthDisabledMainTest.java +++ b/tests/integration/health/mp-disabled/src/test/java/io/helidon/tests/integration/health/mp/disabled/HealthDisabledMainTest.java @@ -24,7 +24,6 @@ import javax.ws.rs.client.WebTarget; import io.helidon.microprofile.server.Server; import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/webserver/access-log/src/main/java/io/helidon/webserver/accesslog/SizeLogEntry.java b/webserver/access-log/src/main/java/io/helidon/webserver/accesslog/SizeLogEntry.java index be5430c50..e63dc41bf 100644 --- a/webserver/access-log/src/main/java/io/helidon/webserver/accesslog/SizeLogEntry.java +++ b/webserver/access-log/src/main/java/io/helidon/webserver/accesslog/SizeLogEntry.java @@ -15,11 +15,11 @@ */ package io.helidon.webserver.accesslog; +import java.util.concurrent.Flow; import java.util.concurrent.atomic.LongAdder; import io.helidon.common.http.ContextualRegistry; import io.helidon.common.http.DataChunk; -import io.helidon.common.reactive.Flow; import io.helidon.webserver.ServerRequest; import io.helidon.webserver.ServerResponse; diff --git a/webserver/access-log/src/test/java/io/helidon/webserver/accesslog/AccessLogSupportTest.java b/webserver/access-log/src/test/java/io/helidon/webserver/accesslog/AccessLogSupportTest.java index 824769314..5645ad1b5 100644 --- a/webserver/access-log/src/test/java/io/helidon/webserver/accesslog/AccessLogSupportTest.java +++ b/webserver/access-log/src/test/java/io/helidon/webserver/accesslog/AccessLogSupportTest.java @@ -16,7 +16,6 @@ package io.helidon.webserver.accesslog; -import java.time.Instant; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.Arrays; diff --git a/webserver/jersey/src/test/java/io/helidon/webserver/jersey/JerseyExampleMain.java b/webserver/jersey/src/test/java/io/helidon/webserver/jersey/JerseyExampleMain.java index b1ba0cd35..8dfe200f9 100644 --- a/webserver/jersey/src/test/java/io/helidon/webserver/jersey/JerseyExampleMain.java +++ b/webserver/jersey/src/test/java/io/helidon/webserver/jersey/JerseyExampleMain.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ import io.helidon.webserver.testsupport.LoggingTestUtils; import org.glassfish.jersey.apache.connector.ApacheConnectorProvider; import org.glassfish.jersey.client.ClientConfig; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.fail; /** * The JerseyExampleMain. diff --git a/webserver/jersey/src/test/java/io/helidon/webserver/jersey/JerseyExampleResource.java b/webserver/jersey/src/test/java/io/helidon/webserver/jersey/JerseyExampleResource.java index ab2f5b1ec..a08e03b5a 100644 --- a/webserver/jersey/src/test/java/io/helidon/webserver/jersey/JerseyExampleResource.java +++ b/webserver/jersey/src/test/java/io/helidon/webserver/jersey/JerseyExampleResource.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.stream.Collectors; -import java.util.stream.IntStream; import javax.inject.Inject; import javax.inject.Named; @@ -44,7 +43,7 @@ import io.helidon.webserver.ServerResponse; import io.opentracing.SpanContext; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The JerseyExampleResource. diff --git a/webserver/test-support/src/main/java/io/helidon/webserver/testsupport/MediaPublisher.java b/webserver/test-support/src/main/java/io/helidon/webserver/testsupport/MediaPublisher.java index 7d6ca1c49..f2734f322 100644 --- a/webserver/test-support/src/main/java/io/helidon/webserver/testsupport/MediaPublisher.java +++ b/webserver/test-support/src/main/java/io/helidon/webserver/testsupport/MediaPublisher.java @@ -20,10 +20,10 @@ import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.Optional; +import java.util.concurrent.Flow; import io.helidon.common.http.DataChunk; import io.helidon.common.http.MediaType; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.Multi; /** diff --git a/webserver/test-support/src/main/java/io/helidon/webserver/testsupport/TestClient.java b/webserver/test-support/src/main/java/io/helidon/webserver/testsupport/TestClient.java index fa0ad0db6..2d51ecc15 100644 --- a/webserver/test-support/src/main/java/io/helidon/webserver/testsupport/TestClient.java +++ b/webserver/test-support/src/main/java/io/helidon/webserver/testsupport/TestClient.java @@ -27,6 +27,7 @@ import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Flow; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Supplier; @@ -34,7 +35,6 @@ import java.util.function.Supplier; import io.helidon.common.http.DataChunk; import io.helidon.common.http.Http; import io.helidon.common.http.ReadOnlyParameters; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.Single; import io.helidon.webserver.BareRequest; import io.helidon.webserver.BareResponse; diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/BareRequest.java b/webserver/webserver/src/main/java/io/helidon/webserver/BareRequest.java index 56bd701c6..6dea5a13d 100644 --- a/webserver/webserver/src/main/java/io/helidon/webserver/BareRequest.java +++ b/webserver/webserver/src/main/java/io/helidon/webserver/BareRequest.java @@ -19,10 +19,10 @@ package io.helidon.webserver; import java.net.URI; import java.util.List; import java.util.Map; +import java.util.concurrent.Flow; import io.helidon.common.http.DataChunk; import io.helidon.common.http.Http; -import io.helidon.common.reactive.Flow; /** * Bare (minimal) representation of HTTP Request. Used by {@link WebServer WebServer} implementations to invoke diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/BareRequestImpl.java b/webserver/webserver/src/main/java/io/helidon/webserver/BareRequestImpl.java index 940aed2ae..c84bd6981 100644 --- a/webserver/webserver/src/main/java/io/helidon/webserver/BareRequestImpl.java +++ b/webserver/webserver/src/main/java/io/helidon/webserver/BareRequestImpl.java @@ -23,12 +23,12 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.Flow; import javax.net.ssl.SSLEngine; import io.helidon.common.http.DataChunk; import io.helidon.common.http.Http; -import io.helidon.common.reactive.Flow; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.http.HttpRequest; diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/BareResponse.java b/webserver/webserver/src/main/java/io/helidon/webserver/BareResponse.java index 2219bb810..fae01b0b4 100644 --- a/webserver/webserver/src/main/java/io/helidon/webserver/BareResponse.java +++ b/webserver/webserver/src/main/java/io/helidon/webserver/BareResponse.java @@ -20,10 +20,10 @@ import java.nio.ByteBuffer; import java.util.List; import java.util.Map; import java.util.concurrent.CompletionStage; +import java.util.concurrent.Flow; import io.helidon.common.http.DataChunk; import io.helidon.common.http.Http; -import io.helidon.common.reactive.Flow; /** * Bare (minimal) representation of HTTP Response. Used by {@link WebServer WebServer} implementations to invoke diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/BareResponseImpl.java b/webserver/webserver/src/main/java/io/helidon/webserver/BareResponseImpl.java index 893803dcb..b8ff5fe92 100644 --- a/webserver/webserver/src/main/java/io/helidon/webserver/BareResponseImpl.java +++ b/webserver/webserver/src/main/java/io/helidon/webserver/BareResponseImpl.java @@ -21,6 +21,7 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; +import java.util.concurrent.Flow; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.BooleanSupplier; import java.util.logging.Level; @@ -28,7 +29,6 @@ import java.util.logging.Logger; import io.helidon.common.http.DataChunk; import io.helidon.common.http.Http; -import io.helidon.common.reactive.Flow; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelFuture; diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/ClassPathContentHandler.java b/webserver/webserver/src/main/java/io/helidon/webserver/ClassPathContentHandler.java index cdeae4ec0..d33eff19b 100644 --- a/webserver/webserver/src/main/java/io/helidon/webserver/ClassPathContentHandler.java +++ b/webserver/webserver/src/main/java/io/helidon/webserver/ClassPathContentHandler.java @@ -31,13 +31,13 @@ import java.nio.file.StandardCopyOption; import java.time.Instant; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Flow; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.logging.Logger; import io.helidon.common.http.DataChunk; import io.helidon.common.http.Http; -import io.helidon.common.reactive.Flow; /** * Handles static content from the classpath. diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/FormParamsSupport.java b/webserver/webserver/src/main/java/io/helidon/webserver/FormParamsSupport.java index 179050b7b..7880f9cda 100644 --- a/webserver/webserver/src/main/java/io/helidon/webserver/FormParamsSupport.java +++ b/webserver/webserver/src/main/java/io/helidon/webserver/FormParamsSupport.java @@ -17,11 +17,11 @@ package io.helidon.webserver; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import java.util.concurrent.Flow.Publisher; import io.helidon.common.http.DataChunk; import io.helidon.common.http.FormParams; import io.helidon.common.http.MediaType; -import io.helidon.common.reactive.Flow.Publisher; import io.helidon.common.reactive.Single; import io.helidon.media.common.ContentReaders; diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/HttpRequestScopedPublisher.java b/webserver/webserver/src/main/java/io/helidon/webserver/HttpRequestScopedPublisher.java index aa2a1f3c5..5c41a9565 100644 --- a/webserver/webserver/src/main/java/io/helidon/webserver/HttpRequestScopedPublisher.java +++ b/webserver/webserver/src/main/java/io/helidon/webserver/HttpRequestScopedPublisher.java @@ -51,7 +51,7 @@ class HttpRequestScopedPublisher extends OriginThreadPublisher { * Create new input stream publisher that reads data from a supplied input stream and publishes them a single subscriber. *

* Note that this implementation does not rely on any asynchronous processing and its business logic is always invoked - * on the subscriber thread (as part of {@link #subscribe(io.helidon.common.reactive.Flow.Subscriber)} and - * {@link io.helidon.common.reactive.Flow.Subscription#request(long)} + * on the subscriber thread (as part of {@link #subscribe(java.util.concurrent.Flow.Subscriber)} and + * {@link java.util.concurrent.Flow.Subscription#request(long)} * method calls). * * @param inputStream underlying input stream to be used to read the data tu be published as events. diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/Request.java b/webserver/webserver/src/main/java/io/helidon/webserver/Request.java index df3d1cf98..464ef55ff 100644 --- a/webserver/webserver/src/main/java/io/helidon/webserver/Request.java +++ b/webserver/webserver/src/main/java/io/helidon/webserver/Request.java @@ -32,6 +32,7 @@ import java.util.Objects; import java.util.StringTokenizer; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; +import java.util.concurrent.Flow; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.Function; @@ -44,7 +45,6 @@ import io.helidon.common.http.Http; import io.helidon.common.http.MediaType; import io.helidon.common.http.Parameters; import io.helidon.common.http.Reader; -import io.helidon.common.reactive.Flow; import io.helidon.media.common.ContentReaders; import io.helidon.tracing.config.SpanTracingConfig; import io.helidon.tracing.config.TracingConfigUtil; diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/Response.java b/webserver/webserver/src/main/java/io/helidon/webserver/Response.java index 69488d502..8f50d3b98 100644 --- a/webserver/webserver/src/main/java/io/helidon/webserver/Response.java +++ b/webserver/webserver/src/main/java/io/helidon/webserver/Response.java @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.Objects; import java.util.Optional; import java.util.concurrent.CompletionStage; +import java.util.concurrent.Flow; import java.util.function.Function; import java.util.function.Predicate; @@ -36,7 +37,6 @@ import io.helidon.common.OptionalHelper; import io.helidon.common.http.DataChunk; import io.helidon.common.http.Http; import io.helidon.common.http.MediaType; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.Single; import io.helidon.media.common.ContentWriters; import io.helidon.tracing.config.SpanTracingConfig; diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/SendHeadersFirstPublisher.java b/webserver/webserver/src/main/java/io/helidon/webserver/SendHeadersFirstPublisher.java index f1f215ce8..9e6a63847 100644 --- a/webserver/webserver/src/main/java/io/helidon/webserver/SendHeadersFirstPublisher.java +++ b/webserver/webserver/src/main/java/io/helidon/webserver/SendHeadersFirstPublisher.java @@ -17,8 +17,7 @@ package io.helidon.webserver; import java.util.Objects; - -import io.helidon.common.reactive.Flow; +import java.util.concurrent.Flow; import io.opentracing.Span; diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/ServerResponse.java b/webserver/webserver/src/main/java/io/helidon/webserver/ServerResponse.java index 22b67ca5d..b161feedf 100644 --- a/webserver/webserver/src/main/java/io/helidon/webserver/ServerResponse.java +++ b/webserver/webserver/src/main/java/io/helidon/webserver/ServerResponse.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ package io.helidon.webserver; import java.nio.ByteBuffer; import java.util.concurrent.CompletionStage; +import java.util.concurrent.Flow; import java.util.function.Function; import java.util.function.Predicate; @@ -25,7 +26,6 @@ import io.helidon.common.http.AlreadyCompletedException; import io.helidon.common.http.DataChunk; import io.helidon.common.http.Http; import io.helidon.common.http.MediaType; -import io.helidon.common.reactive.Flow; /** * Represents HTTP Response. diff --git a/webserver/webserver/src/test/java/io/helidon/webserver/BytesReuseTest.java b/webserver/webserver/src/test/java/io/helidon/webserver/BytesReuseTest.java index 000115db1..196ec3a79 100644 --- a/webserver/webserver/src/test/java/io/helidon/webserver/BytesReuseTest.java +++ b/webserver/webserver/src/test/java/io/helidon/webserver/BytesReuseTest.java @@ -23,6 +23,8 @@ import java.util.LinkedList; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.Executors; +import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -33,8 +35,6 @@ import java.util.logging.Logger; import io.helidon.common.InputStreamHelper; import io.helidon.common.http.DataChunk; import io.helidon.common.http.Http; -import io.helidon.common.reactive.Flow.Publisher; -import io.helidon.common.reactive.Flow.Subscription; import io.helidon.common.reactive.Multi; import io.helidon.webserver.utils.SocketHttpClient; diff --git a/webserver/webserver/src/test/java/io/helidon/webserver/ContentCharsetTest.java b/webserver/webserver/src/test/java/io/helidon/webserver/ContentCharsetTest.java index e5db2cff9..652c505ea 100644 --- a/webserver/webserver/src/test/java/io/helidon/webserver/ContentCharsetTest.java +++ b/webserver/webserver/src/test/java/io/helidon/webserver/ContentCharsetTest.java @@ -30,7 +30,7 @@ import static io.helidon.common.CollectionsHelper.listOf; import static io.helidon.common.CollectionsHelper.mapOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/webserver/webserver/src/test/java/io/helidon/webserver/EncodingTest.java b/webserver/webserver/src/test/java/io/helidon/webserver/EncodingTest.java index 5f3e97eb9..e98fa6e1d 100644 --- a/webserver/webserver/src/test/java/io/helidon/webserver/EncodingTest.java +++ b/webserver/webserver/src/test/java/io/helidon/webserver/EncodingTest.java @@ -24,6 +24,7 @@ import java.util.logging.Logger; import io.helidon.common.http.Http; import io.helidon.webserver.utils.SocketHttpClient; + import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/webserver/webserver/src/test/java/io/helidon/webserver/FormParamsSupportTest.java b/webserver/webserver/src/test/java/io/helidon/webserver/FormParamsSupportTest.java index 63bd96ca9..d5685a6c3 100644 --- a/webserver/webserver/src/test/java/io/helidon/webserver/FormParamsSupportTest.java +++ b/webserver/webserver/src/test/java/io/helidon/webserver/FormParamsSupportTest.java @@ -17,9 +17,7 @@ package io.helidon.webserver; import java.io.IOException; import java.io.InputStreamReader; -import java.io.OutputStream; import java.io.OutputStreamWriter; -import java.io.UnsupportedEncodingException; import java.net.HttpURLConnection; import java.net.URL; import java.nio.CharBuffer; @@ -35,8 +33,8 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; diff --git a/webserver/webserver/src/test/java/io/helidon/webserver/HashRequestHeadersTest.java b/webserver/webserver/src/test/java/io/helidon/webserver/HashRequestHeadersTest.java index 0331b8b0e..2bc4b9abf 100644 --- a/webserver/webserver/src/test/java/io/helidon/webserver/HashRequestHeadersTest.java +++ b/webserver/webserver/src/test/java/io/helidon/webserver/HashRequestHeadersTest.java @@ -31,13 +31,13 @@ import io.helidon.common.http.MediaType; import io.helidon.common.http.Parameters; import org.hamcrest.number.IsCloseTo; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsIterableContainingInOrder.contains; import static org.hamcrest.core.IsCollectionContaining.hasItems; -import org.junit.jupiter.api.Assertions; /** * Tests {@link HashRequestHeaders}. diff --git a/webserver/webserver/src/test/java/io/helidon/webserver/NettyWebServerTest.java b/webserver/webserver/src/test/java/io/helidon/webserver/NettyWebServerTest.java index ee901d1c2..4ba038503 100644 --- a/webserver/webserver/src/test/java/io/helidon/webserver/NettyWebServerTest.java +++ b/webserver/webserver/src/test/java/io/helidon/webserver/NettyWebServerTest.java @@ -19,19 +19,19 @@ package io.helidon.webserver; import java.net.InetAddress; import java.security.SecureRandom; import java.util.Collections; -import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiConsumer; import java.util.logging.Level; import java.util.logging.Logger; import io.helidon.common.http.DataChunk; import io.helidon.common.http.Http; -import io.helidon.common.reactive.Flow.Subscription; import io.helidon.common.reactive.Multi; import io.helidon.common.reactive.SubmissionPublisher; diff --git a/webserver/webserver/src/test/java/io/helidon/webserver/PlainTest.java b/webserver/webserver/src/test/java/io/helidon/webserver/PlainTest.java index 6afd9d5d4..bfde80b6b 100644 --- a/webserver/webserver/src/test/java/io/helidon/webserver/PlainTest.java +++ b/webserver/webserver/src/test/java/io/helidon/webserver/PlainTest.java @@ -18,7 +18,6 @@ package io.helidon.webserver; import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.TimeUnit; diff --git a/webserver/webserver/src/test/java/io/helidon/webserver/RequestContentTest.java b/webserver/webserver/src/test/java/io/helidon/webserver/RequestContentTest.java index d9f497f0d..9834cdfb9 100644 --- a/webserver/webserver/src/test/java/io/helidon/webserver/RequestContentTest.java +++ b/webserver/webserver/src/test/java/io/helidon/webserver/RequestContentTest.java @@ -22,19 +22,20 @@ import java.time.LocalDate; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CompletionStage; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.Subscriber; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.ForkJoinPool; -import java.util.concurrent.CompletionStage; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import io.helidon.common.http.DataChunk; -import io.helidon.common.reactive.Flow.Publisher; -import io.helidon.common.reactive.Flow.Subscriber; -import io.helidon.common.reactive.Flow.Subscription; import io.helidon.common.reactive.Multi; +import io.helidon.common.reactive.Single; import io.helidon.common.reactive.SubmissionPublisher; import io.helidon.media.common.ContentReaders; import io.helidon.webserver.utils.TestUtils; @@ -53,7 +54,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import io.helidon.common.reactive.Single; /** * The RequestContentTest. diff --git a/webserver/webserver/src/test/java/io/helidon/webserver/RequestTestStub.java b/webserver/webserver/src/test/java/io/helidon/webserver/RequestTestStub.java index d5b6450e5..41b9a9108 100644 --- a/webserver/webserver/src/test/java/io/helidon/webserver/RequestTestStub.java +++ b/webserver/webserver/src/test/java/io/helidon/webserver/RequestTestStub.java @@ -18,7 +18,6 @@ package io.helidon.webserver; import java.net.URI; - import io.opentracing.Span; import io.opentracing.SpanContext; import io.opentracing.Tracer; diff --git a/webserver/webserver/src/test/java/io/helidon/webserver/ResponseTest.java b/webserver/webserver/src/test/java/io/helidon/webserver/ResponseTest.java index 1a848170f..e97809628 100644 --- a/webserver/webserver/src/test/java/io/helidon/webserver/ResponseTest.java +++ b/webserver/webserver/src/test/java/io/helidon/webserver/ResponseTest.java @@ -23,11 +23,12 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; +import java.util.concurrent.Flow; import io.helidon.common.http.DataChunk; import io.helidon.common.http.Http; import io.helidon.common.http.MediaType; -import io.helidon.common.reactive.Flow; +import io.helidon.common.reactive.Single; import io.opentracing.SpanContext; import org.junit.jupiter.api.Test; @@ -38,7 +39,6 @@ import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.hasSize; -import io.helidon.common.reactive.Single; /** * Tests {@link Response}. diff --git a/webserver/webserver/src/test/java/io/helidon/webserver/SendHeadersFirstPublisherTest.java b/webserver/webserver/src/test/java/io/helidon/webserver/SendHeadersFirstPublisherTest.java index 807c4ae46..66965f837 100644 --- a/webserver/webserver/src/test/java/io/helidon/webserver/SendHeadersFirstPublisherTest.java +++ b/webserver/webserver/src/test/java/io/helidon/webserver/SendHeadersFirstPublisherTest.java @@ -17,13 +17,14 @@ package io.helidon.webserver; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Flow; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import java.util.function.Consumer; -import io.helidon.common.reactive.Flow; import io.helidon.common.reactive.Multi; +import io.helidon.common.reactive.Single; import io.opentracing.mock.MockSpan; import io.opentracing.mock.MockTracer; @@ -35,7 +36,6 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import io.helidon.common.reactive.Single; /** * Tests {@link SendHeadersFirstPublisher}. diff --git a/webserver/webserver/src/test/java/io/helidon/webserver/ServerRequestReaderTest.java b/webserver/webserver/src/test/java/io/helidon/webserver/ServerRequestReaderTest.java index 4525e7078..e4a9604f7 100644 --- a/webserver/webserver/src/test/java/io/helidon/webserver/ServerRequestReaderTest.java +++ b/webserver/webserver/src/test/java/io/helidon/webserver/ServerRequestReaderTest.java @@ -16,16 +16,17 @@ package io.helidon.webserver; -import io.helidon.common.http.Reader; -import io.helidon.common.reactive.Multi; import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; +import io.helidon.common.http.Reader; +import io.helidon.common.reactive.Multi; + import org.junit.jupiter.api.Test; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.fail; /** diff --git a/webserver/webserver/src/test/java/io/helidon/webserver/TransferEncodingTest.java b/webserver/webserver/src/test/java/io/helidon/webserver/TransferEncodingTest.java index 0942db52d..877075213 100644 --- a/webserver/webserver/src/test/java/io/helidon/webserver/TransferEncodingTest.java +++ b/webserver/webserver/src/test/java/io/helidon/webserver/TransferEncodingTest.java @@ -24,6 +24,7 @@ import java.util.logging.Logger; import io.helidon.common.http.Http; import io.helidon.webserver.utils.SocketHttpClient; + import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test;