Skip to content

Commit cc5f0f6

Browse files
committed
Added missing Nullable annotations
JAVA-3719
1 parent 9f9d5c4 commit cc5f0f6

34 files changed

+156
-90
lines changed

driver-core/src/main/com/mongodb/ConnectionString.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,6 +1178,7 @@ public WriteConcern getWriteConcern() {
11781178
* @since 3.9
11791179
* @mongodb.server.release 3.6
11801180
*/
1181+
@Nullable
11811182
public Boolean getRetryWritesValue() {
11821183
return retryWrites;
11831184
}
@@ -1189,6 +1190,7 @@ public Boolean getRetryWritesValue() {
11891190
* @since 3.11
11901191
* @mongodb.server.release 3.6
11911192
*/
1193+
@Nullable
11921194
public Boolean getRetryReads() {
11931195
return retryReads;
11941196
}

driver-core/src/main/com/mongodb/MongoBulkWriteException.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ public List<BulkWriteError> getWriteErrors() {
108108
*
109109
* @return the write concern error
110110
*/
111+
@Nullable
111112
public WriteConcernError getWriteConcernError() {
112113
return writeConcernError;
113114
}

driver-core/src/main/com/mongodb/MongoClientSettings.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,10 @@ public Builder applyConnectionString(final ConnectionString connectionString) {
210210
if (connectionString.getReadPreference() != null) {
211211
readPreference = connectionString.getReadPreference();
212212
}
213-
if (connectionString.getRetryWritesValue() != null) {
214-
retryWrites = connectionString.getRetryWritesValue();
213+
214+
Boolean retryWritesValue = connectionString.getRetryWritesValue();
215+
if (retryWritesValue != null) {
216+
retryWrites = retryWritesValue;
215217
}
216218
if (connectionString.getUuidRepresentation() != null) {
217219
uuidRepresentation = connectionString.getUuidRepresentation();

driver-core/src/main/com/mongodb/ReadConcernLevel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public enum ReadConcernLevel {
7373
}
7474

7575
/**
76-
* @return the String representation of the read concern level that the MongoDB server understands or null for the default
76+
* @return the String representation of the read concern level that the MongoDB server understands
7777
*/
7878
public String getValue() {
7979
return value;

driver-core/src/main/com/mongodb/WriteConcern.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ private WriteConcern(@Nullable final Object w, @Nullable final Integer wTimeoutM
192192
*
193193
* @return w, either an instance of Integer or String or null
194194
*/
195+
@Nullable
195196
public Object getWObject() {
196197
return w;
197198
}
@@ -239,6 +240,7 @@ public Integer getWTimeout(final TimeUnit timeUnit) {
239240
* @since 3.2
240241
* @mongodb.driver.manual core/write-concern/#journaled Journaled
241242
*/
243+
@Nullable
242244
public Boolean getJournal() {
243245
return journal;
244246
}
@@ -369,7 +371,7 @@ public WriteConcern withW(final String w) {
369371
* @since 3.2
370372
* @mongodb.driver.manual reference/write-concern/#j-option j option
371373
*/
372-
public WriteConcern withJournal(final Boolean journal) {
374+
public WriteConcern withJournal(@Nullable final Boolean journal) {
373375
return new WriteConcern(w, wTimeoutMS, fsync, journal);
374376
}
375377

driver-core/src/main/com/mongodb/connection/AsynchronousSocketChannelStreamFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.mongodb.ServerAddress;
2020
import com.mongodb.internal.connection.AsynchronousSocketChannelStream;
2121
import com.mongodb.internal.connection.PowerOfTwoBufferPool;
22+
import com.mongodb.lang.Nullable;
2223

2324
import java.nio.channels.AsynchronousChannelGroup;
2425

@@ -54,7 +55,7 @@ public AsynchronousSocketChannelStreamFactory(final SocketSettings settings, fin
5455
* @since 3.6
5556
*/
5657
public AsynchronousSocketChannelStreamFactory(final SocketSettings settings, final SslSettings sslSettings,
57-
final AsynchronousChannelGroup group) {
58+
@Nullable final AsynchronousChannelGroup group) {
5859
if (sslSettings.isEnabled()) {
5960
throw new UnsupportedOperationException("No SSL support in java.nio.channels.AsynchronousSocketChannel. For SSL support use "
6061
+ "com.mongodb.connection.TlsChannelStreamFactoryFactory");

driver-core/src/main/com/mongodb/connection/ClusterDescription.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.mongodb.annotations.Immutable;
2222
import com.mongodb.internal.selector.ReadPreferenceServerSelector;
2323
import com.mongodb.internal.selector.WritableServerSelector;
24+
import com.mongodb.lang.Nullable;
2425

2526
import java.util.ArrayList;
2627
import java.util.Collections;
@@ -138,6 +139,7 @@ public boolean isCompatibleWithDriver() {
138139
* @return a server in the cluster that is incompatibly older than the driver, or null if there are none
139140
* @since 3.6
140141
*/
142+
@Nullable
141143
public ServerDescription findServerIncompatiblyOlderThanDriver() {
142144
for (ServerDescription cur : serverDescriptions) {
143145
if (cur.isIncompatiblyOlderThanDriver()) {
@@ -153,6 +155,7 @@ public ServerDescription findServerIncompatiblyOlderThanDriver() {
153155
* @return a server in the cluster that is incompatibly newer than the driver, or null if there are none
154156
* @since 3.6
155157
*/
158+
@Nullable
156159
public ServerDescription findServerIncompatiblyNewerThanDriver() {
157160
for (ServerDescription cur : serverDescriptions) {
158161
if (cur.isIncompatiblyNewerThanDriver()) {
@@ -210,6 +213,7 @@ public ClusterType getType() {
210213
* @return any exception encountered while resolving the SRV record for the initial host, or null if none
211214
* @since 3.10
212215
*/
216+
@Nullable
213217
public MongoException getSrvResolutionException() {
214218
return srvResolutionException;
215219
}
@@ -231,18 +235,21 @@ public List<ServerDescription> getServerDescriptions() {
231235
* @mongodb.server.release 3.6
232236
* @since 3.6
233237
*/
238+
@Nullable
234239
public Integer getLogicalSessionTimeoutMinutes() {
235240
Integer retVal = null;
236241

237242
for (ServerDescription cur : getServersByPredicate(this, serverDescription ->
238243
serverDescription.isPrimary() || serverDescription.isSecondary())) {
239-
if (cur.getLogicalSessionTimeoutMinutes() == null) {
244+
245+
Integer logicalSessionTimeoutMinutes = cur.getLogicalSessionTimeoutMinutes();
246+
if (logicalSessionTimeoutMinutes == null) {
240247
return null;
241248
}
242249
if (retVal == null) {
243-
retVal = cur.getLogicalSessionTimeoutMinutes();
250+
retVal = logicalSessionTimeoutMinutes;
244251
} else {
245-
retVal = Math.min(retVal, cur.getLogicalSessionTimeoutMinutes());
252+
retVal = Math.min(retVal, logicalSessionTimeoutMinutes);
246253
}
247254
}
248255
return retVal;

driver-core/src/main/com/mongodb/connection/ClusterSettings.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.mongodb.internal.connection.Cluster;
2525
import com.mongodb.internal.connection.ServerAddressHelper;
2626
import com.mongodb.internal.selector.LatencyMinimizingServerSelector;
27+
import com.mongodb.lang.Nullable;
2728
import com.mongodb.selector.CompositeServerSelector;
2829
import com.mongodb.selector.ServerSelector;
2930

@@ -324,6 +325,7 @@ public ClusterSettings build() {
324325
* @return the SRV host, or null if none specified
325326
* @since 3.10
326327
*/
328+
@Nullable
327329
public String getSrvHost() {
328330
return srvHost;
329331
}
@@ -389,6 +391,7 @@ public String getRequiredReplicaSetName() {
389391
* @return the server selector, which may be null
390392
* @see Cluster#selectServer(com.mongodb.selector.ServerSelector)
391393
*/
394+
@Nullable
392395
public ServerSelector getServerSelector() {
393396
return serverSelector;
394397
}

driver-core/src/main/com/mongodb/connection/ConnectionId.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.mongodb.connection;
1818

1919
import com.mongodb.annotations.Immutable;
20+
import com.mongodb.lang.Nullable;
2021

2122
import java.util.concurrent.atomic.AtomicInteger;
2223

@@ -63,7 +64,7 @@ public ConnectionId(final ServerId serverId) {
6364
* @see #withServerValue(int)
6465
* @since 3.11
6566
*/
66-
public ConnectionId(final ServerId serverId, final int localValue, final Integer serverValue) {
67+
public ConnectionId(final ServerId serverId, final int localValue, @Nullable final Integer serverValue) {
6768
this.serverId = notNull("serverId", serverId);
6869
this.localValue = localValue;
6970
this.serverValue = serverValue;
@@ -109,6 +110,7 @@ public int getLocalValue() {
109110
*
110111
* @return the server generated id value for the connection or null if not set.
111112
*/
113+
@Nullable
112114
public Integer getServerValue() {
113115
return serverValue;
114116
}

driver-core/src/main/com/mongodb/connection/ServerDescription.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ public String getCanonicalAddress() {
129129
* @mongodb.server.release 3.6
130130
* @since 3.6
131131
*/
132+
@Nullable
132133
public Integer getLogicalSessionTimeoutMinutes() {
133134
return logicalSessionTimeoutMinutes;
134135
}
@@ -390,7 +391,7 @@ public Builder setVersion(final Integer setVersion) {
390391
* @since 3.4
391392
* @mongodb.server.release 3.4
392393
*/
393-
public Builder lastWriteDate(final Date lastWriteDate) {
394+
public Builder lastWriteDate(@Nullable final Date lastWriteDate) {
394395
this.lastWriteDate = lastWriteDate;
395396
return this;
396397
}
@@ -417,7 +418,7 @@ public Builder lastUpdateTimeNanos(final long lastUpdateTimeNanos) {
417418
* @mongodb.server.release 3.6
418419
* @since 3.6
419420
*/
420-
public Builder logicalSessionTimeoutMinutes(final Integer logicalSessionTimeoutMinutes) {
421+
public Builder logicalSessionTimeoutMinutes(@Nullable final Integer logicalSessionTimeoutMinutes) {
421422
this.logicalSessionTimeoutMinutes = logicalSessionTimeoutMinutes;
422423
return this;
423424
}
@@ -643,6 +644,7 @@ public int getMaxWireVersion() {
643644
*
644645
* @return the electionId, which may be null
645646
*/
647+
@Nullable
646648
public ObjectId getElectionId() {
647649
return electionId;
648650
}
@@ -652,6 +654,7 @@ public ObjectId getElectionId() {
652654
*
653655
* @return the setVersion, which may be null
654656
*/
657+
@Nullable
655658
public Integer getSetVersion() {
656659
return setVersion;
657660
}
@@ -759,6 +762,7 @@ public long getRoundTripTimeNanos() {
759762
*
760763
* @return the exception, which may be null
761764
*/
765+
@Nullable
762766
public Throwable getException() {
763767
return exception;
764768
}

0 commit comments

Comments
 (0)