[FLINK-6715] Activate strict checkstyle for flink-mesos

This closes apache#3988.

flink-mesos/pom.xml

@@ -300,6 +300,41 @@ under the License.
  </execution>
  </executions>
  </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.17</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>6.19</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
+ <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <logViolationsToConsole>true</logViolationsToConsole>
+ <failOnViolation>true</failOnViolation>
+ </configuration>
+ <executions>
+ <!--
+ Execute checkstyle after compilation but before tests.
+
+ This ensures that any parsing or type checking errors are from
+ javac, so they look as expected. Beyond that, we want to
+ fail as early as possible.
+ -->
+ <execution>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
  </plugins>
  </build>
 </project>

flink-mesos/src/main/java/org/apache/flink/mesos/Utils.java

@@ -20,12 +20,17 @@
 
 import org.apache.flink.mesos.util.MesosArtifactResolver;
 import org.apache.flink.runtime.clusterframework.ContainerSpecification;
+
 import org.apache.mesos.Protos;
-import scala.Option;
 
 import java.net.URL;
 import java.util.Arrays;
 
+import scala.Option;
+
+/**
+ * Collection of utility methods.
+ */
 public class Utils {
  /**
  * Construct a Mesos environment variable.
@@ -53,7 +58,7 @@ public static Protos.CommandInfo.URI uri(URL url, boolean cacheable) {
  */
  public static Protos.CommandInfo.URI uri(MesosArtifactResolver resolver, ContainerSpecification.Artifact artifact) {
  Option<URL> url = resolver.resolve(artifact.dest);
- if(url.isEmpty()) {
+ if (url.isEmpty()) {
  throw new IllegalArgumentException("Unresolvable artifact: " + artifact.dest);
  }
 

flink-mesos/src/main/java/org/apache/flink/mesos/cli/FlinkMesosSessionCli.java

@@ -18,10 +18,11 @@
 
 package org.apache.flink.mesos.cli;
 
+import org.apache.flink.configuration.Configuration;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.flink.configuration.Configuration;
 
 import java.io.IOException;
 import java.util.Map;
@@ -35,28 +36,30 @@ public class FlinkMesosSessionCli {
 
  /**
  * Decode encoded dynamic properties.
+ *
  * @param dynamicPropertiesEncoded encoded properties produced by the encoding method.
  * @return a configuration instance to be merged with the static configuration.
  */
  public static Configuration decodeDynamicProperties(String dynamicPropertiesEncoded) {
  try {
  Configuration configuration = new Configuration();
- if(dynamicPropertiesEncoded != null) {
- TypeReference<Map<String, String>> typeRef = new TypeReference<Map<String, String>>() {};
- Map<String,String> props = mapper.readValue(dynamicPropertiesEncoded, typeRef);
+ if (dynamicPropertiesEncoded != null) {
+ TypeReference<Map<String, String>> typeRef = new TypeReference<Map<String, String>>() {
+ };
+ Map<String, String> props = mapper.readValue(dynamicPropertiesEncoded, typeRef);
  for (Map.Entry<String, String> property : props.entrySet()) {
  configuration.setString(property.getKey(), property.getValue());
  }
  }
  return configuration;
- }
- catch(IOException ex) {
+ } catch (IOException ex) {
  throw new IllegalArgumentException("unreadable encoded properties", ex);
  }
  }
 
  /**
  * Encode dynamic properties as a string to be transported as an environment variable.
+ *
  * @param configuration the dynamic properties to encode.
  * @return a string to be decoded later.
  */

flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/LaunchableMesosWorker.java

@@ -18,39 +18,41 @@
 
 package org.apache.flink.mesos.runtime.clusterframework;
 
-import com.netflix.fenzo.ConstraintEvaluator;
-import com.netflix.fenzo.TaskAssignmentResult;
-import com.netflix.fenzo.TaskRequest;
-import com.netflix.fenzo.VMTaskFitnessCalculator;
 import org.apache.flink.configuration.ConfigConstants;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.mesos.Utils;
 import org.apache.flink.mesos.scheduler.LaunchableTask;
 import org.apache.flink.mesos.util.MesosArtifactResolver;
 import org.apache.flink.mesos.util.MesosConfiguration;
-import org.apache.flink.runtime.clusterframework.ContaineredTaskManagerParameters;
 import org.apache.flink.runtime.clusterframework.ContainerSpecification;
+import org.apache.flink.runtime.clusterframework.ContaineredTaskManagerParameters;
 import org.apache.flink.util.Preconditions;
+
+import com.netflix.fenzo.ConstraintEvaluator;
+import com.netflix.fenzo.TaskAssignmentResult;
+import com.netflix.fenzo.TaskRequest;
+import com.netflix.fenzo.VMTaskFitnessCalculator;
 import org.apache.mesos.Protos;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import scala.Option;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Matcher;
 
-import static org.apache.flink.mesos.Utils.variable;
+import scala.Option;
+
 import static org.apache.flink.mesos.Utils.range;
 import static org.apache.flink.mesos.Utils.ranges;
 import static org.apache.flink.mesos.Utils.scalar;
+import static org.apache.flink.mesos.Utils.variable;
 
 /**
  * Implements the launch of a Mesos worker.
  *
- * Translates the abstract {@link ContainerSpecification} into a concrete
+ * <p>Translates the abstract {@link ContainerSpecification} into a concrete
  * Mesos-specific {@link Protos.TaskInfo}.
  */
 public class LaunchableMesosWorker implements LaunchableTask {
@@ -59,9 +61,9 @@ public class LaunchableMesosWorker implements LaunchableTask {
  /**
  * The set of configuration keys to be dynamically configured with a port allocated from Mesos.
  */
- private static String[] TM_PORT_KEYS = {
+ private static final String[] TM_PORT_KEYS = {
  "taskmanager.rpc.port",
- "taskmanager.data.port" };
+ "taskmanager.data.port"};
 
  private final MesosArtifactResolver resolver;
  private final ContainerSpecification containerSpec;
@@ -88,7 +90,7 @@ public LaunchableMesosWorker(
  this.params = Preconditions.checkNotNull(params);
  this.taskID = Preconditions.checkNotNull(taskID);
  this.mesosConfiguration = Preconditions.checkNotNull(mesosConfiguration);
- 
+
  this.taskRequest = new Request();
  }
 
@@ -204,7 +206,7 @@ public Protos.TaskInfo launch(Protos.SlaveID slaveId, TaskAssignmentResult assig
  //configure task manager hostname property if hostname override property is supplied
  Option<String> taskManagerHostnameOption = params.getTaskManagerHostname();
 
- if(taskManagerHostnameOption.isDefined()) {
+ if (taskManagerHostnameOption.isDefined()) {
  // replace the TASK_ID pattern by the actual task id value of the Mesos task
  final String taskManagerHostname = MesosTaskManagerParameters.TASK_ID_PATTERN
  .matcher(taskManagerHostnameOption.get())
@@ -225,7 +227,7 @@ public Protos.TaskInfo launch(Protos.SlaveID slaveId, TaskAssignmentResult assig
  }
 
  // ship additional files
- for(ContainerSpecification.Artifact artifact : containerSpec.getArtifacts()) {
+ for (ContainerSpecification.Artifact artifact : containerSpec.getArtifacts()) {
  cmd.addUris(Utils.uri(resolver, artifact));
  }
 
@@ -271,9 +273,9 @@ public Protos.TaskInfo launch(Protos.SlaveID slaveId, TaskAssignmentResult assig
  // in event that no docker image or mesos image name is specified, we must still
  // set type to MESOS
  containerInfo.setType(Protos.ContainerInfo.Type.MESOS);
- switch(params.containerType()) {
+ switch (params.containerType()) {
  case MESOS:
- if(params.containerImageName().isDefined()) {
+ if (params.containerImageName().isDefined()) {
  containerInfo
  .setMesos(Protos.ContainerInfo.MesosInfo.newBuilder()
  .setImage(Protos.Image.newBuilder()
@@ -285,7 +287,7 @@ public Protos.TaskInfo launch(Protos.SlaveID slaveId, TaskAssignmentResult assig
 
  case DOCKER:
  assert(params.containerImageName().isDefined());
-  containerInfo
+ containerInfo
  .setType(Protos.ContainerInfo.Type.DOCKER)
  .setDocker(Protos.ContainerInfo.DockerInfo.newBuilder()
  .setNetwork(Protos.ContainerInfo.DockerInfo.Network.HOST)
@@ -300,7 +302,6 @@ public Protos.TaskInfo launch(Protos.SlaveID slaveId, TaskAssignmentResult assig
  containerInfo.addAllVolumes(params.containerVolumes());
  taskInfo.setContainer(containerInfo);
 
-
  return taskInfo.build();
  }