Fix most of the build warnings (#1476)

The following commit introduced many warnings 01aff5a Many of them were then fixed in cd297a1 This commit fixes most of the ones that are still present

Author: stIncMale

driver-core/src/test/unit/com/mongodb/internal/connection/ProtocolHelperSpecification.groovy

@@ -33,7 +33,8 @@ import org.bson.BsonNull
 import org.bson.BsonString
 import spock.lang.Specification
 
-import static com.mongodb.ClusterFixture.*
+import static com.mongodb.ClusterFixture.TIMEOUT_SETTINGS
+import static com.mongodb.ClusterFixture.TIMEOUT_SETTINGS_WITH_INFINITE_TIMEOUT
 import static com.mongodb.internal.connection.ProtocolHelper.getCommandFailureException
 import static com.mongodb.internal.connection.ProtocolHelper.getQueryFailureException
 import static com.mongodb.internal.connection.ProtocolHelper.isCommandOk
@@ -73,22 +74,19 @@ class ProtocolHelperSpecification extends Specification {
  def 'command failure exception should be MongoExecutionTimeoutException if error code is 50'() {
  expect:
  getCommandFailureException(new BsonDocument('ok', new BsonInt32(0)).append('code', new BsonInt32(50)),
- new ServerAddress(), new TimeoutContext(TIMEOUT_SETTINGS))
- instanceof MongoExecutionTimeoutException
+ new ServerAddress(), new TimeoutContext(TIMEOUT_SETTINGS)) instanceof MongoExecutionTimeoutException
  }
 
  def 'command failure exception should be MongoOperationTimeoutException if error code is 50 and timeoutMS is set'() {
  expect:
  getCommandFailureException(new BsonDocument('ok', new BsonInt32(0)).append('code', new BsonInt32(50)),
- new ServerAddress(), new TimeoutContext(TIMEOUT_SETTINGS_WITH_INFINITE_TIMEOUT))
- instanceof MongoOperationTimeoutException
+ new ServerAddress(), new TimeoutContext(TIMEOUT_SETTINGS_WITH_INFINITE_TIMEOUT)) instanceof MongoOperationTimeoutException
  }
 
  def 'query failure exception should be MongoExecutionTimeoutException if error code is 50'() {
  expect:
  getQueryFailureException(new BsonDocument('code', new BsonInt32(50)),
- new ServerAddress(), new TimeoutContext(TIMEOUT_SETTINGS))
- instanceof MongoExecutionTimeoutException
+ new ServerAddress(), new TimeoutContext(TIMEOUT_SETTINGS)) instanceof MongoExecutionTimeoutException
  }
 
  def 'query failure exception should be MongoOperationTimeoutException if error code is 50'() {
@@ -97,13 +95,12 @@ class ProtocolHelperSpecification extends Specification {
  new ServerAddress(), new TimeoutContext(TIMEOUT_SETTINGS_WITH_INFINITE_TIMEOUT))
  exception instanceof MongoOperationTimeoutException
  exception.getCause() instanceof MongoExecutionTimeoutException
-
  }
 
  def 'command failure exceptions should handle MongoNotPrimaryException scenarios'() {
  expect:
- getCommandFailureException(exception, new ServerAddress(), new TimeoutContext(TIMEOUT_SETTINGS))
- instanceof MongoNotPrimaryException
+ getCommandFailureException(
+ exception, new ServerAddress(), new TimeoutContext(TIMEOUT_SETTINGS)) instanceof MongoNotPrimaryException
 
  where:
  exception << [
@@ -115,8 +112,8 @@ class ProtocolHelperSpecification extends Specification {
 
  def 'query failure exceptions should handle MongoNotPrimaryException scenarios'() {
  expect:
- getQueryFailureException(exception, new ServerAddress(), new TimeoutContext(TIMEOUT_SETTINGS))
- instanceof MongoNotPrimaryException
+ getQueryFailureException(
+ exception, new ServerAddress(), new TimeoutContext(TIMEOUT_SETTINGS)) instanceof MongoNotPrimaryException
 
  where:
  exception << [
@@ -128,8 +125,8 @@ class ProtocolHelperSpecification extends Specification {
 
  def 'command failure exceptions should handle MongoNodeIsRecoveringException scenarios'() {
  expect:
- getCommandFailureException(exception, new ServerAddress(), new TimeoutContext(TIMEOUT_SETTINGS))
- instanceof MongoNodeIsRecoveringException
+ getCommandFailureException(
+ exception, new ServerAddress(), new TimeoutContext(TIMEOUT_SETTINGS)) instanceof MongoNodeIsRecoveringException
 
  where:
  exception << [
@@ -144,8 +141,8 @@ class ProtocolHelperSpecification extends Specification {
 
  def 'query failure exceptions should handle MongoNodeIsRecoveringException scenarios'() {
  expect:
- getQueryFailureException(exception, new ServerAddress(), new TimeoutContext(TIMEOUT_SETTINGS))
- instanceof MongoNodeIsRecoveringException
+ getQueryFailureException(
+ exception, new ServerAddress(), new TimeoutContext(TIMEOUT_SETTINGS)) instanceof MongoNodeIsRecoveringException
 
  where:
  exception << [

driver-core/src/test/unit/com/mongodb/internal/operation/OperationUnitSpecification.groovy

@@ -68,7 +68,7 @@ class OperationUnitSpecification extends Specification {
  [9, 0]: 25,
  ]
 
- static int getMaxWireVersionForServerVersion(List<Integer> serverVersion) {
+ static Integer getMaxWireVersionForServerVersion(List<Integer> serverVersion) {
  def maxWireVersion = SERVER_TO_WIRE_VERSION_MAP[serverVersion.subList(0, 2)]
 
  if (maxWireVersion == null) {

driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionAwsCredentialFromEnvironmentTest.java

@@ -230,8 +230,7 @@ void shouldThrowMongoCryptExceptionWhenNamedKMSProviderUsesEmptyOnDemandCredenti
  .build();
 
  MongoCryptException e = assertThrows(MongoCryptException.class, () -> {
- try (ClientEncryption ignore = createClientEncryption(settings)) {//NOP
- }
+ createClientEncryption(settings).close();
  });
  assertTrue(e.getMessage().contains("On-demand credentials are not supported for named KMS providers."));
  }
@@ -267,10 +266,9 @@ public void shouldThrowMongoCryptExceptionWhenNamedKMSProviderUsesEmptyOnDemandC
  .build();
 
  MongoCryptException e = assertThrows(MongoCryptException.class, () -> {
- try (MongoClient ignore = createMongoClient(getMongoClientSettingsBuilder()
+ createMongoClient(getMongoClientSettingsBuilder()
  .autoEncryptionSettings(autoEncryptionSettings)
- .build())) {//NOP
- }
+ .build()).close();
  });
  assertTrue(e.getMessage().contains("On-demand credentials are not supported for named KMS providers."));
  }