Rename packages in the prober (#233)

Package names should not be plural.

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

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;

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;
 

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;

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

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

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 {

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

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

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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

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

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;

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;

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;

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;

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;

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;
 
 /**

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;