This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 0b30fc5ccacbe52f2264b54ffcdac162ed5f8bf9 Author: Benoit Tellier <[email protected]> AuthorDate: Thu Oct 28 09:49:13 2021 +0700 JAMES-3539 Avoid _ in package name: s/push_subscription/pushsubscription/ --- .../PushRequest.scala | 6 +++--- .../WebPushClient.scala | 14 +++++++------- .../DefaultWebPushClientTest.java | 2 +- .../PushRequestTest.scala | 2 +- .../PushServerExtension.scala | 10 +++++----- .../WebPushClientContract.scala | 10 +++++----- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/push_subscription/PushRequest.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/pushsubscription/PushRequest.scala similarity index 94% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/push_subscription/PushRequest.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/pushsubscription/PushRequest.scala index 159be9a..4525344 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/push_subscription/PushRequest.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/pushsubscription/PushRequest.scala @@ -17,13 +17,13 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.push_subscription +package org.apache.james.jmap.pushsubscription import com.google.common.base.CharMatcher import eu.timepit.refined import eu.timepit.refined.api.{Refined, Validate} -import org.apache.james.jmap.push_subscription.PushTTL.PushTTL -import org.apache.james.jmap.push_subscription.PushTopic.PushTopic +import org.apache.james.jmap.pushsubscription.PushTTL.PushTTL +import org.apache.james.jmap.pushsubscription.PushTopic.PushTopic object PushUrgency { def default: PushUrgency = Normal diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/push_subscription/WebPushClient.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/pushsubscription/WebPushClient.scala similarity index 94% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/push_subscription/WebPushClient.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/pushsubscription/WebPushClient.scala index fee3fd2..7c5ab59 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/push_subscription/WebPushClient.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/pushsubscription/WebPushClient.scala @@ -17,13 +17,17 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.push_subscription +package org.apache.james.jmap.pushsubscription + +import java.nio.charset.StandardCharsets +import java.time.Duration +import java.time.temporal.ChronoUnit import io.netty.buffer.Unpooled import io.netty.handler.codec.http.HttpResponseStatus import org.apache.james.jmap.api.model.PushSubscriptionServerURL -import org.apache.james.jmap.push_subscription.DefaultWebPushClient.{PUSH_SERVER_ERROR_RESPONSE_MAX_LENGTH, buildHttpClient} -import org.apache.james.jmap.push_subscription.WebPushClientHeader.{DEFAULT_TIMEOUT, MESSAGE_URGENCY, TIME_TO_LIVE, TOPIC} +import org.apache.james.jmap.pushsubscription.DefaultWebPushClient.buildHttpClient +import org.apache.james.jmap.pushsubscription.WebPushClientHeader.{DEFAULT_TIMEOUT, MESSAGE_URGENCY, TIME_TO_LIVE, TOPIC} import org.reactivestreams.Publisher import reactor.core.publisher.Mono import reactor.core.scala.publisher.SMono @@ -31,10 +35,6 @@ import reactor.netty.ByteBufMono import reactor.netty.http.client.{HttpClient, HttpClientResponse} import reactor.netty.resources.ConnectionProvider -import java.nio.charset.StandardCharsets -import java.time.Duration -import java.time.temporal.ChronoUnit - trait WebPushClient { def push(pushServerUrl: PushSubscriptionServerURL, request: PushRequest): Publisher[Unit] } diff --git a/server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/push_subscription/DefaultWebPushClientTest.java b/server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/pushsubscription/DefaultWebPushClientTest.java similarity index 97% rename from server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/push_subscription/DefaultWebPushClientTest.java rename to server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/pushsubscription/DefaultWebPushClientTest.java index 84a558e..13fac25 100644 --- a/server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/push_subscription/DefaultWebPushClientTest.java +++ b/server/protocols/jmap-rfc-8621/src/test/java/org/apache/james/jmap/pushsubscription/DefaultWebPushClientTest.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.push_subscription; +package org.apache.james.jmap.pushsubscription; import java.net.URL; diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/push_subscription/PushRequestTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/pushsubscription/PushRequestTest.scala similarity index 98% rename from server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/push_subscription/PushRequestTest.scala rename to server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/pushsubscription/PushRequestTest.scala index c274aa5..4d60fca 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/push_subscription/PushRequestTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/pushsubscription/PushRequestTest.scala @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.push_subscription +package org.apache.james.jmap.pushsubscription import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/push_subscription/PushServerExtension.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/pushsubscription/PushServerExtension.scala similarity index 98% rename from server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/push_subscription/PushServerExtension.scala rename to server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/pushsubscription/PushServerExtension.scala index 489bbba..5b18a11 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/push_subscription/PushServerExtension.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/pushsubscription/PushServerExtension.scala @@ -17,7 +17,11 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.push_subscription +package org.apache.james.jmap.pushsubscription + +import java.net.URL +import java.time.Clock +import java.util.UUID import org.junit.jupiter.api.extension.{AfterEachCallback, BeforeEachCallback, ExtensionContext, ParameterContext, ParameterResolver} import org.mockserver.configuration.ConfigurationProperties @@ -27,10 +31,6 @@ import org.mockserver.model.HttpRequest.request import org.mockserver.model.HttpResponse.response import org.mockserver.model.NottableString.{not, string} -import java.net.URL -import java.time.Clock -import java.util.UUID - class PushServerExtension extends BeforeEachCallback with AfterEachCallback with ParameterResolver { var mockServer: ClientAndServer = _ diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/push_subscription/WebPushClientContract.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/pushsubscription/WebPushClientContract.scala similarity index 97% rename from server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/push_subscription/WebPushClientContract.scala rename to server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/pushsubscription/WebPushClientContract.scala index dad63de..258fc58 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/push_subscription/WebPushClientContract.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/pushsubscription/WebPushClientContract.scala @@ -17,10 +17,13 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.push_subscription +package org.apache.james.jmap.pushsubscription + +import java.net.URL +import java.nio.charset.StandardCharsets import org.apache.james.jmap.api.model.PushSubscriptionServerURL -import org.apache.james.jmap.push_subscription.WebPushClientTestFixture.PUSH_REQUEST_SAMPLE +import org.apache.james.jmap.pushsubscription.WebPushClientTestFixture.PUSH_REQUEST_SAMPLE import org.assertj.core.api.Assertions.{assertThatCode, assertThatThrownBy} import org.junit.jupiter.api.Test import org.junit.jupiter.params.ParameterizedTest @@ -32,9 +35,6 @@ import org.mockserver.verify.VerificationTimes import reactor.core.scala.publisher.SMono import reactor.core.scheduler.Schedulers -import java.net.URL -import java.nio.charset.StandardCharsets - object WebPushClientTestFixture { val PUSH_CLIENT_CONFIGURATION: PushClientConfiguration = PushClientConfiguration( --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
