Upgrade fmt-maven-plugin to 2.9

olim7t · olim7t · commit 38b313eb60bd · 2019-06-26T09:59:38.000-07:00
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/ProtocolVersionInitialNegotiationIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/ProtocolVersionInitialNegotiationIT.java
@@ -35,10 +35,9 @@ public class ProtocolVersionInitialNegotiationIT {
   @Rule public CcmRule ccm = CcmRule.getInstance();
 
   @CassandraRequirement(
-    min = "2.1",
-    max = "2.2",
-    description = "required to downgrade to an older version"
-  )
+      min = "2.1",
+      max = "2.2",
+      description = "required to downgrade to an older version")
   @Test
   public void should_downgrade_to_v3() {
     try (CqlSession session = SessionUtils.newSession(ccm)) {
@@ -48,10 +47,9 @@ public void should_downgrade_to_v3() {
   }
 
   @CassandraRequirement(
-    min = "2.1",
-    max = "2.2",
-    description = "required to downgrade to an older version"
-  )
+      min = "2.1",
+      max = "2.2",
+      description = "required to downgrade to an older version")
   @Test
   public void should_fail_if_provided_version_isnt_supported() {
     DriverConfigLoader loader =
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/ProtocolVersionMixedClusterIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/ProtocolVersionMixedClusterIT.java
@@ -182,10 +182,7 @@ private BoundCluster mixedVersions(String... versions) {
   }
 
   private Stream<QueryLog> queries(BoundTopic topic) {
-    return topic
-        .getLogs()
-        .getQueryLogs()
-        .stream()
+    return topic.getLogs().getQueryLogs().stream()
         .filter(q -> q.getFrame().message instanceof Query);
   }
 
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/config/DriverExecutionProfileIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/config/DriverExecutionProfileIT.java
@@ -140,11 +140,7 @@ public void should_use_profile_consistency() {
       session.execute(query);
 
       Optional<QueryLog> log =
-          simulacron
-              .cluster()
-              .getLogs()
-              .getQueryLogs()
-              .stream()
+          simulacron.cluster().getLogs().getQueryLogs().stream()
               .filter(q -> q.getQuery().equals(query))
               .findFirst();
 
@@ -162,11 +158,7 @@ public void should_use_profile_consistency() {
       session.execute(SimpleStatement.builder(query).setExecutionProfileName("cl").build());
 
       log =
-          simulacron
-              .cluster()
-              .getLogs()
-              .getQueryLogs()
-              .stream()
+          simulacron.cluster().getLogs().getQueryLogs().stream()
               .filter(q -> q.getQuery().equals(query))
               .findFirst();
 
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/cql/ExecutionInfoWarningsIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/cql/ExecutionInfoWarningsIT.java
@@ -172,9 +172,7 @@ public void should_expose_warnings_on_execution_info() {
     // verify the log was generated
     verify(appender, timeout(500).atLeast(1)).doAppend(loggingEventCaptor.capture());
     List<String> logMessages =
-        loggingEventCaptor
-            .getAllValues()
-            .stream()
+        loggingEventCaptor.getAllValues().stream()
             .map(ILoggingEvent::getFormattedMessage)
             .collect(Collectors.toList());
     assertThat(logMessages)
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/data/DataTypeIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/data/DataTypeIT.java
@@ -233,8 +233,7 @@ public static Object[][] typeSamples() {
               // udt of int, type.
               final AtomicInteger fieldNameCounter = new AtomicInteger();
               List<CqlIdentifier> typeNames =
-                  types
-                      .stream()
+                  types.stream()
                       .map(
                           n -> CqlIdentifier.fromCql("field_" + fieldNameCounter.incrementAndGet()))
                       .collect(Collectors.toList());
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/heartbeat/HeartbeatIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/heartbeat/HeartbeatIT.java
@@ -254,10 +254,7 @@ private SocketAddress findControlConnectionAddress() {
   }
 
   private List<QueryLog> getHeartbeatsForNode() {
-    return simulacronNode
-        .getLogs()
-        .getQueryLogs()
-        .stream()
+    return simulacronNode.getLogs().getQueryLogs().stream()
         .filter(l -> l.getQuery().equals("OPTIONS"))
         .collect(Collectors.toList());
   }
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/api/core/loadbalancing/PerProfileLoadBalancingPolicyIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/api/core/loadbalancing/PerProfileLoadBalancingPolicyIT.java
@@ -126,13 +126,7 @@ public void should_use_policy_from_config_when_not_configured_in_request_profile
   private void assertQueryInDc(int dc, int expectedPerNode) {
     for (int i = 0; i < 2; i++) {
       assertThat(
-              simulacron
-                  .cluster()
-                  .dc(dc)
-                  .node(i)
-                  .getLogs()
-                  .getQueryLogs()
-                  .stream()
+              simulacron.cluster().dc(dc).node(i).getLogs().getQueryLogs().stream()
                   .filter(l -> l.getQuery().equals(QUERY_STRING)))
           .as("Expected query count to be %d for dc %d", 5, i)
           .hasSize(expectedPerNode);
diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/ComputedIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/ComputedIT.java
@@ -322,10 +322,9 @@ public interface ComputedDao {
     void save(ComputedEntity entity);
 
     @Insert(
-      ttl = ":ttl",
-      timestamp = ":writeTime",
-      nullSavingStrategy = NullSavingStrategy.SET_TO_NULL
-    )
+        ttl = ":ttl",
+        timestamp = ":writeTime",
+        nullSavingStrategy = NullSavingStrategy.SET_TO_NULL)
     void saveWithTime(ComputedEntity entity, int ttl, long writeTime);
 
     @Delete
@@ -338,12 +337,11 @@ public interface ComputedDao {
     ComputedEntity get(Row row);
 
     @Query(
-      value =
-          "select id, c_id, v, ttl(v) as myttl, writetime(v) as writetime from "
-              + "${qualifiedTableId} WHERE id = :id and "
-              + "c_id = :cId",
-      nullSavingStrategy = NullSavingStrategy.SET_TO_NULL
-    )
+        value =
+            "select id, c_id, v, ttl(v) as myttl, writetime(v) as writetime from "
+                + "${qualifiedTableId} WHERE id = :id and "
+                + "c_id = :cId",
+        nullSavingStrategy = NullSavingStrategy.SET_TO_NULL)
     ComputedEntity findByIdQuery(int id, int cId);
 
     @Update(nullSavingStrategy = NullSavingStrategy.SET_TO_NULL)
diff --git a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoDeleteMethodGenerator.java b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoDeleteMethodGenerator.java
@@ -121,9 +121,7 @@ public Optional<MethodSpec> generate() {
       }
       entityDefinition = context.getEntityFactory().getDefinition(entityElement);
       List<TypeName> primaryKeyTypes =
-          entityDefinition
-              .getPrimaryKey()
-              .stream()
+          entityDefinition.getPrimaryKey().stream()
               .map(d -> d.getType().asTypeName())
               .collect(Collectors.toList());
       List<TypeName> parameterTypes =
@@ -186,9 +184,7 @@ public Optional<MethodSpec> generate() {
       // The PK components are passed as arguments to the method (we've already checked that the
       // types match).
       List<CodeBlock> primaryKeyNames =
-          entityDefinition
-              .getPrimaryKey()
-              .stream()
+          entityDefinition.getPrimaryKey().stream()
               .map(PropertyDefinition::getCqlName)
               .collect(Collectors.toList());
       List<? extends VariableElement> bindMarkers = parameters.subList(0, primaryKeyNames.size());
diff --git a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoSelectMethodGenerator.java b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoSelectMethodGenerator.java
@@ -93,9 +93,7 @@ public Optional<MethodSpec> generate() {
     String customClause = selectAnnotation.customWhereClause();
     if (customClause.isEmpty()) {
       List<TypeName> primaryKeyTypes =
-          entityDefinition
-              .getPrimaryKey()
-              .stream()
+          entityDefinition.getPrimaryKey().stream()
               .map(d -> d.getType().asTypeName())
               .collect(Collectors.toList());
       List<TypeName> parameterTypes =
@@ -136,9 +134,7 @@ public Optional<MethodSpec> generate() {
       if (customClause.isEmpty()) {
         // Parameters are the PK components, we allow them to be named differently
         List<CodeBlock> primaryKeyNames =
-            entityDefinition
-                .getPrimaryKey()
-                .stream()
+            entityDefinition.getPrimaryKey().stream()
                 .map(PropertyDefinition::getCqlName)
                 .collect(Collectors.toList());
         warnIfCqlNamePresent(parameters);
diff --git a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/NullSavingStrategyValidation.java b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/NullSavingStrategyValidation.java
@@ -54,8 +54,7 @@ public NullSavingStrategyValidation(ProcessorContext context) {
   public boolean hasDoNotSetOnAnyLevel(
       List<ExecutableElement> methodElements, @Nullable DefaultNullSavingStrategy annotation) {
     boolean anyMethodHasOrDefaultsToDoNotSet =
-        methodElements
-            .stream()
+        methodElements.stream()
             .anyMatch(
                 v ->
                     updateHasDoNotSet(v, false)
@@ -64,8 +63,7 @@ public boolean hasDoNotSetOnAnyLevel(
                         || queryHasDoNotSet(v, false));
 
     boolean anyMethodHasDoNotSetExplicitly =
-        methodElements
-            .stream()
+        methodElements.stream()
             .anyMatch(
                 v ->
                     updateHasDoNotSet(v, true)
@@ -74,8 +72,7 @@ public boolean hasDoNotSetOnAnyLevel(
                         || queryHasDoNotSet(v, true));
 
     boolean allMethodsHaveSetToNull =
-        methodElements
-            .stream()
+        methodElements.stream()
             .filter(this::isOperationWithNullSavingStrategy)
             .allMatch(
                 v ->
diff --git a/pom.xml b/pom.xml
@@ -283,7 +283,7 @@
         <plugin>
           <groupId>com.coveo</groupId>
           <artifactId>fmt-maven-plugin</artifactId>
-          <version>2.2.0</version>
+          <version>2.9</version>
         </plugin>
         <plugin>
           <groupId>com.mycila</groupId>
diff --git a/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/simulacron/SimulacronRule.java b/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/simulacron/SimulacronRule.java
@@ -83,10 +83,7 @@ protected void after() {
   /** @return All nodes in first data center. */
   @Override
   public Set<EndPoint> getContactPoints() {
-    return boundCluster
-        .dc(0)
-        .getNodes()
-        .stream()
+    return boundCluster.dc(0).getNodes().stream()
         .map(node -> new DefaultEndPoint(node.inetSocketAddress()))
         .collect(Collectors.toSet());
   }

Original file line number	Diff line number	Diff line change
`@@ -182,10 +182,7 @@ private BoundCluster mixedVersions(String... versions) {`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`private Stream<QueryLog> queries(BoundTopic topic) {`
`185`		`- return topic`
`186`		`- .getLogs()`
`187`		`- .getQueryLogs()`
`188`		`- .stream()`
	`185`	`+ return topic.getLogs().getQueryLogs().stream()`
`189`	`186`	`.filter(q -> q.getFrame().message instanceof Query);`
`190`	`187`	`}`
`191`	`188`
Original file line number	Diff line number	Diff line change
`@@ -254,10 +254,7 @@ private SocketAddress findControlConnectionAddress() {`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`private List<QueryLog> getHeartbeatsForNode() {`
`257`		`- return simulacronNode`
`258`		`- .getLogs()`
`259`		`- .getQueryLogs()`
`260`		`- .stream()`
	`257`	`+ return simulacronNode.getLogs().getQueryLogs().stream()`
`261`	`258`	`.filter(l -> l.getQuery().equals("OPTIONS"))`
`262`	`259`	`.collect(Collectors.toList());`
`263`	`260`	`}`