From 462cd089627d30cbd0eca62c3d96ee202738c0ff Mon Sep 17 00:00:00 2001 From: Lai Jiang Date: Mon, 19 Aug 2019 12:11:19 -0400 Subject: [PATCH] Rename packages in the prober (#233) Package names should not be plural. --- .../monitoring/blackbox/ProberModule.java | 8 +++--- .../monitoring/blackbox/ProbingSequence.java | 8 +++--- .../monitoring/blackbox/ProbingStep.java | 6 ++-- .../blackbox/connection/ProbingAction.java | 6 ++-- .../ConnectionException.java | 2 +- .../EppClientException.java | 2 +- .../FailureException.java | 2 +- .../UndeterminedStateException.java | 2 +- .../UnrecoverableStateException.java | 2 +- .../{handlers => handler}/ActionHandler.java | 8 +++--- .../EppActionHandler.java | 10 +++---- .../EppMessageHandler.java | 8 +++--- .../SslClientInitializer.java | 2 +- .../WebWhoisActionHandler.java | 20 ++++++------- .../WebWhoisMessageHandler.java | 8 +++--- .../{messages => message}/EppMessage.java | 6 ++-- .../EppRequestMessage.java | 6 ++-- .../EppResponseMessage.java | 4 +-- .../HttpRequestMessage.java | 2 +- .../HttpResponseMessage.java | 2 +- .../InboundMessageType.java | 2 +- .../OutboundMessageType.java | 4 +-- .../{metrics => metric}/MetricsCollector.java | 2 +- .../CertificateModule.java | 2 +- .../{modules => module}/EppModule.java | 28 +++++++++---------- .../{modules => module}/WebWhoisModule.java | 14 +++++----- .../blackbox/{tokens => token}/EppToken.java | 8 +++--- .../blackbox/{tokens => token}/Token.java | 6 ++-- .../{tokens => token}/WebWhoisToken.java | 8 +++--- .../blackbox/{messages => message}/check.xml | 0 .../{messages => message}/claimscheck.xml | 0 .../blackbox/{messages => message}/create.xml | 0 .../blackbox/{messages => message}/delete.xml | 0 .../{messages => message}/domain_exists.xml | 0 .../domain_not_exists.xml | 0 .../{messages => message}/failed_response.xml | 0 .../{messages => message}/greeting.xml | 0 .../blackbox/{messages => message}/login.xml | 0 .../blackbox/{messages => message}/logout.xml | 0 .../success_response.xml | 0 .../{messages => message}/xsd/contact.xsd | 0 .../{messages => message}/xsd/domain.xsd | 0 .../{messages => message}/xsd/dsig.xsd | 0 .../{messages => message}/xsd/epp.xsd | 0 .../{messages => message}/xsd/eppcom.xsd | 0 .../{messages => message}/xsd/host.xsd | 0 .../{messages => message}/xsd/launch.xsd | 0 .../{messages => message}/xsd/mark.xsd | 0 .../{messages => message}/xsd/rgp.xsd | 0 .../{messages => message}/xsd/smd.xsd | 0 .../blackbox/ProbingSequenceTest.java | 14 +++++----- .../monitoring/blackbox/ProbingStepTest.java | 16 +++++------ .../connection/ProbingActionTest.java | 10 +++---- .../ConversionHandler.java | 8 +++--- .../EppActionHandlerTest.java | 12 ++++---- .../{handlers => handler}/NettyRule.java | 4 +-- .../SslClientInitializerTest.java | 8 +++--- .../SslInitializerTestUtils.java | 2 +- .../TestActionHandler.java | 8 +++--- .../WebWhoisActionHandlerTest.java | 10 +++---- .../{messages => message}/EppMessageTest.java | 6 ++-- .../{messages => message}/TestMessage.java | 4 +-- .../MetricsCollectorTest.java | 4 +-- .../TestServer.java | 8 +++--- .../{tokens => token}/EppTokenTest.java | 6 ++-- .../{tokens => token}/WebWhoisTokenTest.java | 6 ++-- .../monitoring/blackbox/util/EppUtils.java | 16 +++++------ 67 files changed, 165 insertions(+), 165 deletions(-) rename prober/src/main/java/google/registry/monitoring/blackbox/{exceptions => exception}/ConnectionException.java (94%) rename prober/src/main/java/google/registry/monitoring/blackbox/{exceptions => exception}/EppClientException.java (94%) rename prober/src/main/java/google/registry/monitoring/blackbox/{exceptions => exception}/FailureException.java (94%) rename prober/src/main/java/google/registry/monitoring/blackbox/{exceptions => exception}/UndeterminedStateException.java (94%) rename prober/src/main/java/google/registry/monitoring/blackbox/{exceptions => exception}/UnrecoverableStateException.java (94%) rename prober/src/main/java/google/registry/monitoring/blackbox/{handlers => handler}/ActionHandler.java (94%) rename prober/src/main/java/google/registry/monitoring/blackbox/{handlers => handler}/EppActionHandler.java (83%) rename prober/src/main/java/google/registry/monitoring/blackbox/{handlers => handler}/EppMessageHandler.java (92%) rename prober/src/main/java/google/registry/monitoring/blackbox/{handlers => handler}/SslClientInitializer.java (98%) rename prober/src/main/java/google/registry/monitoring/blackbox/{handlers => handler}/WebWhoisActionHandler.java (90%) rename prober/src/main/java/google/registry/monitoring/blackbox/{handlers => handler}/WebWhoisMessageHandler.java (87%) rename prober/src/main/java/google/registry/monitoring/blackbox/{messages => message}/EppMessage.java (98%) rename prober/src/main/java/google/registry/monitoring/blackbox/{messages => message}/EppRequestMessage.java (96%) rename prober/src/main/java/google/registry/monitoring/blackbox/{messages => message}/EppResponseMessage.java (96%) rename prober/src/main/java/google/registry/monitoring/blackbox/{messages => message}/HttpRequestMessage.java (98%) rename prober/src/main/java/google/registry/monitoring/blackbox/{messages => message}/HttpResponseMessage.java (96%) rename prober/src/main/java/google/registry/monitoring/blackbox/{messages => message}/InboundMessageType.java (93%) rename prober/src/main/java/google/registry/monitoring/blackbox/{messages => message}/OutboundMessageType.java (91%) rename prober/src/main/java/google/registry/monitoring/blackbox/{metrics => metric}/MetricsCollector.java (98%) rename prober/src/main/java/google/registry/monitoring/blackbox/{modules => module}/CertificateModule.java (98%) rename prober/src/main/java/google/registry/monitoring/blackbox/{modules => module}/EppModule.java (94%) rename prober/src/main/java/google/registry/monitoring/blackbox/{modules => module}/WebWhoisModule.java (93%) rename prober/src/main/java/google/registry/monitoring/blackbox/{tokens => token}/EppToken.java (94%) rename prober/src/main/java/google/registry/monitoring/blackbox/{tokens => token}/Token.java (91%) rename prober/src/main/java/google/registry/monitoring/blackbox/{tokens => token}/WebWhoisToken.java (88%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/check.xml (100%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/claimscheck.xml (100%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/create.xml (100%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/delete.xml (100%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/domain_exists.xml (100%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/domain_not_exists.xml (100%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/failed_response.xml (100%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/greeting.xml (100%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/login.xml (100%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/logout.xml (100%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/success_response.xml (100%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/xsd/contact.xsd (100%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/xsd/domain.xsd (100%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/xsd/dsig.xsd (100%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/xsd/epp.xsd (100%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/xsd/eppcom.xsd (100%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/xsd/host.xsd (100%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/xsd/launch.xsd (100%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/xsd/mark.xsd (100%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/xsd/rgp.xsd (100%) rename prober/src/main/resources/google/registry/monitoring/blackbox/{messages => message}/xsd/smd.xsd (100%) rename prober/src/test/java/google/registry/monitoring/blackbox/{handlers => handler}/ConversionHandler.java (88%) rename prober/src/test/java/google/registry/monitoring/blackbox/{handlers => handler}/EppActionHandlerTest.java (95%) rename prober/src/test/java/google/registry/monitoring/blackbox/{handlers => handler}/NettyRule.java (98%) rename prober/src/test/java/google/registry/monitoring/blackbox/{handlers => handler}/SslClientInitializerTest.java (96%) rename prober/src/test/java/google/registry/monitoring/blackbox/{handlers => handler}/SslInitializerTestUtils.java (98%) rename prober/src/test/java/google/registry/monitoring/blackbox/{handlers => handler}/TestActionHandler.java (81%) rename prober/src/test/java/google/registry/monitoring/blackbox/{handlers => handler}/WebWhoisActionHandlerTest.java (95%) rename prober/src/test/java/google/registry/monitoring/blackbox/{messages => message}/EppMessageTest.java (97%) rename prober/src/test/java/google/registry/monitoring/blackbox/{messages => message}/TestMessage.java (90%) rename prober/src/test/java/google/registry/monitoring/blackbox/{metrics => metric}/MetricsCollectorTest.java (96%) rename prober/src/test/java/google/registry/monitoring/blackbox/{testservers => testserver}/TestServer.java (95%) rename prober/src/test/java/google/registry/monitoring/blackbox/{tokens => token}/EppTokenTest.java (94%) rename prober/src/test/java/google/registry/monitoring/blackbox/{tokens => token}/WebWhoisTokenTest.java (92%) diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/ProberModule.java b/prober/src/main/java/google/registry/monitoring/blackbox/ProberModule.java index 7cca1abb6..13d43f468 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/ProberModule.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/ProberModule.java @@ -18,9 +18,9 @@ import dagger.Component; import dagger.Module; import dagger.Provides; import google.registry.monitoring.blackbox.connection.ProbingAction; -import google.registry.monitoring.blackbox.modules.CertificateModule; -import google.registry.monitoring.blackbox.modules.EppModule; -import google.registry.monitoring.blackbox.modules.WebWhoisModule; +import google.registry.monitoring.blackbox.module.CertificateModule; +import google.registry.monitoring.blackbox.module.EppModule; +import google.registry.monitoring.blackbox.module.WebWhoisModule; import google.registry.util.Clock; import google.registry.util.SystemClock; import io.netty.bootstrap.Bootstrap; @@ -47,7 +47,7 @@ public class ProberModule { /** * {@link Provides} the {@link SslProvider} used by instances of {@link - * google.registry.monitoring.blackbox.handlers.SslClientInitializer} + * google.registry.monitoring.blackbox.handler.SslClientInitializer} */ @Provides @Singleton diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/ProbingSequence.java b/prober/src/main/java/google/registry/monitoring/blackbox/ProbingSequence.java index 75053c2fa..43977acef 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/ProbingSequence.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/ProbingSequence.java @@ -16,10 +16,10 @@ package google.registry.monitoring.blackbox; import com.google.common.flogger.FluentLogger; import google.registry.monitoring.blackbox.connection.ProbingAction; -import google.registry.monitoring.blackbox.exceptions.FailureException; -import google.registry.monitoring.blackbox.exceptions.UnrecoverableStateException; -import google.registry.monitoring.blackbox.metrics.MetricsCollector; -import google.registry.monitoring.blackbox.tokens.Token; +import google.registry.monitoring.blackbox.exception.FailureException; +import google.registry.monitoring.blackbox.exception.UnrecoverableStateException; +import google.registry.monitoring.blackbox.metric.MetricsCollector; +import google.registry.monitoring.blackbox.token.Token; import google.registry.util.CircularList; import google.registry.util.Clock; import io.netty.bootstrap.Bootstrap; diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/ProbingStep.java b/prober/src/main/java/google/registry/monitoring/blackbox/ProbingStep.java index b23ea2584..1769c0685 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/ProbingStep.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/ProbingStep.java @@ -17,9 +17,9 @@ package google.registry.monitoring.blackbox; import com.google.auto.value.AutoValue; import google.registry.monitoring.blackbox.connection.ProbingAction; import google.registry.monitoring.blackbox.connection.Protocol; -import google.registry.monitoring.blackbox.exceptions.UndeterminedStateException; -import google.registry.monitoring.blackbox.messages.OutboundMessageType; -import google.registry.monitoring.blackbox.tokens.Token; +import google.registry.monitoring.blackbox.exception.UndeterminedStateException; +import google.registry.monitoring.blackbox.message.OutboundMessageType; +import google.registry.monitoring.blackbox.token.Token; import io.netty.bootstrap.Bootstrap; import org.joda.time.Duration; diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/connection/ProbingAction.java b/prober/src/main/java/google/registry/monitoring/blackbox/connection/ProbingAction.java index 95662fa01..f7f96ffca 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/connection/ProbingAction.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/connection/ProbingAction.java @@ -22,9 +22,9 @@ import static google.registry.monitoring.blackbox.connection.Protocol.PROTOCOL_K import com.google.auto.value.AutoValue; import com.google.common.flogger.FluentLogger; import google.registry.monitoring.blackbox.ProbingStep; -import google.registry.monitoring.blackbox.exceptions.UndeterminedStateException; -import google.registry.monitoring.blackbox.handlers.ActionHandler; -import google.registry.monitoring.blackbox.messages.OutboundMessageType; +import google.registry.monitoring.blackbox.exception.UndeterminedStateException; +import google.registry.monitoring.blackbox.handler.ActionHandler; +import google.registry.monitoring.blackbox.message.OutboundMessageType; import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/exceptions/ConnectionException.java b/prober/src/main/java/google/registry/monitoring/blackbox/exception/ConnectionException.java similarity index 94% rename from prober/src/main/java/google/registry/monitoring/blackbox/exceptions/ConnectionException.java rename to prober/src/main/java/google/registry/monitoring/blackbox/exception/ConnectionException.java index 776a231d6..19f994cf6 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/exceptions/ConnectionException.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/exception/ConnectionException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.exceptions; +package google.registry.monitoring.blackbox.exception; /** * Subclass of {@link UndeterminedStateException} that represents all instances when the action diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/exceptions/EppClientException.java b/prober/src/main/java/google/registry/monitoring/blackbox/exception/EppClientException.java similarity index 94% rename from prober/src/main/java/google/registry/monitoring/blackbox/exceptions/EppClientException.java rename to prober/src/main/java/google/registry/monitoring/blackbox/exception/EppClientException.java index 528b2ddbc..a919b50cd 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/exceptions/EppClientException.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/exception/EppClientException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.exceptions; +package google.registry.monitoring.blackbox.exception; /** * Subclass of {@link UndeterminedStateException} that represents all instances when the action diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/exceptions/FailureException.java b/prober/src/main/java/google/registry/monitoring/blackbox/exception/FailureException.java similarity index 94% rename from prober/src/main/java/google/registry/monitoring/blackbox/exceptions/FailureException.java rename to prober/src/main/java/google/registry/monitoring/blackbox/exception/FailureException.java index 332e990e1..f85950b14 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/exceptions/FailureException.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/exception/FailureException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.exceptions; +package google.registry.monitoring.blackbox.exception; /** Base exception class for all instances when the status of the action performed is FAILURE. */ public class FailureException extends Exception { diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/exceptions/UndeterminedStateException.java b/prober/src/main/java/google/registry/monitoring/blackbox/exception/UndeterminedStateException.java similarity index 94% rename from prober/src/main/java/google/registry/monitoring/blackbox/exceptions/UndeterminedStateException.java rename to prober/src/main/java/google/registry/monitoring/blackbox/exception/UndeterminedStateException.java index d7127717d..085f474cf 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/exceptions/UndeterminedStateException.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/exception/UndeterminedStateException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.exceptions; +package google.registry.monitoring.blackbox.exception; /** * Base exception class for all instances when the action performed fails before we can determine diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/exceptions/UnrecoverableStateException.java b/prober/src/main/java/google/registry/monitoring/blackbox/exception/UnrecoverableStateException.java similarity index 94% rename from prober/src/main/java/google/registry/monitoring/blackbox/exceptions/UnrecoverableStateException.java rename to prober/src/main/java/google/registry/monitoring/blackbox/exception/UnrecoverableStateException.java index a9c747f90..1ac8802db 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/exceptions/UnrecoverableStateException.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/exception/UnrecoverableStateException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.exceptions; +package google.registry.monitoring.blackbox.exception; /** * Exception thrown when error is severe enough that sequence cannot recover, and should be diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/handlers/ActionHandler.java b/prober/src/main/java/google/registry/monitoring/blackbox/handler/ActionHandler.java similarity index 94% rename from prober/src/main/java/google/registry/monitoring/blackbox/handlers/ActionHandler.java rename to prober/src/main/java/google/registry/monitoring/blackbox/handler/ActionHandler.java index 8b93e7f36..a9e083ad1 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/handlers/ActionHandler.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/handler/ActionHandler.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.handlers; +package google.registry.monitoring.blackbox.handler; import com.google.common.flogger.FluentLogger; import google.registry.monitoring.blackbox.connection.ProbingAction; -import google.registry.monitoring.blackbox.exceptions.FailureException; -import google.registry.monitoring.blackbox.exceptions.UndeterminedStateException; -import google.registry.monitoring.blackbox.messages.InboundMessageType; +import google.registry.monitoring.blackbox.exception.FailureException; +import google.registry.monitoring.blackbox.exception.UndeterminedStateException; +import google.registry.monitoring.blackbox.message.InboundMessageType; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/handlers/EppActionHandler.java b/prober/src/main/java/google/registry/monitoring/blackbox/handler/EppActionHandler.java similarity index 83% rename from prober/src/main/java/google/registry/monitoring/blackbox/handlers/EppActionHandler.java rename to prober/src/main/java/google/registry/monitoring/blackbox/handler/EppActionHandler.java index 824923f06..55d125460 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/handlers/EppActionHandler.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/handler/EppActionHandler.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.handlers; +package google.registry.monitoring.blackbox.handler; -import google.registry.monitoring.blackbox.exceptions.FailureException; -import google.registry.monitoring.blackbox.exceptions.UndeterminedStateException; -import google.registry.monitoring.blackbox.messages.EppResponseMessage; -import google.registry.monitoring.blackbox.messages.InboundMessageType; +import google.registry.monitoring.blackbox.exception.FailureException; +import google.registry.monitoring.blackbox.exception.UndeterminedStateException; +import google.registry.monitoring.blackbox.message.EppResponseMessage; +import google.registry.monitoring.blackbox.message.InboundMessageType; import io.netty.channel.ChannelHandlerContext; import javax.inject.Inject; diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/handlers/EppMessageHandler.java b/prober/src/main/java/google/registry/monitoring/blackbox/handler/EppMessageHandler.java similarity index 92% rename from prober/src/main/java/google/registry/monitoring/blackbox/handlers/EppMessageHandler.java rename to prober/src/main/java/google/registry/monitoring/blackbox/handler/EppMessageHandler.java index b7c4afba5..628edd3f5 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/handlers/EppMessageHandler.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/handler/EppMessageHandler.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.handlers; +package google.registry.monitoring.blackbox.handler; import com.google.common.flogger.FluentLogger; -import google.registry.monitoring.blackbox.exceptions.FailureException; -import google.registry.monitoring.blackbox.messages.EppRequestMessage; -import google.registry.monitoring.blackbox.messages.EppResponseMessage; +import google.registry.monitoring.blackbox.exception.FailureException; +import google.registry.monitoring.blackbox.message.EppRequestMessage; +import google.registry.monitoring.blackbox.message.EppResponseMessage; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelFuture; diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/handlers/SslClientInitializer.java b/prober/src/main/java/google/registry/monitoring/blackbox/handler/SslClientInitializer.java similarity index 98% rename from prober/src/main/java/google/registry/monitoring/blackbox/handlers/SslClientInitializer.java rename to prober/src/main/java/google/registry/monitoring/blackbox/handler/SslClientInitializer.java index 8a30c6a71..a9f2bf03b 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/handlers/SslClientInitializer.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/handler/SslClientInitializer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.handlers; +package google.registry.monitoring.blackbox.handler; import static com.google.common.base.Preconditions.checkNotNull; import static google.registry.monitoring.blackbox.connection.ProbingAction.REMOTE_ADDRESS_KEY; diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/handlers/WebWhoisActionHandler.java b/prober/src/main/java/google/registry/monitoring/blackbox/handler/WebWhoisActionHandler.java similarity index 90% rename from prober/src/main/java/google/registry/monitoring/blackbox/handlers/WebWhoisActionHandler.java rename to prober/src/main/java/google/registry/monitoring/blackbox/handler/WebWhoisActionHandler.java index 38044c559..80b96e1e9 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/handlers/WebWhoisActionHandler.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/handler/WebWhoisActionHandler.java @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.handlers; +package google.registry.monitoring.blackbox.handler; import com.google.common.flogger.FluentLogger; import google.registry.monitoring.blackbox.connection.ProbingAction; import google.registry.monitoring.blackbox.connection.Protocol; -import google.registry.monitoring.blackbox.exceptions.ConnectionException; -import google.registry.monitoring.blackbox.exceptions.FailureException; -import google.registry.monitoring.blackbox.exceptions.UndeterminedStateException; -import google.registry.monitoring.blackbox.messages.HttpRequestMessage; -import google.registry.monitoring.blackbox.messages.HttpResponseMessage; -import google.registry.monitoring.blackbox.messages.InboundMessageType; -import google.registry.monitoring.blackbox.modules.WebWhoisModule.HttpWhoisProtocol; -import google.registry.monitoring.blackbox.modules.WebWhoisModule.HttpsWhoisProtocol; -import google.registry.monitoring.blackbox.modules.WebWhoisModule.WebWhoisProtocol; +import google.registry.monitoring.blackbox.exception.ConnectionException; +import google.registry.monitoring.blackbox.exception.FailureException; +import google.registry.monitoring.blackbox.exception.UndeterminedStateException; +import google.registry.monitoring.blackbox.message.HttpRequestMessage; +import google.registry.monitoring.blackbox.message.HttpResponseMessage; +import google.registry.monitoring.blackbox.message.InboundMessageType; +import google.registry.monitoring.blackbox.module.WebWhoisModule.HttpWhoisProtocol; +import google.registry.monitoring.blackbox.module.WebWhoisModule.HttpsWhoisProtocol; +import google.registry.monitoring.blackbox.module.WebWhoisModule.WebWhoisProtocol; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandlerContext; diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/handlers/WebWhoisMessageHandler.java b/prober/src/main/java/google/registry/monitoring/blackbox/handler/WebWhoisMessageHandler.java similarity index 87% rename from prober/src/main/java/google/registry/monitoring/blackbox/handlers/WebWhoisMessageHandler.java rename to prober/src/main/java/google/registry/monitoring/blackbox/handler/WebWhoisMessageHandler.java index 8811ebba6..473a8a88a 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/handlers/WebWhoisMessageHandler.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/handler/WebWhoisMessageHandler.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.handlers; +package google.registry.monitoring.blackbox.handler; -import google.registry.monitoring.blackbox.messages.HttpRequestMessage; -import google.registry.monitoring.blackbox.messages.HttpResponseMessage; -import google.registry.monitoring.blackbox.messages.InboundMessageType; +import google.registry.monitoring.blackbox.message.HttpRequestMessage; +import google.registry.monitoring.blackbox.message.HttpResponseMessage; +import google.registry.monitoring.blackbox.message.InboundMessageType; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/messages/EppMessage.java b/prober/src/main/java/google/registry/monitoring/blackbox/message/EppMessage.java similarity index 98% rename from prober/src/main/java/google/registry/monitoring/blackbox/messages/EppMessage.java rename to prober/src/main/java/google/registry/monitoring/blackbox/message/EppMessage.java index b422a62f9..d598d6ad1 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/messages/EppMessage.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/message/EppMessage.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.messages; +package google.registry.monitoring.blackbox.message; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Strings.isNullOrEmpty; @@ -20,8 +20,8 @@ import static google.registry.util.ResourceUtils.readResourceBytes; import com.google.common.annotations.VisibleForTesting; import com.google.common.flogger.FluentLogger; -import google.registry.monitoring.blackbox.exceptions.EppClientException; -import google.registry.monitoring.blackbox.exceptions.FailureException; +import google.registry.monitoring.blackbox.exception.EppClientException; +import google.registry.monitoring.blackbox.exception.FailureException; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/messages/EppRequestMessage.java b/prober/src/main/java/google/registry/monitoring/blackbox/message/EppRequestMessage.java similarity index 96% rename from prober/src/main/java/google/registry/monitoring/blackbox/messages/EppRequestMessage.java rename to prober/src/main/java/google/registry/monitoring/blackbox/message/EppRequestMessage.java index ec12d3ce6..abfa3f4e0 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/messages/EppRequestMessage.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/message/EppRequestMessage.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.messages; +package google.registry.monitoring.blackbox.message; import com.google.common.collect.ImmutableMap; -import google.registry.monitoring.blackbox.exceptions.EppClientException; -import google.registry.monitoring.blackbox.exceptions.UndeterminedStateException; +import google.registry.monitoring.blackbox.exception.EppClientException; +import google.registry.monitoring.blackbox.exception.UndeterminedStateException; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import java.io.IOException; diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/messages/EppResponseMessage.java b/prober/src/main/java/google/registry/monitoring/blackbox/message/EppResponseMessage.java similarity index 96% rename from prober/src/main/java/google/registry/monitoring/blackbox/messages/EppResponseMessage.java rename to prober/src/main/java/google/registry/monitoring/blackbox/message/EppResponseMessage.java index 5d833c046..a0fe54e54 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/messages/EppResponseMessage.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/message/EppResponseMessage.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.messages; +package google.registry.monitoring.blackbox.message; -import google.registry.monitoring.blackbox.exceptions.FailureException; +import google.registry.monitoring.blackbox.exception.FailureException; import io.netty.buffer.ByteBuf; import java.util.List; import java.util.function.BiFunction; diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/messages/HttpRequestMessage.java b/prober/src/main/java/google/registry/monitoring/blackbox/message/HttpRequestMessage.java similarity index 98% rename from prober/src/main/java/google/registry/monitoring/blackbox/messages/HttpRequestMessage.java rename to prober/src/main/java/google/registry/monitoring/blackbox/message/HttpRequestMessage.java index 90db6f8ba..ee011bb7d 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/messages/HttpRequestMessage.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/message/HttpRequestMessage.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.messages; +package google.registry.monitoring.blackbox.message; import io.netty.buffer.ByteBuf; import io.netty.handler.codec.http.DefaultFullHttpRequest; diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/messages/HttpResponseMessage.java b/prober/src/main/java/google/registry/monitoring/blackbox/message/HttpResponseMessage.java similarity index 96% rename from prober/src/main/java/google/registry/monitoring/blackbox/messages/HttpResponseMessage.java rename to prober/src/main/java/google/registry/monitoring/blackbox/message/HttpResponseMessage.java index 929c9c898..424343433 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/messages/HttpResponseMessage.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/message/HttpResponseMessage.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.messages; +package google.registry.monitoring.blackbox.message; import io.netty.buffer.ByteBuf; import io.netty.handler.codec.http.DefaultFullHttpResponse; diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/messages/InboundMessageType.java b/prober/src/main/java/google/registry/monitoring/blackbox/message/InboundMessageType.java similarity index 93% rename from prober/src/main/java/google/registry/monitoring/blackbox/messages/InboundMessageType.java rename to prober/src/main/java/google/registry/monitoring/blackbox/message/InboundMessageType.java index 84b77f89d..d52a46c69 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/messages/InboundMessageType.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/message/InboundMessageType.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.messages; +package google.registry.monitoring.blackbox.message; /** * Marker Interface that is implemented by all classes that serve as {@code inboundMessages} in diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/messages/OutboundMessageType.java b/prober/src/main/java/google/registry/monitoring/blackbox/message/OutboundMessageType.java similarity index 91% rename from prober/src/main/java/google/registry/monitoring/blackbox/messages/OutboundMessageType.java rename to prober/src/main/java/google/registry/monitoring/blackbox/message/OutboundMessageType.java index bc6830e1a..b64ed6435 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/messages/OutboundMessageType.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/message/OutboundMessageType.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.messages; +package google.registry.monitoring.blackbox.message; -import google.registry.monitoring.blackbox.exceptions.UndeterminedStateException; +import google.registry.monitoring.blackbox.exception.UndeterminedStateException; /** * Marker Interface that is implemented by all classes that serve as {@code outboundMessages} in diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/metrics/MetricsCollector.java b/prober/src/main/java/google/registry/monitoring/blackbox/metric/MetricsCollector.java similarity index 98% rename from prober/src/main/java/google/registry/monitoring/blackbox/metrics/MetricsCollector.java rename to prober/src/main/java/google/registry/monitoring/blackbox/metric/MetricsCollector.java index dbaf4a866..1ebe9fbaa 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/metrics/MetricsCollector.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/metric/MetricsCollector.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.metrics; +package google.registry.monitoring.blackbox.metric; import com.google.common.collect.ImmutableSet; import com.google.monitoring.metrics.EventMetric; diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/modules/CertificateModule.java b/prober/src/main/java/google/registry/monitoring/blackbox/module/CertificateModule.java similarity index 98% rename from prober/src/main/java/google/registry/monitoring/blackbox/modules/CertificateModule.java rename to prober/src/main/java/google/registry/monitoring/blackbox/module/CertificateModule.java index a064e869b..6af9a5cbf 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/modules/CertificateModule.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/module/CertificateModule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.modules; +package google.registry.monitoring.blackbox.module; import static com.google.common.base.Suppliers.memoizeWithExpiration; import static google.registry.util.ResourceUtils.readResourceBytes; diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/modules/EppModule.java b/prober/src/main/java/google/registry/monitoring/blackbox/module/EppModule.java similarity index 94% rename from prober/src/main/java/google/registry/monitoring/blackbox/modules/EppModule.java rename to prober/src/main/java/google/registry/monitoring/blackbox/module/EppModule.java index ba68f188e..966634bd0 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/modules/EppModule.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/module/EppModule.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.modules; +package google.registry.monitoring.blackbox.module; -import static google.registry.monitoring.blackbox.messages.EppRequestMessage.CLIENT_ID_KEY; -import static google.registry.monitoring.blackbox.messages.EppRequestMessage.CLIENT_PASSWORD_KEY; -import static google.registry.monitoring.blackbox.messages.EppRequestMessage.CLIENT_TRID_KEY; -import static google.registry.monitoring.blackbox.messages.EppRequestMessage.DOMAIN_KEY; +import static google.registry.monitoring.blackbox.message.EppRequestMessage.CLIENT_ID_KEY; +import static google.registry.monitoring.blackbox.message.EppRequestMessage.CLIENT_PASSWORD_KEY; +import static google.registry.monitoring.blackbox.message.EppRequestMessage.CLIENT_TRID_KEY; +import static google.registry.monitoring.blackbox.message.EppRequestMessage.DOMAIN_KEY; import static google.registry.util.ResourceUtils.readResourceUtf8; import com.google.common.collect.ImmutableList; @@ -28,15 +28,15 @@ import dagger.multibindings.IntoSet; import google.registry.monitoring.blackbox.ProbingSequence; import google.registry.monitoring.blackbox.ProbingStep; import google.registry.monitoring.blackbox.connection.Protocol; -import google.registry.monitoring.blackbox.handlers.EppActionHandler; -import google.registry.monitoring.blackbox.handlers.EppMessageHandler; -import google.registry.monitoring.blackbox.handlers.SslClientInitializer; -import google.registry.monitoring.blackbox.messages.EppMessage; -import google.registry.monitoring.blackbox.messages.EppRequestMessage; -import google.registry.monitoring.blackbox.messages.EppResponseMessage; -import google.registry.monitoring.blackbox.metrics.MetricsCollector; -import google.registry.monitoring.blackbox.modules.CertificateModule.LocalSecrets; -import google.registry.monitoring.blackbox.tokens.EppToken; +import google.registry.monitoring.blackbox.handler.EppActionHandler; +import google.registry.monitoring.blackbox.handler.EppMessageHandler; +import google.registry.monitoring.blackbox.handler.SslClientInitializer; +import google.registry.monitoring.blackbox.message.EppMessage; +import google.registry.monitoring.blackbox.message.EppRequestMessage; +import google.registry.monitoring.blackbox.message.EppResponseMessage; +import google.registry.monitoring.blackbox.metric.MetricsCollector; +import google.registry.monitoring.blackbox.module.CertificateModule.LocalSecrets; +import google.registry.monitoring.blackbox.token.EppToken; import google.registry.util.Clock; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelHandler; diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/modules/WebWhoisModule.java b/prober/src/main/java/google/registry/monitoring/blackbox/module/WebWhoisModule.java similarity index 93% rename from prober/src/main/java/google/registry/monitoring/blackbox/modules/WebWhoisModule.java rename to prober/src/main/java/google/registry/monitoring/blackbox/module/WebWhoisModule.java index 2fc7f0c02..a295f9fd4 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/modules/WebWhoisModule.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/module/WebWhoisModule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.modules; +package google.registry.monitoring.blackbox.module; import com.google.common.collect.ImmutableList; import dagger.Module; @@ -21,12 +21,12 @@ import dagger.multibindings.IntoSet; import google.registry.monitoring.blackbox.ProbingSequence; import google.registry.monitoring.blackbox.ProbingStep; import google.registry.monitoring.blackbox.connection.Protocol; -import google.registry.monitoring.blackbox.handlers.SslClientInitializer; -import google.registry.monitoring.blackbox.handlers.WebWhoisActionHandler; -import google.registry.monitoring.blackbox.handlers.WebWhoisMessageHandler; -import google.registry.monitoring.blackbox.messages.HttpRequestMessage; -import google.registry.monitoring.blackbox.metrics.MetricsCollector; -import google.registry.monitoring.blackbox.tokens.WebWhoisToken; +import google.registry.monitoring.blackbox.handler.SslClientInitializer; +import google.registry.monitoring.blackbox.handler.WebWhoisActionHandler; +import google.registry.monitoring.blackbox.handler.WebWhoisMessageHandler; +import google.registry.monitoring.blackbox.message.HttpRequestMessage; +import google.registry.monitoring.blackbox.metric.MetricsCollector; +import google.registry.monitoring.blackbox.token.WebWhoisToken; import google.registry.util.CircularList; import google.registry.util.Clock; import io.netty.bootstrap.Bootstrap; diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/tokens/EppToken.java b/prober/src/main/java/google/registry/monitoring/blackbox/token/EppToken.java similarity index 94% rename from prober/src/main/java/google/registry/monitoring/blackbox/tokens/EppToken.java rename to prober/src/main/java/google/registry/monitoring/blackbox/token/EppToken.java index 20f9ebf2a..114725449 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/tokens/EppToken.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/token/EppToken.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.tokens; +package google.registry.monitoring.blackbox.token; import com.google.common.annotations.VisibleForTesting; -import google.registry.monitoring.blackbox.exceptions.UndeterminedStateException; -import google.registry.monitoring.blackbox.messages.EppRequestMessage; -import google.registry.monitoring.blackbox.messages.OutboundMessageType; +import google.registry.monitoring.blackbox.exception.UndeterminedStateException; +import google.registry.monitoring.blackbox.message.EppRequestMessage; +import google.registry.monitoring.blackbox.message.OutboundMessageType; import io.netty.channel.Channel; import java.util.concurrent.atomic.AtomicInteger; import javax.inject.Inject; diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/tokens/Token.java b/prober/src/main/java/google/registry/monitoring/blackbox/token/Token.java similarity index 91% rename from prober/src/main/java/google/registry/monitoring/blackbox/tokens/Token.java rename to prober/src/main/java/google/registry/monitoring/blackbox/token/Token.java index d00f09930..ac05d6af9 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/tokens/Token.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/token/Token.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.tokens; +package google.registry.monitoring.blackbox.token; import google.registry.monitoring.blackbox.ProbingSequence; import google.registry.monitoring.blackbox.ProbingStep; -import google.registry.monitoring.blackbox.exceptions.UndeterminedStateException; -import google.registry.monitoring.blackbox.messages.OutboundMessageType; +import google.registry.monitoring.blackbox.exception.UndeterminedStateException; +import google.registry.monitoring.blackbox.message.OutboundMessageType; import io.netty.channel.Channel; /** diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/tokens/WebWhoisToken.java b/prober/src/main/java/google/registry/monitoring/blackbox/token/WebWhoisToken.java similarity index 88% rename from prober/src/main/java/google/registry/monitoring/blackbox/tokens/WebWhoisToken.java rename to prober/src/main/java/google/registry/monitoring/blackbox/token/WebWhoisToken.java index fadcf3937..78fc551a0 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/tokens/WebWhoisToken.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/token/WebWhoisToken.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.tokens; +package google.registry.monitoring.blackbox.token; import com.google.common.collect.ImmutableList; -import google.registry.monitoring.blackbox.exceptions.UndeterminedStateException; -import google.registry.monitoring.blackbox.messages.OutboundMessageType; -import google.registry.monitoring.blackbox.modules.WebWhoisModule.WebWhoisProtocol; +import google.registry.monitoring.blackbox.exception.UndeterminedStateException; +import google.registry.monitoring.blackbox.message.OutboundMessageType; +import google.registry.monitoring.blackbox.module.WebWhoisModule.WebWhoisProtocol; import google.registry.util.CircularList; import javax.inject.Inject; diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/check.xml b/prober/src/main/resources/google/registry/monitoring/blackbox/message/check.xml similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/check.xml rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/check.xml diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/claimscheck.xml b/prober/src/main/resources/google/registry/monitoring/blackbox/message/claimscheck.xml similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/claimscheck.xml rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/claimscheck.xml diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/create.xml b/prober/src/main/resources/google/registry/monitoring/blackbox/message/create.xml similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/create.xml rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/create.xml diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/delete.xml b/prober/src/main/resources/google/registry/monitoring/blackbox/message/delete.xml similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/delete.xml rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/delete.xml diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/domain_exists.xml b/prober/src/main/resources/google/registry/monitoring/blackbox/message/domain_exists.xml similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/domain_exists.xml rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/domain_exists.xml diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/domain_not_exists.xml b/prober/src/main/resources/google/registry/monitoring/blackbox/message/domain_not_exists.xml similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/domain_not_exists.xml rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/domain_not_exists.xml diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/failed_response.xml b/prober/src/main/resources/google/registry/monitoring/blackbox/message/failed_response.xml similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/failed_response.xml rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/failed_response.xml diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/greeting.xml b/prober/src/main/resources/google/registry/monitoring/blackbox/message/greeting.xml similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/greeting.xml rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/greeting.xml diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/login.xml b/prober/src/main/resources/google/registry/monitoring/blackbox/message/login.xml similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/login.xml rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/login.xml diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/logout.xml b/prober/src/main/resources/google/registry/monitoring/blackbox/message/logout.xml similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/logout.xml rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/logout.xml diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/success_response.xml b/prober/src/main/resources/google/registry/monitoring/blackbox/message/success_response.xml similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/success_response.xml rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/success_response.xml diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/xsd/contact.xsd b/prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/contact.xsd similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/xsd/contact.xsd rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/contact.xsd diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/xsd/domain.xsd b/prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/domain.xsd similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/xsd/domain.xsd rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/domain.xsd diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/xsd/dsig.xsd b/prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/dsig.xsd similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/xsd/dsig.xsd rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/dsig.xsd diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/xsd/epp.xsd b/prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/epp.xsd similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/xsd/epp.xsd rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/epp.xsd diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/xsd/eppcom.xsd b/prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/eppcom.xsd similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/xsd/eppcom.xsd rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/eppcom.xsd diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/xsd/host.xsd b/prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/host.xsd similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/xsd/host.xsd rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/host.xsd diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/xsd/launch.xsd b/prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/launch.xsd similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/xsd/launch.xsd rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/launch.xsd diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/xsd/mark.xsd b/prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/mark.xsd similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/xsd/mark.xsd rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/mark.xsd diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/xsd/rgp.xsd b/prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/rgp.xsd similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/xsd/rgp.xsd rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/rgp.xsd diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/messages/xsd/smd.xsd b/prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/smd.xsd similarity index 100% rename from prober/src/main/resources/google/registry/monitoring/blackbox/messages/xsd/smd.xsd rename to prober/src/main/resources/google/registry/monitoring/blackbox/message/xsd/smd.xsd diff --git a/prober/src/test/java/google/registry/monitoring/blackbox/ProbingSequenceTest.java b/prober/src/test/java/google/registry/monitoring/blackbox/ProbingSequenceTest.java index a2ad28b83..468a8e0e7 100644 --- a/prober/src/test/java/google/registry/monitoring/blackbox/ProbingSequenceTest.java +++ b/prober/src/test/java/google/registry/monitoring/blackbox/ProbingSequenceTest.java @@ -24,13 +24,13 @@ import static org.mockito.Mockito.verify; import google.registry.monitoring.blackbox.connection.ProbingAction; import google.registry.monitoring.blackbox.connection.Protocol; -import google.registry.monitoring.blackbox.exceptions.FailureException; -import google.registry.monitoring.blackbox.exceptions.UndeterminedStateException; -import google.registry.monitoring.blackbox.exceptions.UnrecoverableStateException; -import google.registry.monitoring.blackbox.messages.OutboundMessageType; -import google.registry.monitoring.blackbox.metrics.MetricsCollector; -import google.registry.monitoring.blackbox.metrics.MetricsCollector.ResponseType; -import google.registry.monitoring.blackbox.tokens.Token; +import google.registry.monitoring.blackbox.exception.FailureException; +import google.registry.monitoring.blackbox.exception.UndeterminedStateException; +import google.registry.monitoring.blackbox.exception.UnrecoverableStateException; +import google.registry.monitoring.blackbox.message.OutboundMessageType; +import google.registry.monitoring.blackbox.metric.MetricsCollector; +import google.registry.monitoring.blackbox.metric.MetricsCollector.ResponseType; +import google.registry.monitoring.blackbox.token.Token; import google.registry.testing.FakeClock; import google.registry.util.Clock; import io.netty.channel.Channel; diff --git a/prober/src/test/java/google/registry/monitoring/blackbox/ProbingStepTest.java b/prober/src/test/java/google/registry/monitoring/blackbox/ProbingStepTest.java index a05e9d543..0b1173fcf 100644 --- a/prober/src/test/java/google/registry/monitoring/blackbox/ProbingStepTest.java +++ b/prober/src/test/java/google/registry/monitoring/blackbox/ProbingStepTest.java @@ -23,14 +23,14 @@ import static org.mockito.Mockito.doReturn; import com.google.common.collect.ImmutableList; import google.registry.monitoring.blackbox.connection.ProbingAction; import google.registry.monitoring.blackbox.connection.Protocol; -import google.registry.monitoring.blackbox.exceptions.UndeterminedStateException; -import google.registry.monitoring.blackbox.handlers.ActionHandler; -import google.registry.monitoring.blackbox.handlers.ConversionHandler; -import google.registry.monitoring.blackbox.handlers.NettyRule; -import google.registry.monitoring.blackbox.handlers.TestActionHandler; -import google.registry.monitoring.blackbox.messages.OutboundMessageType; -import google.registry.monitoring.blackbox.messages.TestMessage; -import google.registry.monitoring.blackbox.tokens.Token; +import google.registry.monitoring.blackbox.exception.UndeterminedStateException; +import google.registry.monitoring.blackbox.handler.ActionHandler; +import google.registry.monitoring.blackbox.handler.ConversionHandler; +import google.registry.monitoring.blackbox.handler.NettyRule; +import google.registry.monitoring.blackbox.handler.TestActionHandler; +import google.registry.monitoring.blackbox.message.OutboundMessageType; +import google.registry.monitoring.blackbox.message.TestMessage; +import google.registry.monitoring.blackbox.token.Token; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandler; diff --git a/prober/src/test/java/google/registry/monitoring/blackbox/connection/ProbingActionTest.java b/prober/src/test/java/google/registry/monitoring/blackbox/connection/ProbingActionTest.java index 0135dfb55..ec6c07c32 100644 --- a/prober/src/test/java/google/registry/monitoring/blackbox/connection/ProbingActionTest.java +++ b/prober/src/test/java/google/registry/monitoring/blackbox/connection/ProbingActionTest.java @@ -20,11 +20,11 @@ import static java.nio.charset.StandardCharsets.US_ASCII; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableList; -import google.registry.monitoring.blackbox.handlers.ActionHandler; -import google.registry.monitoring.blackbox.handlers.ConversionHandler; -import google.registry.monitoring.blackbox.handlers.NettyRule; -import google.registry.monitoring.blackbox.handlers.TestActionHandler; -import google.registry.monitoring.blackbox.messages.TestMessage; +import google.registry.monitoring.blackbox.handler.ActionHandler; +import google.registry.monitoring.blackbox.handler.ConversionHandler; +import google.registry.monitoring.blackbox.handler.NettyRule; +import google.registry.monitoring.blackbox.handler.TestActionHandler; +import google.registry.monitoring.blackbox.message.TestMessage; import io.netty.bootstrap.Bootstrap; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/prober/src/test/java/google/registry/monitoring/blackbox/handlers/ConversionHandler.java b/prober/src/test/java/google/registry/monitoring/blackbox/handler/ConversionHandler.java similarity index 88% rename from prober/src/test/java/google/registry/monitoring/blackbox/handlers/ConversionHandler.java rename to prober/src/test/java/google/registry/monitoring/blackbox/handler/ConversionHandler.java index 561dd0b38..c8376c686 100644 --- a/prober/src/test/java/google/registry/monitoring/blackbox/handlers/ConversionHandler.java +++ b/prober/src/test/java/google/registry/monitoring/blackbox/handler/ConversionHandler.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.handlers; +package google.registry.monitoring.blackbox.handler; import static java.nio.charset.StandardCharsets.US_ASCII; import static java.nio.charset.StandardCharsets.UTF_8; -import google.registry.monitoring.blackbox.messages.InboundMessageType; -import google.registry.monitoring.blackbox.messages.OutboundMessageType; -import google.registry.monitoring.blackbox.messages.TestMessage; +import google.registry.monitoring.blackbox.message.InboundMessageType; +import google.registry.monitoring.blackbox.message.OutboundMessageType; +import google.registry.monitoring.blackbox.message.TestMessage; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelDuplexHandler; diff --git a/prober/src/test/java/google/registry/monitoring/blackbox/handlers/EppActionHandlerTest.java b/prober/src/test/java/google/registry/monitoring/blackbox/handler/EppActionHandlerTest.java similarity index 95% rename from prober/src/test/java/google/registry/monitoring/blackbox/handlers/EppActionHandlerTest.java rename to prober/src/test/java/google/registry/monitoring/blackbox/handler/EppActionHandlerTest.java index 7aa1fa206..a47941cb8 100644 --- a/prober/src/test/java/google/registry/monitoring/blackbox/handlers/EppActionHandlerTest.java +++ b/prober/src/test/java/google/registry/monitoring/blackbox/handler/EppActionHandlerTest.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License -package google.registry.monitoring.blackbox.handlers; +package google.registry.monitoring.blackbox.handler; import static com.google.common.truth.Truth.assertThat; import static google.registry.testing.JUnitBackports.assertThrows; -import google.registry.monitoring.blackbox.exceptions.EppClientException; -import google.registry.monitoring.blackbox.exceptions.FailureException; -import google.registry.monitoring.blackbox.exceptions.UndeterminedStateException; -import google.registry.monitoring.blackbox.messages.EppRequestMessage; -import google.registry.monitoring.blackbox.messages.EppResponseMessage; +import google.registry.monitoring.blackbox.exception.EppClientException; +import google.registry.monitoring.blackbox.exception.FailureException; +import google.registry.monitoring.blackbox.exception.UndeterminedStateException; +import google.registry.monitoring.blackbox.message.EppRequestMessage; +import google.registry.monitoring.blackbox.message.EppResponseMessage; import google.registry.monitoring.blackbox.util.EppUtils; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandler; diff --git a/prober/src/test/java/google/registry/monitoring/blackbox/handlers/NettyRule.java b/prober/src/test/java/google/registry/monitoring/blackbox/handler/NettyRule.java similarity index 98% rename from prober/src/test/java/google/registry/monitoring/blackbox/handlers/NettyRule.java rename to prober/src/test/java/google/registry/monitoring/blackbox/handler/NettyRule.java index 95d90d851..ae520dffa 100644 --- a/prober/src/test/java/google/registry/monitoring/blackbox/handlers/NettyRule.java +++ b/prober/src/test/java/google/registry/monitoring/blackbox/handler/NettyRule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.handlers; +package google.registry.monitoring.blackbox.handler; import static com.google.common.base.Preconditions.checkState; import static com.google.common.truth.Truth.assertThat; @@ -28,7 +28,7 @@ import com.google.common.truth.ThrowableSubject; import google.registry.monitoring.blackbox.ProbingStepTest; import google.registry.monitoring.blackbox.connection.ProbingActionTest; import google.registry.monitoring.blackbox.connection.Protocol; -import google.registry.monitoring.blackbox.testservers.TestServer; +import google.registry.monitoring.blackbox.testserver.TestServer; import io.netty.bootstrap.Bootstrap; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/prober/src/test/java/google/registry/monitoring/blackbox/handlers/SslClientInitializerTest.java b/prober/src/test/java/google/registry/monitoring/blackbox/handler/SslClientInitializerTest.java similarity index 96% rename from prober/src/test/java/google/registry/monitoring/blackbox/handlers/SslClientInitializerTest.java rename to prober/src/test/java/google/registry/monitoring/blackbox/handler/SslClientInitializerTest.java index 45c6b6430..16751680c 100644 --- a/prober/src/test/java/google/registry/monitoring/blackbox/handlers/SslClientInitializerTest.java +++ b/prober/src/test/java/google/registry/monitoring/blackbox/handler/SslClientInitializerTest.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.handlers; +package google.registry.monitoring.blackbox.handler; import static com.google.common.truth.Truth.assertThat; import static google.registry.monitoring.blackbox.connection.ProbingAction.REMOTE_ADDRESS_KEY; import static google.registry.monitoring.blackbox.connection.Protocol.PROTOCOL_KEY; -import static google.registry.monitoring.blackbox.handlers.SslInitializerTestUtils.getKeyPair; -import static google.registry.monitoring.blackbox.handlers.SslInitializerTestUtils.setUpSslChannel; -import static google.registry.monitoring.blackbox.handlers.SslInitializerTestUtils.signKeyPair; +import static google.registry.monitoring.blackbox.handler.SslInitializerTestUtils.getKeyPair; +import static google.registry.monitoring.blackbox.handler.SslInitializerTestUtils.setUpSslChannel; +import static google.registry.monitoring.blackbox.handler.SslInitializerTestUtils.signKeyPair; import com.google.common.collect.ImmutableList; import google.registry.monitoring.blackbox.connection.Protocol; diff --git a/prober/src/test/java/google/registry/monitoring/blackbox/handlers/SslInitializerTestUtils.java b/prober/src/test/java/google/registry/monitoring/blackbox/handler/SslInitializerTestUtils.java similarity index 98% rename from prober/src/test/java/google/registry/monitoring/blackbox/handlers/SslInitializerTestUtils.java rename to prober/src/test/java/google/registry/monitoring/blackbox/handler/SslInitializerTestUtils.java index 6c27a5bba..1242e9b0d 100644 --- a/prober/src/test/java/google/registry/monitoring/blackbox/handlers/SslInitializerTestUtils.java +++ b/prober/src/test/java/google/registry/monitoring/blackbox/handler/SslInitializerTestUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.handlers; +package google.registry.monitoring.blackbox.handler; import static com.google.common.truth.Truth.assertThat; diff --git a/prober/src/test/java/google/registry/monitoring/blackbox/handlers/TestActionHandler.java b/prober/src/test/java/google/registry/monitoring/blackbox/handler/TestActionHandler.java similarity index 81% rename from prober/src/test/java/google/registry/monitoring/blackbox/handlers/TestActionHandler.java rename to prober/src/test/java/google/registry/monitoring/blackbox/handler/TestActionHandler.java index 7ab0b5f95..e328c6f3c 100644 --- a/prober/src/test/java/google/registry/monitoring/blackbox/handlers/TestActionHandler.java +++ b/prober/src/test/java/google/registry/monitoring/blackbox/handler/TestActionHandler.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.handlers; +package google.registry.monitoring.blackbox.handler; -import google.registry.monitoring.blackbox.exceptions.FailureException; -import google.registry.monitoring.blackbox.exceptions.UndeterminedStateException; -import google.registry.monitoring.blackbox.messages.InboundMessageType; +import google.registry.monitoring.blackbox.exception.FailureException; +import google.registry.monitoring.blackbox.exception.UndeterminedStateException; +import google.registry.monitoring.blackbox.message.InboundMessageType; import io.netty.channel.ChannelHandlerContext; /** diff --git a/prober/src/test/java/google/registry/monitoring/blackbox/handlers/WebWhoisActionHandlerTest.java b/prober/src/test/java/google/registry/monitoring/blackbox/handler/WebWhoisActionHandlerTest.java similarity index 95% rename from prober/src/test/java/google/registry/monitoring/blackbox/handlers/WebWhoisActionHandlerTest.java rename to prober/src/test/java/google/registry/monitoring/blackbox/handler/WebWhoisActionHandlerTest.java index 4cd8700c3..3bfa25ad9 100644 --- a/prober/src/test/java/google/registry/monitoring/blackbox/handlers/WebWhoisActionHandlerTest.java +++ b/prober/src/test/java/google/registry/monitoring/blackbox/handler/WebWhoisActionHandlerTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.handlers; +package google.registry.monitoring.blackbox.handler; import static com.google.common.truth.Truth.assertThat; import static google.registry.monitoring.blackbox.connection.ProbingAction.CONNECTION_FUTURE_KEY; @@ -23,10 +23,10 @@ import static google.registry.monitoring.blackbox.util.WebWhoisUtils.makeRedirec import com.google.common.collect.ImmutableList; import google.registry.monitoring.blackbox.connection.Protocol; -import google.registry.monitoring.blackbox.exceptions.FailureException; -import google.registry.monitoring.blackbox.messages.HttpRequestMessage; -import google.registry.monitoring.blackbox.messages.HttpResponseMessage; -import google.registry.monitoring.blackbox.testservers.TestServer; +import google.registry.monitoring.blackbox.exception.FailureException; +import google.registry.monitoring.blackbox.message.HttpRequestMessage; +import google.registry.monitoring.blackbox.message.HttpResponseMessage; +import google.registry.monitoring.blackbox.testserver.TestServer; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandler; diff --git a/prober/src/test/java/google/registry/monitoring/blackbox/messages/EppMessageTest.java b/prober/src/test/java/google/registry/monitoring/blackbox/message/EppMessageTest.java similarity index 97% rename from prober/src/test/java/google/registry/monitoring/blackbox/messages/EppMessageTest.java rename to prober/src/test/java/google/registry/monitoring/blackbox/message/EppMessageTest.java index e359189e1..aa9046d08 100644 --- a/prober/src/test/java/google/registry/monitoring/blackbox/messages/EppMessageTest.java +++ b/prober/src/test/java/google/registry/monitoring/blackbox/message/EppMessageTest.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License -package google.registry.monitoring.blackbox.messages; +package google.registry.monitoring.blackbox.message; import static com.google.common.truth.Truth.assertThat; import static google.registry.testing.JUnitBackports.assertThrows; import static java.nio.charset.StandardCharsets.UTF_8; -import google.registry.monitoring.blackbox.exceptions.EppClientException; -import google.registry.monitoring.blackbox.exceptions.FailureException; +import google.registry.monitoring.blackbox.exception.EppClientException; +import google.registry.monitoring.blackbox.exception.FailureException; import google.registry.monitoring.blackbox.util.EppUtils; import java.io.ByteArrayInputStream; import java.util.ArrayList; diff --git a/prober/src/test/java/google/registry/monitoring/blackbox/messages/TestMessage.java b/prober/src/test/java/google/registry/monitoring/blackbox/message/TestMessage.java similarity index 90% rename from prober/src/test/java/google/registry/monitoring/blackbox/messages/TestMessage.java rename to prober/src/test/java/google/registry/monitoring/blackbox/message/TestMessage.java index 64a727cfd..dcaf4247a 100644 --- a/prober/src/test/java/google/registry/monitoring/blackbox/messages/TestMessage.java +++ b/prober/src/test/java/google/registry/monitoring/blackbox/message/TestMessage.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License -package google.registry.monitoring.blackbox.messages; +package google.registry.monitoring.blackbox.message; -import google.registry.monitoring.blackbox.exceptions.UndeterminedStateException; +import google.registry.monitoring.blackbox.exception.UndeterminedStateException; /** * {@link InboundMessageType} and {@link OutboundMessageType} type for the purpose of containing diff --git a/prober/src/test/java/google/registry/monitoring/blackbox/metrics/MetricsCollectorTest.java b/prober/src/test/java/google/registry/monitoring/blackbox/metric/MetricsCollectorTest.java similarity index 96% rename from prober/src/test/java/google/registry/monitoring/blackbox/metrics/MetricsCollectorTest.java rename to prober/src/test/java/google/registry/monitoring/blackbox/metric/MetricsCollectorTest.java index c4e2bdc86..c73de8a5a 100644 --- a/prober/src/test/java/google/registry/monitoring/blackbox/metrics/MetricsCollectorTest.java +++ b/prober/src/test/java/google/registry/monitoring/blackbox/metric/MetricsCollectorTest.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.metrics; +package google.registry.monitoring.blackbox.metric; import static com.google.monitoring.metrics.contrib.DistributionMetricSubject.assertThat; import static com.google.monitoring.metrics.contrib.LongMetricSubject.assertThat; import com.google.common.collect.ImmutableSet; -import google.registry.monitoring.blackbox.metrics.MetricsCollector.ResponseType; +import google.registry.monitoring.blackbox.metric.MetricsCollector.ResponseType; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/prober/src/test/java/google/registry/monitoring/blackbox/testservers/TestServer.java b/prober/src/test/java/google/registry/monitoring/blackbox/testserver/TestServer.java similarity index 95% rename from prober/src/test/java/google/registry/monitoring/blackbox/testservers/TestServer.java rename to prober/src/test/java/google/registry/monitoring/blackbox/testserver/TestServer.java index aaa114f33..1c06a3db2 100644 --- a/prober/src/test/java/google/registry/monitoring/blackbox/testservers/TestServer.java +++ b/prober/src/test/java/google/registry/monitoring/blackbox/testserver/TestServer.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.testservers; +package google.registry.monitoring.blackbox.testserver; import static google.registry.monitoring.blackbox.util.WebWhoisUtils.makeHttpResponse; import static google.registry.monitoring.blackbox.util.WebWhoisUtils.makeRedirectResponse; import com.google.common.collect.ImmutableList; -import google.registry.monitoring.blackbox.exceptions.FailureException; -import google.registry.monitoring.blackbox.messages.EppMessage; -import google.registry.monitoring.blackbox.messages.HttpResponseMessage; +import google.registry.monitoring.blackbox.exception.FailureException; +import google.registry.monitoring.blackbox.message.EppMessage; +import google.registry.monitoring.blackbox.message.HttpResponseMessage; import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelDuplexHandler; diff --git a/prober/src/test/java/google/registry/monitoring/blackbox/tokens/EppTokenTest.java b/prober/src/test/java/google/registry/monitoring/blackbox/token/EppTokenTest.java similarity index 94% rename from prober/src/test/java/google/registry/monitoring/blackbox/tokens/EppTokenTest.java rename to prober/src/test/java/google/registry/monitoring/blackbox/token/EppTokenTest.java index 2005757d9..77c743c96 100644 --- a/prober/src/test/java/google/registry/monitoring/blackbox/tokens/EppTokenTest.java +++ b/prober/src/test/java/google/registry/monitoring/blackbox/token/EppTokenTest.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.tokens; +package google.registry.monitoring.blackbox.token; import static com.google.common.truth.Truth.assertThat; -import google.registry.monitoring.blackbox.exceptions.UndeterminedStateException; -import google.registry.monitoring.blackbox.messages.EppRequestMessage; +import google.registry.monitoring.blackbox.exception.UndeterminedStateException; +import google.registry.monitoring.blackbox.message.EppRequestMessage; import google.registry.monitoring.blackbox.util.EppUtils; import io.netty.channel.Channel; import org.junit.Test; diff --git a/prober/src/test/java/google/registry/monitoring/blackbox/tokens/WebWhoisTokenTest.java b/prober/src/test/java/google/registry/monitoring/blackbox/token/WebWhoisTokenTest.java similarity index 92% rename from prober/src/test/java/google/registry/monitoring/blackbox/tokens/WebWhoisTokenTest.java rename to prober/src/test/java/google/registry/monitoring/blackbox/token/WebWhoisTokenTest.java index f861fc7ac..0294e0aff 100644 --- a/prober/src/test/java/google/registry/monitoring/blackbox/tokens/WebWhoisTokenTest.java +++ b/prober/src/test/java/google/registry/monitoring/blackbox/token/WebWhoisTokenTest.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.monitoring.blackbox.tokens; +package google.registry.monitoring.blackbox.token; import static com.google.common.truth.Truth.assertThat; -import google.registry.monitoring.blackbox.exceptions.UndeterminedStateException; -import google.registry.monitoring.blackbox.messages.HttpRequestMessage; +import google.registry.monitoring.blackbox.exception.UndeterminedStateException; +import google.registry.monitoring.blackbox.message.HttpRequestMessage; import google.registry.util.CircularList; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/prober/src/test/java/google/registry/monitoring/blackbox/util/EppUtils.java b/prober/src/test/java/google/registry/monitoring/blackbox/util/EppUtils.java index 4a3737da9..5b79a348b 100644 --- a/prober/src/test/java/google/registry/monitoring/blackbox/util/EppUtils.java +++ b/prober/src/test/java/google/registry/monitoring/blackbox/util/EppUtils.java @@ -14,17 +14,17 @@ package google.registry.monitoring.blackbox.util; -import static google.registry.monitoring.blackbox.messages.EppMessage.CLIENT_ID_KEY; -import static google.registry.monitoring.blackbox.messages.EppMessage.CLIENT_PASSWORD_KEY; -import static google.registry.monitoring.blackbox.messages.EppMessage.CLIENT_TRID_KEY; -import static google.registry.monitoring.blackbox.messages.EppMessage.DOMAIN_KEY; +import static google.registry.monitoring.blackbox.message.EppMessage.CLIENT_ID_KEY; +import static google.registry.monitoring.blackbox.message.EppMessage.CLIENT_PASSWORD_KEY; +import static google.registry.monitoring.blackbox.message.EppMessage.CLIENT_TRID_KEY; +import static google.registry.monitoring.blackbox.message.EppMessage.DOMAIN_KEY; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import google.registry.monitoring.blackbox.exceptions.EppClientException; -import google.registry.monitoring.blackbox.messages.EppMessage; -import google.registry.monitoring.blackbox.messages.EppRequestMessage; -import google.registry.monitoring.blackbox.messages.EppResponseMessage; +import google.registry.monitoring.blackbox.exception.EppClientException; +import google.registry.monitoring.blackbox.message.EppMessage; +import google.registry.monitoring.blackbox.message.EppRequestMessage; +import google.registry.monitoring.blackbox.message.EppResponseMessage; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import java.io.IOException;