From ec4ee15b84980e408037add803f90a853c616469 Mon Sep 17 00:00:00 2001 From: Henry Hughes Date: Mon, 30 Oct 2023 18:35:28 -0700 Subject: [PATCH] replace spotbugs with findbugs/jsr305 due to license incompatibility --- CONTRIBUTING.md | 6 +- core-shaded/pom.xml | 6 +- core/pom.xml | 6 +- .../dse/driver/api/core/DseSession.java | 6 +- .../driver/api/core/DseSessionBuilder.java | 6 +- .../api/core/auth/BaseDseAuthenticator.java | 10 +- .../core/auth/DseGssApiAuthProviderBase.java | 42 +- .../auth/DsePlainTextAuthProviderBase.java | 4 +- .../ProgrammaticDseGssApiAuthProvider.java | 6 +- .../api/core/auth/ProxyAuthentication.java | 12 +- .../core/config/DseDriverConfigLoader.java | 16 +- .../api/core/config/DseDriverOption.java | 4 +- .../continuous/ContinuousAsyncResultSet.java | 4 +- .../cql/continuous/ContinuousResultSet.java | 4 +- .../cql/continuous/ContinuousSession.java | 10 +- .../reactive/ContinuousReactiveSession.java | 10 +- .../cql/reactive/ReactiveQueryMetadata.java | 8 +- .../api/core/cql/reactive/ReactiveRow.java | 6 +- .../core/cql/reactive/ReactiveSession.java | 18 +- .../api/core/data/geometry/Geometry.java | 10 +- .../api/core/data/geometry/LineString.java | 20 +- .../driver/api/core/data/geometry/Point.java | 16 +- .../api/core/data/geometry/Polygon.java | 30 +- .../driver/api/core/data/time/DateRange.java | 20 +- .../api/core/data/time/DateRangeBound.java | 16 +- .../core/data/time/DateRangePrecision.java | 10 +- .../api/core/graph/AsyncGraphResultSet.java | 12 +- .../api/core/graph/BatchGraphStatement.java | 26 +- .../graph/BatchGraphStatementBuilder.java | 18 +- .../api/core/graph/FluentGraphStatement.java | 16 +- .../graph/FluentGraphStatementBuilder.java | 8 +- .../driver/api/core/graph/GraphResultSet.java | 10 +- .../driver/api/core/graph/GraphSession.java | 10 +- .../driver/api/core/graph/GraphStatement.java | 30 +- .../core/graph/GraphStatementBuilderBase.java | 38 +- .../api/core/graph/ScriptGraphStatement.java | 30 +- .../graph/ScriptGraphStatementBuilder.java | 24 +- .../driver/api/core/graph/predicates/Geo.java | 16 +- .../graph/reactive/ReactiveGraphNode.java | 4 +- .../reactive/ReactiveGraphResultSet.java | 4 +- .../graph/reactive/ReactiveGraphSession.java | 6 +- .../metadata/schema/DseAggregateMetadata.java | 4 +- .../core/metadata/schema/DseEdgeMetadata.java | 20 +- .../metadata/schema/DseFunctionMetadata.java | 6 +- .../schema/DseGraphKeyspaceMetadata.java | 6 +- .../schema/DseGraphTableMetadata.java | 8 +- .../metadata/schema/DseVertexMetadata.java | 4 +- .../api/core/metrics/DseNodeMetric.java | 8 +- .../api/core/metrics/DseSessionMetric.java | 8 +- .../servererrors/UnfitClientException.java | 12 +- .../core/auth/DseGssApiAuthProvider.java | 6 +- .../ContinuousCqlRequestHandler.java | 50 +- .../ContinuousRequestHandlerBase.java | 112 +-- .../DefaultContinuousAsyncResultSet.java | 18 +- .../DefaultContinuousResultSet.java | 8 +- .../core/cql/reactive/DefaultReactiveRow.java | 158 ++-- .../cql/reactive/FailedReactiveResultSet.java | 8 +- .../core/cql/reactive/ReactiveOperators.java | 6 +- .../cql/reactive/ReactiveResultSetBase.java | 10 +- .../ReactiveResultSetSubscription.java | 38 +- .../cql/reactive/SimpleUnicastProcessor.java | 6 +- .../core/data/geometry/DefaultGeometry.java | 32 +- .../core/data/geometry/DefaultLineString.java | 8 +- .../core/data/geometry/DefaultPoint.java | 6 +- .../core/data/geometry/DefaultPolygon.java | 16 +- .../internal/core/data/geometry/Distance.java | 20 +- .../graph/ContinuousAsyncGraphResultSet.java | 18 +- .../graph/ContinuousGraphRequestHandler.java | 54 +- .../graph/DefaultAsyncGraphResultSet.java | 10 +- .../graph/DefaultBatchGraphStatement.java | 12 +- .../graph/DefaultFluentGraphStatement.java | 4 +- .../graph/DefaultScriptGraphStatement.java | 18 +- .../graph/GraphExecutionInfoConverter.java | 16 +- .../internal/core/graph/GraphProtocol.java | 8 +- .../graph/GraphRequestAsyncProcessor.java | 4 +- .../core/graph/GraphRequestHandler.java | 16 +- .../internal/core/graph/GraphSONUtils.java | 4 +- .../core/graph/GraphStatementBase.java | 32 +- .../core/graph/GraphSupportChecker.java | 16 +- .../core/graph/MultiPageGraphResultSet.java | 12 +- .../core/graph/SinglePageGraphResultSet.java | 8 +- .../binary/ComplexTypeSerializerUtil.java | 2 +- .../reactive/DefaultReactiveGraphNode.java | 6 +- .../DefaultReactiveGraphResultSet.java | 6 +- .../FailedReactiveGraphResultSet.java | 4 +- .../ReactiveGraphRequestProcessor.java | 4 +- .../ReactiveGraphResultSetSubscription.java | 34 +- .../DseDcInferringLoadBalancingPolicy.java | 4 +- .../loadbalancing/DseLoadBalancingPolicy.java | 4 +- .../schema/DefaultDseAggregateMetadata.java | 16 +- .../schema/DefaultDseColumnMetadata.java | 10 +- .../schema/DefaultDseEdgeMetadata.java | 56 +- .../schema/DefaultDseFunctionMetadata.java | 22 +- .../schema/DefaultDseIndexMetadata.java | 14 +- .../schema/DefaultDseKeyspaceMetadata.java | 48 +- .../schema/DefaultDseTableMetadata.java | 52 +- .../schema/DefaultDseVertexMetadata.java | 8 +- .../schema/DefaultDseViewMetadata.java | 54 +- .../internal/core/search/DateRangeUtil.java | 12 +- .../type/codec/geometry/GeometryCodec.java | 26 +- .../type/codec/geometry/LineStringCodec.java | 26 +- .../core/type/codec/geometry/PointCodec.java | 26 +- .../type/codec/geometry/PolygonCodec.java | 26 +- .../core/type/codec/time/DateRangeCodec.java | 16 +- .../concurrent/BoundedConcurrentQueue.java | 8 +- .../api/core/AllNodesFailedException.java | 24 +- .../driver/api/core/AsyncAutoCloseable.java | 8 +- .../driver/api/core/AsyncPagingIterable.java | 12 +- .../oss/driver/api/core/ConsistencyLevel.java | 4 +- .../oss/driver/api/core/CqlIdentifier.java | 14 +- .../oss/driver/api/core/CqlSession.java | 4 +- .../driver/api/core/CqlSessionBuilder.java | 4 +- .../api/core/DefaultConsistencyLevel.java | 4 +- .../oss/driver/api/core/DriverException.java | 6 +- .../api/core/DriverExecutionException.java | 4 +- .../api/core/DriverTimeoutException.java | 6 +- .../api/core/InvalidKeyspaceException.java | 6 +- .../oss/driver/api/core/MavenCoordinates.java | 10 +- .../api/core/NoNodeAvailableException.java | 4 +- .../api/core/NodeUnavailableException.java | 6 +- .../oss/driver/api/core/PagingIterable.java | 16 +- .../oss/driver/api/core/ProtocolVersion.java | 4 +- .../api/core/RequestThrottlingException.java | 6 +- .../UnsupportedProtocolVersionException.java | 20 +- .../datastax/oss/driver/api/core/Version.java | 20 +- .../addresstranslation/AddressTranslator.java | 6 +- .../driver/api/core/auth/AuthProvider.java | 8 +- .../core/auth/AuthenticationException.java | 10 +- .../driver/api/core/auth/Authenticator.java | 10 +- .../core/auth/PlainTextAuthProviderBase.java | 44 +- .../ProgrammaticPlainTextAuthProvider.java | 16 +- .../api/core/auth/SyncAuthenticator.java | 10 +- .../api/core/config/DefaultDriverOption.java | 4 +- .../driver/api/core/config/DriverConfig.java | 10 +- .../api/core/config/DriverConfigLoader.java | 52 +- .../core/config/DriverExecutionProfile.java | 154 ++-- .../driver/api/core/config/DriverOption.java | 4 +- .../api/core/config/OngoingConfigOptions.java | 74 +- .../driver/api/core/config/OptionsMap.java | 28 +- ...ProgrammaticDriverConfigLoaderBuilder.java | 10 +- .../api/core/config/TypedDriverOption.java | 8 +- .../connection/BusyConnectionException.java | 4 +- .../connection/ClosedConnectionException.java | 12 +- .../connection/ConnectionInitException.java | 8 +- .../core/connection/CrcMismatchException.java | 6 +- .../connection/FrameTooLongException.java | 8 +- .../core/connection/HeartbeatException.java | 10 +- .../core/connection/ReconnectionPolicy.java | 10 +- .../api/core/context/DriverContext.java | 44 +- .../driver/api/core/cql/AsyncCqlSession.java | 28 +- .../driver/api/core/cql/BatchStatement.java | 52 +- .../api/core/cql/BatchStatementBuilder.java | 36 +- .../oss/driver/api/core/cql/Bindable.java | 18 +- .../driver/api/core/cql/BoundStatement.java | 10 +- .../api/core/cql/BoundStatementBuilder.java | 52 +- .../driver/api/core/cql/ColumnDefinition.java | 10 +- .../api/core/cql/ColumnDefinitions.java | 28 +- .../driver/api/core/cql/ExecutionInfo.java | 18 +- .../oss/driver/api/core/cql/PagingState.java | 16 +- .../driver/api/core/cql/PrepareRequest.java | 10 +- .../api/core/cql/PreparedStatement.java | 24 +- .../oss/driver/api/core/cql/QueryTrace.java | 14 +- .../datastax/oss/driver/api/core/cql/Row.java | 6 +- .../driver/api/core/cql/SimpleStatement.java | 48 +- .../api/core/cql/SimpleStatementBuilder.java | 42 +- .../oss/driver/api/core/cql/Statement.java | 62 +- .../driver/api/core/cql/StatementBuilder.java | 56 +- .../driver/api/core/cql/SyncCqlSession.java | 30 +- .../oss/driver/api/core/cql/TraceEvent.java | 2 +- .../driver/api/core/data/AccessibleById.java | 12 +- .../api/core/data/AccessibleByIndex.java | 4 +- .../api/core/data/AccessibleByName.java | 12 +- .../oss/driver/api/core/data/CqlDuration.java | 44 +- .../oss/driver/api/core/data/CqlVector.java | 6 +- .../oss/driver/api/core/data/Data.java | 6 +- .../driver/api/core/data/GettableById.java | 66 +- .../driver/api/core/data/GettableByIndex.java | 12 +- .../driver/api/core/data/GettableByName.java | 66 +- .../driver/api/core/data/SettableById.java | 140 ++-- .../driver/api/core/data/SettableByIndex.java | 84 +- .../driver/api/core/data/SettableByName.java | 136 +-- .../oss/driver/api/core/data/TupleValue.java | 6 +- .../oss/driver/api/core/data/UdtValue.java | 6 +- .../api/core/detach/AttachmentPoint.java | 10 +- .../driver/api/core/detach/Detachable.java | 4 +- .../loadbalancing/LoadBalancingPolicy.java | 20 +- .../loadbalancing/NodeDistanceEvaluator.java | 6 +- .../driver/api/core/metadata/EndPoint.java | 6 +- .../driver/api/core/metadata/Metadata.java | 26 +- .../oss/driver/api/core/metadata/Node.java | 20 +- .../api/core/metadata/NodeStateListener.java | 12 +- .../core/metadata/NodeStateListenerBase.java | 10 +- .../metadata/SafeInitNodeStateListener.java | 18 +- .../driver/api/core/metadata/TokenMap.java | 60 +- .../metadata/schema/AggregateMetadata.java | 22 +- .../core/metadata/schema/ColumnMetadata.java | 10 +- .../api/core/metadata/schema/Describable.java | 6 +- .../metadata/schema/FunctionMetadata.java | 18 +- .../metadata/schema/FunctionSignature.java | 18 +- .../core/metadata/schema/IndexMetadata.java | 20 +- .../metadata/schema/KeyspaceMetadata.java | 88 +- .../metadata/schema/RelationMetadata.java | 24 +- .../metadata/schema/SchemaChangeListener.java | 40 +- .../schema/SchemaChangeListenerBase.java | 38 +- .../core/metadata/schema/TableMetadata.java | 16 +- .../core/metadata/schema/ViewMetadata.java | 10 +- .../api/core/metadata/token/TokenRange.java | 22 +- .../api/core/metrics/DefaultNodeMetric.java | 8 +- .../core/metrics/DefaultSessionMetric.java | 8 +- .../oss/driver/api/core/metrics/Metrics.java | 22 +- .../driver/api/core/metrics/NodeMetric.java | 4 +- .../api/core/metrics/SessionMetric.java | 4 +- .../driver/api/core/paging/OffsetPager.java | 24 +- .../driver/api/core/retry/RetryPolicy.java | 38 +- .../driver/api/core/retry/RetryVerdict.java | 8 +- .../servererrors/AlreadyExistsException.java | 16 +- .../servererrors/BootstrappingException.java | 12 +- .../CASWriteUnknownException.java | 14 +- .../CDCWriteFailureException.java | 14 +- .../servererrors/CoordinatorException.java | 10 +- .../FunctionFailureException.java | 12 +- .../InvalidConfigurationInQueryException.java | 12 +- .../servererrors/InvalidQueryException.java | 12 +- .../servererrors/OverloadedException.java | 14 +- .../api/core/servererrors/ProtocolError.java | 12 +- .../QueryConsistencyException.java | 10 +- .../servererrors/QueryExecutionException.java | 8 +- .../QueryValidationException.java | 8 +- .../servererrors/ReadFailureException.java | 22 +- .../servererrors/ReadTimeoutException.java | 14 +- .../api/core/servererrors/ServerError.java | 12 +- .../api/core/servererrors/SyntaxError.java | 12 +- .../core/servererrors/TruncateException.java | 12 +- .../servererrors/UnauthorizedException.java | 12 +- .../servererrors/UnavailableException.java | 16 +- .../servererrors/WriteFailureException.java | 28 +- .../servererrors/WriteTimeoutException.java | 22 +- .../api/core/servererrors/WriteType.java | 4 +- .../core/session/ProgrammaticArguments.java | 84 +- .../oss/driver/api/core/session/Request.java | 6 +- .../oss/driver/api/core/session/Session.java | 26 +- .../api/core/session/SessionBuilder.java | 128 +-- .../session/throttling/RequestThrottler.java | 10 +- .../core/session/throttling/Throttled.java | 4 +- .../specex/SpeculativeExecutionPolicy.java | 8 +- .../ssl/ProgrammaticSslEngineFactory.java | 14 +- .../driver/api/core/ssl/SslEngineFactory.java | 6 +- .../api/core/tracker/RequestTracker.java | 66 +- .../driver/api/core/type/ContainerType.java | 4 +- .../oss/driver/api/core/type/CustomType.java | 6 +- .../oss/driver/api/core/type/DataType.java | 4 +- .../oss/driver/api/core/type/DataTypes.java | 46 +- .../oss/driver/api/core/type/ListType.java | 4 +- .../oss/driver/api/core/type/MapType.java | 8 +- .../oss/driver/api/core/type/SetType.java | 4 +- .../oss/driver/api/core/type/TupleType.java | 14 +- .../driver/api/core/type/UserDefinedType.java | 42 +- .../type/codec/CodecNotFoundException.java | 8 +- .../api/core/type/codec/ExtraTypeCodecs.java | 50 +- .../api/core/type/codec/MappingCodec.java | 16 +- .../type/codec/PrimitiveBooleanCodec.java | 12 +- .../core/type/codec/PrimitiveByteCodec.java | 12 +- .../core/type/codec/PrimitiveDoubleCodec.java | 12 +- .../core/type/codec/PrimitiveFloatCodec.java | 12 +- .../core/type/codec/PrimitiveIntCodec.java | 12 +- .../core/type/codec/PrimitiveLongCodec.java | 12 +- .../core/type/codec/PrimitiveShortCodec.java | 12 +- .../driver/api/core/type/codec/TypeCodec.java | 22 +- .../api/core/type/codec/TypeCodecs.java | 34 +- .../type/codec/registry/CodecRegistry.java | 30 +- .../api/core/type/reflect/GenericType.java | 90 +- .../type/reflect/GenericTypeParameter.java | 4 +- .../oss/driver/api/core/uuid/Uuids.java | 50 +- .../core/AsyncPagingIterableWrapper.java | 10 +- .../driver/internal/core/CqlIdentifiers.java | 26 +- .../core/DefaultMavenCoordinates.java | 10 +- .../internal/core/PagingIterableWrapper.java | 20 +- .../Ec2MultiRegionAddressTranslator.java | 10 +- .../FixedHostNameAddressTranslator.java | 10 +- .../PassThroughAddressTranslator.java | 6 +- .../core/adminrequest/AdminResult.java | 4 +- .../internal/core/adminrequest/AdminRow.java | 2 +- .../ThrottledAdminRequestHandler.java | 4 +- .../core/auth/PlainTextAuthProvider.java | 6 +- .../core/config/DerivedExecutionProfile.java | 60 +- .../config/DriverOptionConfigBuilder.java | 86 +- .../core/config/cloud/CloudConfig.java | 18 +- .../core/config/cloud/CloudConfigFactory.java | 54 +- .../composite/CompositeDriverConfig.java | 10 +- .../CompositeDriverConfigLoader.java | 12 +- .../CompositeDriverExecutionProfile.java | 66 +- .../core/config/map/MapBasedDriverConfig.java | 8 +- .../map/MapBasedDriverConfigLoader.java | 14 +- .../map/MapBasedDriverExecutionProfile.java | 60 +- .../typesafe/DefaultDriverConfigLoader.java | 34 +- .../DefaultDriverConfigLoaderBuilder.java | 22 +- ...ProgrammaticDriverConfigLoaderBuilder.java | 84 +- .../config/typesafe/TypesafeDriverConfig.java | 10 +- .../TypesafeDriverExecutionProfile.java | 130 +-- .../ConstantReconnectionPolicy.java | 8 +- .../ExponentialReconnectionPolicy.java | 10 +- .../core/context/DefaultDriverContext.java | 100 +-- .../core/context/InternalDriverContext.java | 66 +- .../core/context/StartupOptionsBuilder.java | 2 +- .../core/control/ControlConnection.java | 8 +- .../core/cql/CqlPrepareAsyncProcessor.java | 4 +- .../internal/core/cql/CqlPrepareHandler.java | 6 +- .../internal/core/cql/CqlRequestHandler.java | 4 +- .../core/cql/DefaultAsyncResultSet.java | 18 +- .../core/cql/DefaultBatchStatement.java | 60 +- .../core/cql/DefaultBoundStatement.java | 64 +- .../core/cql/DefaultColumnDefinition.java | 14 +- .../core/cql/DefaultColumnDefinitions.java | 24 +- .../core/cql/DefaultExecutionInfo.java | 16 +- .../internal/core/cql/DefaultPagingState.java | 12 +- .../core/cql/DefaultPrepareRequest.java | 10 +- .../core/cql/DefaultPreparedStatement.java | 22 +- .../internal/core/cql/DefaultQueryTrace.java | 14 +- .../driver/internal/core/cql/DefaultRow.java | 34 +- .../core/cql/DefaultSimpleStatement.java | 60 +- .../core/cql/EmptyColumnDefinitions.java | 22 +- .../internal/core/cql/MultiPageResultSet.java | 10 +- .../core/cql/PagingIterableSpliterator.java | 20 +- .../core/cql/SinglePageResultSet.java | 14 +- .../internal/core/data/DefaultTupleValue.java | 18 +- .../internal/core/data/DefaultUdtValue.java | 30 +- .../BasicLoadBalancingPolicy.java | 40 +- .../DcInferringLoadBalancingPolicy.java | 8 +- .../DefaultLoadBalancingPolicy.java | 42 +- .../DefaultNodeDistanceEvaluatorHelper.java | 22 +- .../helper/InferringLocalDcHelper.java | 12 +- .../loadbalancing/helper/LocalDcHelper.java | 6 +- .../helper/MandatoryLocalDcHelper.java | 12 +- .../helper/NodeDistanceEvaluatorHelper.java | 8 +- .../NodeFilterToDistanceEvaluatorAdapter.java | 8 +- .../helper/OptionalLocalDcHelper.java | 24 +- .../nodeset/DcAgnosticNodeSet.java | 10 +- .../loadbalancing/nodeset/MultiDcNodeSet.java | 16 +- .../core/loadbalancing/nodeset/NodeSet.java | 10 +- .../nodeset/SingleDcNodeSet.java | 12 +- .../core/metadata/CloudTopologyMonitor.java | 10 +- .../core/metadata/DefaultEndPoint.java | 6 +- .../core/metadata/DefaultMetadata.java | 12 +- .../internal/core/metadata/DefaultNode.java | 20 +- .../core/metadata/DefaultNodeInfo.java | 20 +- .../core/metadata/DefaultTopologyMonitor.java | 24 +- .../metadata/LoadBalancingPolicyWrapper.java | 16 +- .../core/metadata/MetadataManager.java | 8 +- .../MultiplexingNodeStateListener.java | 16 +- .../internal/core/metadata/NodeInfo.java | 14 +- .../core/metadata/NodeStateManager.java | 8 +- .../core/metadata/PeerRowValidator.java | 4 +- .../internal/core/metadata/SniEndPoint.java | 6 +- .../schema/DefaultAggregateMetadata.java | 44 +- .../schema/DefaultColumnMetadata.java | 26 +- .../schema/DefaultFunctionMetadata.java | 38 +- .../metadata/schema/DefaultIndexMetadata.java | 38 +- .../schema/DefaultKeyspaceMetadata.java | 44 +- .../metadata/schema/DefaultTableMetadata.java | 48 +- .../metadata/schema/DefaultViewMetadata.java | 54 +- .../MultiplexingSchemaChangeListener.java | 44 +- .../schema/ShallowUserDefinedType.java | 34 +- .../metadata/schema/parsing/RawColumn.java | 4 +- .../schema/queries/CassandraSchemaRows.java | 4 +- .../schema/queries/KeyspaceFilter.java | 12 +- .../queries/RuleBasedKeyspaceFilter.java | 10 +- .../metadata/schema/queries/SchemaRows.java | 4 +- .../core/metadata/token/ByteOrderedToken.java | 8 +- .../core/metadata/token/DefaultTokenMap.java | 54 +- .../core/metadata/token/Murmur3Token.java | 4 +- .../core/metadata/token/RandomToken.java | 4 +- .../core/metadata/token/TokenRangeBase.java | 24 +- .../core/metrics/AbstractMetricUpdater.java | 2 +- .../core/metrics/DefaultMetricId.java | 6 +- .../metrics/DefaultMetricIdGenerator.java | 10 +- .../internal/core/metrics/DefaultMetrics.java | 12 +- .../core/metrics/DropwizardMetricUpdater.java | 2 +- .../metrics/DropwizardMetricsFactory.java | 2 +- .../internal/core/metrics/MetricId.java | 6 +- .../core/metrics/MetricIdGenerator.java | 10 +- .../internal/core/metrics/MetricUpdater.java | 2 +- .../metrics/TaggingMetricIdGenerator.java | 10 +- .../internal/core/pool/ChannelPool.java | 8 +- .../driver/internal/core/pool/ChannelSet.java | 4 +- .../core/protocol/ByteBufSegmentBuilder.java | 30 +- .../core/protocol/BytesToSegmentDecoder.java | 4 +- .../core/protocol/FrameToSegmentEncoder.java | 14 +- .../core/protocol/SegmentToBytesEncoder.java | 10 +- .../core/protocol/SegmentToFrameDecoder.java | 10 +- .../ConsistencyDowngradingRetryPolicy.java | 42 +- .../ConsistencyDowngradingRetryVerdict.java | 10 +- .../core/retry/DefaultRetryPolicy.java | 20 +- .../core/retry/DefaultRetryVerdict.java | 6 +- .../internal/core/session/DefaultSession.java | 40 +- .../internal/core/session/PoolManager.java | 8 +- .../internal/core/session/SessionWrapper.java | 32 +- .../ConcurrencyLimitingRequestThrottler.java | 10 +- .../PassThroughRequestThrottler.java | 10 +- .../RateLimitingRequestThrottler.java | 10 +- .../ConstantSpeculativeExecutionPolicy.java | 8 +- .../specex/NoSpeculativeExecutionPolicy.java | 8 +- .../core/ssl/DefaultSslEngineFactory.java | 6 +- .../core/ssl/SniSslEngineFactory.java | 6 +- .../tracker/MultiplexingRequestTracker.java | 44 +- .../core/tracker/NoopRequestTracker.java | 36 +- .../internal/core/tracker/RequestLogger.java | 36 +- .../internal/core/type/DefaultCustomType.java | 8 +- .../internal/core/type/DefaultListType.java | 8 +- .../internal/core/type/DefaultMapType.java | 10 +- .../internal/core/type/DefaultSetType.java | 8 +- .../internal/core/type/DefaultTupleType.java | 18 +- .../core/type/DefaultUserDefinedType.java | 50 +- .../internal/core/type/DefaultVectorType.java | 8 +- .../internal/core/type/PrimitiveType.java | 6 +- .../internal/core/type/codec/BigIntCodec.java | 18 +- .../internal/core/type/codec/BlobCodec.java | 18 +- .../core/type/codec/BooleanCodec.java | 18 +- .../core/type/codec/CounterCodec.java | 4 +- .../core/type/codec/CqlDurationCodec.java | 18 +- .../internal/core/type/codec/CustomCodec.java | 18 +- .../internal/core/type/codec/DateCodec.java | 18 +- .../core/type/codec/DecimalCodec.java | 18 +- .../internal/core/type/codec/DoubleCodec.java | 18 +- .../internal/core/type/codec/FloatCodec.java | 18 +- .../internal/core/type/codec/InetCodec.java | 18 +- .../internal/core/type/codec/IntCodec.java | 18 +- .../internal/core/type/codec/ListCodec.java | 16 +- .../internal/core/type/codec/MapCodec.java | 16 +- .../internal/core/type/codec/SetCodec.java | 16 +- .../core/type/codec/SimpleBlobCodec.java | 8 +- .../core/type/codec/SmallIntCodec.java | 18 +- .../internal/core/type/codec/StringCodec.java | 20 +- .../internal/core/type/codec/TimeCodec.java | 18 +- .../core/type/codec/TimeUuidCodec.java | 14 +- .../core/type/codec/TimestampCodec.java | 18 +- .../core/type/codec/TinyIntCodec.java | 18 +- .../internal/core/type/codec/TupleCodec.java | 20 +- .../internal/core/type/codec/UdtCodec.java | 20 +- .../internal/core/type/codec/UuidCodec.java | 18 +- .../internal/core/type/codec/VarIntCodec.java | 18 +- .../internal/core/type/codec/VectorCodec.java | 18 +- .../core/type/codec/extras/OptionalCodec.java | 8 +- .../array/AbstractListToArrayCodec.java | 22 +- .../AbstractPrimitiveListToArrayCodec.java | 22 +- .../extras/array/BooleanListToArrayCodec.java | 24 +- .../extras/array/ByteListToArrayCodec.java | 24 +- .../extras/array/DoubleListToArrayCodec.java | 24 +- .../extras/array/FloatListToArrayCodec.java | 24 +- .../extras/array/IntListToArrayCodec.java | 24 +- .../extras/array/LongListToArrayCodec.java | 24 +- .../extras/array/ObjectListToArrayCodec.java | 18 +- .../extras/array/ShortListToArrayCodec.java | 24 +- .../codec/extras/enums/EnumNameCodec.java | 6 +- .../codec/extras/enums/EnumOrdinalCodec.java | 6 +- .../type/codec/extras/json/JsonCodec.java | 22 +- .../extras/time/LocalTimestampCodec.java | 8 +- .../time/PersistentZonedTimestampCodec.java | 10 +- .../extras/time/TimestampMillisCodec.java | 18 +- .../extras/time/ZonedTimestampCodec.java | 6 +- .../vector/AbstractVectorToArrayCodec.java | 32 +- .../vector/FloatVectorToArrayCodec.java | 24 +- .../codec/registry/CachingCodecRegistry.java | 68 +- .../codec/registry/DefaultCodecRegistry.java | 14 +- .../driver/internal/core/util/ArrayUtils.java | 14 +- .../driver/internal/core/util/Reflection.java | 8 +- .../driver/internal/core/util/RoutingKey.java | 6 +- .../util/collection/CompositeQueryPlan.java | 8 +- .../core/util/collection/EmptyQueryPlan.java | 4 +- .../core/util/collection/QueryPlan.java | 4 +- .../core/util/collection/QueryPlanBase.java | 6 +- .../core/util/collection/SimpleQueryPlan.java | 4 +- .../util/concurrent/BlockingOperation.java | 4 +- .../core/util/concurrent/PromiseCombiner.java | 4 +- .../dse/driver/DseTestDataProviders.java | 4 +- .../core/cql/reactive/MockAsyncResultSet.java | 10 +- .../internal/core/cql/reactive/MockRow.java | 32 +- .../core/cql/reactive/TestSubscriber.java | 6 +- .../graph/GraphStatementBuilderBaseTest.java | 4 +- .../refresh/GraphSchemaRefreshTest.java | 16 +- .../core/MockAsyncPagingIterable.java | 10 +- .../internal/core/MockPagingIterable.java | 8 +- .../core/channel/EmbeddedEndPoint.java | 6 +- .../internal/core/channel/LocalEndPoint.java | 6 +- .../internal/core/config/MockOptions.java | 4 +- .../BasicLoadBalancingPolicyDistanceTest.java | 4 +- .../BasicLoadBalancingPolicyEventsTest.java | 4 +- .../BasicLoadBalancingPolicyInitTest.java | 4 +- ...erringLoadBalancingPolicyDistanceTest.java | 4 +- ...nferringLoadBalancingPolicyEventsTest.java | 4 +- ...cInferringLoadBalancingPolicyInitTest.java | 4 +- ...efaultLoadBalancingPolicyDistanceTest.java | 4 +- .../DefaultLoadBalancingPolicyEventsTest.java | 4 +- .../DefaultLoadBalancingPolicyInitTest.java | 4 +- .../session/throttling/MockThrottled.java | 4 +- .../core/type/codec/CqlIntToStringCodec.java | 2 +- .../registry/CachingCodecRegistryTest.java | 24 +- .../ScheduledTaskCapturingEventLoop.java | 10 +- distribution/src/assembly/binary-tarball.xml | 6 +- .../examples/datatypes/CustomCodecs.java | 2 +- .../examples/datatypes/TuplesMapped.java | 8 +- .../datatypes/UserDefinedTypesMapped.java | 8 +- .../examples/json/jsr/Jsr353JsonCodec.java | 14 +- integration-tests/pom.xml | 4 +- .../oss/driver/core/AllNodesFailedIT.java | 6 +- .../datastax/oss/driver/core/ConnectIT.java | 4 +- .../core/config/MapBasedConfigLoaderIT.java | 20 +- .../driver/core/connection/FrameLengthIT.java | 4 +- .../core/context/LifecycleListenerIT.java | 4 +- .../oss/driver/core/cql/PagingStateIT.java | 2 +- .../core/cql/PreparedStatementCachingIT.java | 8 +- .../reactive/DefaultReactiveResultSetIT.java | 4 +- .../core/cql/reactive/ReactiveRetryIT.java | 16 +- .../oss/driver/core/metadata/NodeStateIT.java | 16 +- .../core/retry/PerProfileRetryPolicyIT.java | 20 +- .../oss/driver/core/session/AddedNodeIT.java | 10 +- .../oss/driver/core/session/ListenersIT.java | 10 +- .../driver/core/session/RemovedNodeIT.java | 10 +- .../tracker/RequestNodeLoggerExample.java | 20 +- .../core/type/codec/CqlIntToStringCodec.java | 2 +- .../type/codec/registry/CodecRegistryIT.java | 18 +- .../guava/api/GuavaSessionBuilder.java | 4 +- .../example/guava/internal/KeyRequest.java | 6 +- .../mapper/GuavaFutureProducerService.java | 20 +- .../oss/driver/mapper/NamingStrategyIT.java | 6 +- manual/core/custom_codecs/README.md | 4 +- manual/core/integration/README.md | 6 +- manual/core/metadata/node/README.md | 2 +- manual/developer/common/context/README.md | 4 +- mapper-processor/pom.xml | 4 +- .../dao/DaoImplementationGenerator.java | 4 +- .../processor/dao/DaoMethodGenerator.java | 6 +- .../processor/dao/DaoReturnTypeParser.java | 6 +- .../dao/DefaultDaoReturnTypeParser.java | 6 +- .../dao/NullSavingStrategyValidation.java | 2 +- .../entity/DefaultEntityDefinition.java | 2 +- .../entity/DefaultEntityFactory.java | 2 +- .../processor/entity/EntityDefinition.java | 2 +- .../generation/GeneratedCodePatterns.java | 8 +- .../mapper/processor/MapperProcessorTest.java | 4 +- mapper-runtime/pom.xml | 6 +- .../DefaultMappedReactiveResultSet.java | 24 +- .../FailedMappedReactiveResultSet.java | 8 +- .../oss/driver/api/mapper/MapperBuilder.java | 14 +- .../oss/driver/api/mapper/MapperContext.java | 14 +- .../driver/api/mapper/MapperException.java | 10 +- .../api/mapper/entity/EntityHelper.java | 44 +- .../mapper/entity/naming/NameConverter.java | 6 +- .../mapper/result/MapperResultProducer.java | 12 +- .../internal/mapper/DefaultMapperContext.java | 18 +- .../mapper/entity/EntityHelperBase.java | 18 +- .../mapper/reactive/MockAsyncResultSet.java | 10 +- .../driver/api/mapper/reactive/MockRow.java | 32 +- .../api/mapper/reactive/TestSubscriber.java | 6 +- .../micrometer/MicrometerMetricUpdater.java | 2 +- .../MicroProfileMetricUpdater.java | 2 +- osgi-tests/pom.xml | 6 +- .../api/osgi/service/MailboxMessage.java | 10 +- .../osgi/service/geo/GeoMailboxMessage.java | 10 +- pom.xml | 39 +- query-builder/pom.xml | 6 +- query-builder/revapi.json | 780 +++++++++--------- .../api/querybuilder/DseSchemaBuilder.java | 116 +-- .../querybuilder/schema/AlterDseKeyspace.java | 20 +- .../schema/AlterDseKeyspaceStart.java | 20 +- .../schema/AlterDseTableAddColumn.java | 18 +- .../schema/AlterDseTableDropColumn.java | 18 +- .../schema/AlterDseTableRenameColumn.java | 10 +- .../schema/AlterDseTableStart.java | 30 +- .../schema/CreateDseAggregateEnd.java | 16 +- .../schema/CreateDseAggregateStart.java | 18 +- .../schema/CreateDseAggregateStateFunc.java | 6 +- .../schema/CreateDseFunctionStart.java | 18 +- .../schema/CreateDseFunctionWithLanguage.java | 10 +- .../CreateDseFunctionWithNullOption.java | 6 +- .../schema/CreateDseFunctionWithType.java | 22 +- .../schema/CreateDseKeyspace.java | 10 +- .../schema/CreateDseKeyspaceStart.java | 14 +- .../querybuilder/schema/CreateDseTable.java | 26 +- .../schema/CreateDseTableStart.java | 4 +- .../schema/CreateDseTableWithOptions.java | 4 +- .../querybuilder/schema/DseGraphEdgeSide.java | 32 +- .../schema/DseRelationStructure.java | 18 +- .../schema/DseTableGraphOptions.java | 26 +- .../schema/OngoingDsePartitionKey.java | 10 +- .../schema/DefaultAlterDseKeyspace.java | 30 +- .../schema/DefaultAlterDseTable.java | 76 +- .../schema/DefaultCreateDseAggregate.java | 44 +- .../schema/DefaultCreateDseFunction.java | 42 +- .../schema/DefaultCreateDseKeyspace.java | 24 +- .../schema/DefaultCreateDseTable.java | 84 +- .../schema/DefaultDseGraphEdgeSide.java | 16 +- .../api/querybuilder/BuildableQuery.java | 16 +- .../driver/api/querybuilder/CqlSnippet.java | 4 +- .../driver/api/querybuilder/QueryBuilder.java | 206 ++--- .../api/querybuilder/SchemaBuilder.java | 280 +++---- .../api/querybuilder/condition/Condition.java | 26 +- .../condition/ConditionalStatement.java | 46 +- .../querybuilder/delete/DeleteSelection.java | 48 +- .../api/querybuilder/insert/Insert.java | 14 +- .../api/querybuilder/insert/InsertInto.java | 18 +- .../api/querybuilder/insert/JsonInsert.java | 6 +- .../querybuilder/insert/OngoingValues.java | 18 +- .../relation/ArithmeticRelationBuilder.java | 32 +- .../relation/ColumnRelationBuilder.java | 16 +- .../relation/InRelationBuilder.java | 20 +- .../relation/OngoingWhereClause.java | 76 +- .../api/querybuilder/relation/Relation.java | 58 +- .../schema/AlterTableAddColumn.java | 18 +- .../schema/AlterTableDropColumn.java | 18 +- .../schema/AlterTableRenameColumn.java | 10 +- .../querybuilder/schema/AlterTableStart.java | 12 +- .../schema/AlterTypeRenameField.java | 10 +- .../querybuilder/schema/AlterTypeStart.java | 18 +- .../schema/CreateAggregateEnd.java | 14 +- .../schema/CreateAggregateStart.java | 18 +- .../schema/CreateAggregateStateFunc.java | 6 +- .../schema/CreateFunctionStart.java | 18 +- .../schema/CreateFunctionWithLanguage.java | 10 +- .../schema/CreateFunctionWithNullOption.java | 6 +- .../schema/CreateFunctionWithType.java | 10 +- .../api/querybuilder/schema/CreateIndex.java | 6 +- .../schema/CreateIndexOnTable.java | 52 +- .../querybuilder/schema/CreateIndexStart.java | 28 +- .../schema/CreateKeyspaceStart.java | 4 +- .../CreateMaterializedViewPrimaryKey.java | 10 +- ...CreateMaterializedViewPrimaryKeyStart.java | 10 +- .../CreateMaterializedViewSelection.java | 28 +- .../schema/CreateMaterializedViewStart.java | 22 +- .../api/querybuilder/schema/CreateTable.java | 26 +- .../querybuilder/schema/CreateTableStart.java | 4 +- .../schema/CreateTableWithOptions.java | 4 +- .../querybuilder/schema/CreateTypeStart.java | 4 +- .../driver/api/querybuilder/schema/Drop.java | 4 +- .../querybuilder/schema/KeyspaceOptions.java | 6 +- .../schema/KeyspaceReplicationOptions.java | 12 +- .../schema/OngoingCreateType.java | 10 +- .../schema/OngoingPartitionKey.java | 10 +- .../querybuilder/schema/OptionProvider.java | 10 +- .../querybuilder/schema/RelationOptions.java | 60 +- .../schema/RelationStructure.java | 20 +- .../schema/compaction/CompactionStrategy.java | 12 +- .../compaction/LeveledCompactionStrategy.java | 6 +- .../SizeTieredCompactionStrategy.java | 18 +- .../TimeWindowCompactionStrategy.java | 14 +- .../querybuilder/select/OngoingSelection.java | 250 +++--- .../api/querybuilder/select/Select.java | 66 +- .../api/querybuilder/select/SelectFrom.java | 6 +- .../api/querybuilder/select/Selector.java | 206 ++--- .../api/querybuilder/update/Assignment.java | 162 ++-- .../update/OngoingAssignment.java | 174 ++-- .../api/querybuilder/update/UpdateStart.java | 14 +- .../querybuilder/ArithmeticOperator.java | 4 +- .../internal/querybuilder/CqlHelper.java | 26 +- .../internal/querybuilder/DefaultLiteral.java | 10 +- .../internal/querybuilder/DefaultRaw.java | 16 +- .../querybuilder/ImmutableCollections.java | 22 +- .../condition/DefaultCondition.java | 12 +- .../condition/DefaultConditionBuilder.java | 16 +- .../querybuilder/delete/DefaultDelete.java | 76 +- .../querybuilder/insert/DefaultInsert.java | 62 +- .../lhs/ColumnComponentLeftOperand.java | 10 +- .../querybuilder/lhs/ColumnLeftOperand.java | 8 +- .../querybuilder/lhs/FieldLeftOperand.java | 10 +- .../querybuilder/lhs/TokenLeftOperand.java | 8 +- .../querybuilder/lhs/TupleLeftOperand.java | 8 +- .../relation/CustomIndexRelation.java | 10 +- ...DefaultColumnComponentRelationBuilder.java | 20 +- .../DefaultColumnRelationBuilder.java | 16 +- .../DefaultMultiColumnRelationBuilder.java | 18 +- .../relation/DefaultRelation.java | 12 +- .../relation/DefaultTokenRelationBuilder.java | 18 +- .../schema/DefaultAlterKeyspace.java | 20 +- .../schema/DefaultAlterMaterializedView.java | 22 +- .../schema/DefaultAlterTable.java | 64 +- .../querybuilder/schema/DefaultAlterType.java | 30 +- .../schema/DefaultCreateAggregate.java | 42 +- .../schema/DefaultCreateFunction.java | 42 +- .../schema/DefaultCreateIndex.java | 32 +- .../schema/DefaultCreateKeyspace.java | 24 +- .../schema/DefaultCreateMaterializedView.java | 90 +- .../schema/DefaultCreateTable.java | 78 +- .../schema/DefaultCreateType.java | 24 +- .../querybuilder/schema/DefaultDrop.java | 22 +- .../schema/DefaultDropKeyspace.java | 12 +- .../querybuilder/schema/OptionsUtils.java | 10 +- .../internal/querybuilder/schema/Utils.java | 10 +- .../compaction/DefaultCompactionStrategy.java | 10 +- .../DefaultLeveledCompactionStrategy.java | 8 +- .../DefaultSizeTieredCompactionStrategy.java | 8 +- .../DefaultTimeWindowCompactionStrategy.java | 8 +- .../querybuilder/select/AllSelector.java | 10 +- .../select/ArithmeticSelector.java | 8 +- .../select/BinaryArithmeticSelector.java | 22 +- .../querybuilder/select/CastSelector.java | 18 +- .../select/CollectionSelector.java | 14 +- .../querybuilder/select/ColumnSelector.java | 16 +- .../querybuilder/select/CountAllSelector.java | 10 +- .../select/DefaultBindMarker.java | 6 +- .../querybuilder/select/DefaultSelect.java | 106 +-- .../querybuilder/select/ElementSelector.java | 18 +- .../querybuilder/select/FieldSelector.java | 18 +- .../querybuilder/select/FunctionSelector.java | 20 +- .../querybuilder/select/ListSelector.java | 12 +- .../querybuilder/select/MapSelector.java | 16 +- .../querybuilder/select/OppositeSelector.java | 16 +- .../querybuilder/select/RangeSelector.java | 16 +- .../querybuilder/select/SetSelector.java | 12 +- .../querybuilder/select/TupleSelector.java | 12 +- .../querybuilder/select/TypeHintSelector.java | 18 +- .../querybuilder/term/ArithmeticTerm.java | 8 +- .../term/BinaryArithmeticTerm.java | 10 +- .../querybuilder/term/FunctionTerm.java | 14 +- .../querybuilder/term/OppositeTerm.java | 10 +- .../internal/querybuilder/term/TupleTerm.java | 8 +- .../querybuilder/term/TypeHintTerm.java | 10 +- .../truncate/DefaultTruncate.java | 20 +- .../querybuilder/update/AppendAssignment.java | 4 +- .../update/AppendListElementAssignment.java | 4 +- .../update/AppendMapEntryAssignment.java | 4 +- .../update/AppendSetElementAssignment.java | 4 +- .../update/CollectionAssignment.java | 10 +- .../update/CollectionElementAssignment.java | 16 +- .../update/CounterAssignment.java | 10 +- .../update/DecrementAssignment.java | 4 +- .../update/DefaultAssignment.java | 12 +- .../querybuilder/update/DefaultUpdate.java | 86 +- .../update/IncrementAssignment.java | 4 +- .../update/PrependAssignment.java | 4 +- .../update/PrependListElementAssignment.java | 4 +- .../update/PrependMapEntryAssignment.java | 4 +- .../update/PrependSetElementAssignment.java | 4 +- .../querybuilder/update/RemoveAssignment.java | 4 +- .../update/RemoveListElementAssignment.java | 4 +- .../update/RemoveMapEntryAssignment.java | 4 +- .../update/RemoveSetElementAssignment.java | 4 +- .../driver/api/querybuilder/CharsetCodec.java | 12 +- test-infra/pom.xml | 4 +- test-infra/revapi.json | 16 +- .../SortingLoadBalancingPolicy.java | 16 +- upgrade_guide/README.md | 4 +- 740 files changed, 7898 insertions(+), 7867 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 927c7a7aa8c..05e2b6d12fa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -198,11 +198,11 @@ Make sure you import the types from `net.jcip`, there are homonyms in the classp ### Nullability annotations -We use the [Spotbugs annotations](https://spotbugs.github.io) to document nullability of parameters, +We use the [jsr305 annotations](http://code.google.com/p/jsr-305/) to document nullability of parameters, method return types and class members. -Please annotate any new class or interface with the appropriate annotations: `@NonNull`, `@Nullable`. Make sure you import -the types from `edu.umd.cs.findbugs.annotations`, there are homonyms in the classpath. +Please annotate any new class or interface with the appropriate annotations: `@Nonnull`, `@Nullable`. Make sure you import +the types from `javax.annotation`, there are homonyms in the classpath. ## Coding style -- test code diff --git a/core-shaded/pom.xml b/core-shaded/pom.xml index 16c7ff4eea7..0b62d4864bd 100644 --- a/core-shaded/pom.xml +++ b/core-shaded/pom.xml @@ -114,8 +114,8 @@ jcip-annotations - com.github.spotbugs - spotbugs-annotations + com.google.code.findbugs + jsr305 !net.jcip.annotations.*, !edu.umd.cs.findbugs.annotations.*, + -->!net.jcip.annotations.*, !javax.annotation.*, !org.graalvm.*, !com.oracle.svm.*, diff --git a/core/pom.xml b/core/pom.xml index e746c4fec56..e088283d6da 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -121,8 +121,8 @@ jcip-annotations - com.github.spotbugs - spotbugs-annotations + com.google.code.findbugs + jsr305 org.graalvm.sdk @@ -303,7 +303,7 @@ !net.jcip.annotations.*, !edu.umd.cs.findbugs.annotations.*, + -->!net.jcip.annotations.*, !javax.annotation.*, !org.graalvm.*, !com.oracle.svm.*, diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/DseSession.java b/core/src/main/java/com/datastax/dse/driver/api/core/DseSession.java index 8251aaf767c..014c7f071bb 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/DseSession.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/DseSession.java @@ -19,7 +19,7 @@ import com.datastax.oss.driver.api.core.CqlSession; import com.datastax.oss.driver.api.core.MavenCoordinates; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * @deprecated All DSE functionality is now available directly on {@link CqlSession}. This type is @@ -33,14 +33,14 @@ public interface DseSession extends CqlSession { * preserved for backward compatibility, but it returns the same value as {@link * CqlSession#OSS_DRIVER_COORDINATES}. */ - @Deprecated @NonNull MavenCoordinates DSE_DRIVER_COORDINATES = CqlSession.OSS_DRIVER_COORDINATES; + @Deprecated @Nonnull MavenCoordinates DSE_DRIVER_COORDINATES = CqlSession.OSS_DRIVER_COORDINATES; /** * Returns a builder to create a new instance. * *

Note that this builder is mutable and not thread-safe. */ - @NonNull + @Nonnull static DseSessionBuilder builder() { return new DseSessionBuilder(); } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/DseSessionBuilder.java b/core/src/main/java/com/datastax/dse/driver/api/core/DseSessionBuilder.java index 01e5f9f9125..8cf672b2f4f 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/DseSessionBuilder.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/DseSessionBuilder.java @@ -19,7 +19,7 @@ import com.datastax.oss.driver.api.core.CqlSession; import com.datastax.oss.driver.api.core.session.SessionBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import net.jcip.annotations.NotThreadSafe; /** @@ -31,9 +31,9 @@ @Deprecated public class DseSessionBuilder extends SessionBuilder { - @NonNull + @Nonnull @Override - protected DseSession wrap(@NonNull CqlSession defaultSession) { + protected DseSession wrap(@Nonnull CqlSession defaultSession) { return new com.datastax.dse.driver.internal.core.session.DefaultDseSession(defaultSession); } } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/auth/BaseDseAuthenticator.java b/core/src/main/java/com/datastax/dse/driver/api/core/auth/BaseDseAuthenticator.java index abd68b530b6..7115d173176 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/auth/BaseDseAuthenticator.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/auth/BaseDseAuthenticator.java @@ -18,9 +18,9 @@ package com.datastax.dse.driver.api.core.auth; import com.datastax.oss.driver.api.core.auth.SyncAuthenticator; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; /** @@ -35,7 +35,7 @@ public abstract class BaseDseAuthenticator implements SyncAuthenticator { private final String serverAuthenticator; - protected BaseDseAuthenticator(@NonNull String serverAuthenticator) { + protected BaseDseAuthenticator(@Nonnull String serverAuthenticator) { this.serverAuthenticator = serverAuthenticator; } @@ -52,7 +52,7 @@ protected BaseDseAuthenticator(@NonNull String serverAuthenticator) { * This must be either a {@linkplain ByteBuffer#asReadOnlyBuffer() read-only} buffer, or a new * instance every time. */ - @NonNull + @Nonnull protected abstract ByteBuffer getMechanism(); /** @@ -68,7 +68,7 @@ protected BaseDseAuthenticator(@NonNull String serverAuthenticator) { * This must be either a {@linkplain ByteBuffer#asReadOnlyBuffer() read-only} buffer, or a new * instance every time. */ - @NonNull + @Nonnull protected abstract ByteBuffer getInitialServerChallenge(); @Nullable diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/auth/DseGssApiAuthProviderBase.java b/core/src/main/java/com/datastax/dse/driver/api/core/auth/DseGssApiAuthProviderBase.java index 48a0e5b0ef3..cffa8aa545a 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/auth/DseGssApiAuthProviderBase.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/auth/DseGssApiAuthProviderBase.java @@ -25,8 +25,6 @@ import com.datastax.oss.driver.shaded.guava.common.base.Charsets; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; import com.datastax.oss.protocol.internal.util.Bytes; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.net.InetSocketAddress; import java.nio.ByteBuffer; import java.security.PrivilegedActionException; @@ -34,6 +32,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import javax.security.auth.Subject; import javax.security.auth.login.AppConfigurationEntry; import javax.security.auth.login.Configuration; @@ -72,25 +72,25 @@ public abstract class DseGssApiAuthProviderBase implements AuthProvider { * when you have multiple driver instances executing in the same JVM). Config-based * implementations fill this with {@link Session#getName()}. */ - protected DseGssApiAuthProviderBase(@NonNull String logPrefix) { + protected DseGssApiAuthProviderBase(@Nonnull String logPrefix) { this.logPrefix = Objects.requireNonNull(logPrefix); } - @NonNull + @Nonnull protected abstract GssApiOptions getOptions( - @NonNull EndPoint endPoint, @NonNull String serverAuthenticator); + @Nonnull EndPoint endPoint, @Nonnull String serverAuthenticator); - @NonNull + @Nonnull @Override public Authenticator newAuthenticator( - @NonNull EndPoint endPoint, @NonNull String serverAuthenticator) + @Nonnull EndPoint endPoint, @Nonnull String serverAuthenticator) throws AuthenticationException { return new GssApiAuthenticator( getOptions(endPoint, serverAuthenticator), endPoint, serverAuthenticator); } @Override - public void onMissingChallenge(@NonNull EndPoint endPoint) { + public void onMissingChallenge(@Nonnull EndPoint endPoint) { LOG.warn( "[{}] {} did not send an authentication challenge; " + "This is suspicious because the driver expects authentication", @@ -111,7 +111,7 @@ public void close() { @Immutable public static class GssApiOptions { - @NonNull + @Nonnull public static Builder builder() { return new Builder(); } @@ -127,7 +127,7 @@ private GssApiOptions( @Nullable Subject subject, @Nullable String saslProtocol, @Nullable String authorizationId, - @NonNull Map saslProperties) { + @Nonnull Map saslProperties) { this.loginConfiguration = loginConfiguration; this.subject = subject; this.saslProtocol = saslProtocol; @@ -155,7 +155,7 @@ public String getAuthorizationId() { return authorizationId; } - @NonNull + @Nonnull public Map getSaslProperties() { return saslProperties; } @@ -183,7 +183,7 @@ public Builder() { * * @see #withLoginConfiguration(Map) */ - @NonNull + @Nonnull public Builder withLoginConfiguration(@Nullable Configuration loginConfiguration) { this.loginConfiguration = loginConfiguration; return this; @@ -198,7 +198,7 @@ public Builder withLoginConfiguration(@Nullable Configuration loginConfiguration * if both are called, the subject takes precedence, and the login configuration will be * ignored. */ - @NonNull + @Nonnull public Builder withLoginConfiguration(@Nullable Map loginConfiguration) { this.loginConfiguration = fetchLoginConfiguration(loginConfiguration); return this; @@ -210,7 +210,7 @@ public Builder withLoginConfiguration(@Nullable Map loginConfigu *

You MUST call either this method or {@link #withLoginConfiguration(Configuration)}; if * both are called, the subject takes precedence, and the login configuration will be ignored. */ - @NonNull + @Nonnull public Builder withSubject(@Nullable Subject subject) { this.subject = subject; return this; @@ -220,14 +220,14 @@ public Builder withSubject(@Nullable Subject subject) { * Sets the SASL protocol name to use; should match the username of the Kerberos service * principal used by the DSE server. */ - @NonNull + @Nonnull public Builder withSaslProtocol(@Nullable String saslProtocol) { this.saslProtocol = saslProtocol; return this; } /** Sets the authorization ID (allows proxy authentication). */ - @NonNull + @Nonnull public Builder withAuthorizationId(@Nullable String authorizationId) { this.authorizationId = authorizationId; return this; @@ -243,13 +243,13 @@ public Builder withAuthorizationId(@Nullable String authorizationId) { * javax.security.sasl.qop = auth * */ - @NonNull - public Builder addSaslProperty(@NonNull String name, @NonNull String value) { + @Nonnull + public Builder addSaslProperty(@Nonnull String name, @Nonnull String value) { this.saslProperties.put(Objects.requireNonNull(name), Objects.requireNonNull(value)); return this; } - @NonNull + @Nonnull public GssApiOptions build() { return new GssApiOptions( loginConfiguration, @@ -328,13 +328,13 @@ protected GssApiAuthenticator( this.endPoint = endPoint; } - @NonNull + @Nonnull @Override protected ByteBuffer getMechanism() { return MECHANISM; } - @NonNull + @Nonnull @Override protected ByteBuffer getInitialServerChallenge() { return SERVER_INITIAL_CHALLENGE; diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/auth/DsePlainTextAuthProviderBase.java b/core/src/main/java/com/datastax/dse/driver/api/core/auth/DsePlainTextAuthProviderBase.java index 7c5ee23bd6c..c1e4dc42d7f 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/auth/DsePlainTextAuthProviderBase.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/auth/DsePlainTextAuthProviderBase.java @@ -18,7 +18,7 @@ package com.datastax.dse.driver.api.core.auth; import com.datastax.oss.driver.api.core.auth.PlainTextAuthProviderBase; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; /** @@ -30,7 +30,7 @@ @Deprecated public abstract class DsePlainTextAuthProviderBase extends PlainTextAuthProviderBase { - protected DsePlainTextAuthProviderBase(@NonNull String logPrefix) { + protected DsePlainTextAuthProviderBase(@Nonnull String logPrefix) { super(logPrefix); } } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/auth/ProgrammaticDseGssApiAuthProvider.java b/core/src/main/java/com/datastax/dse/driver/api/core/auth/ProgrammaticDseGssApiAuthProvider.java index 64ee5265b5a..23cbf70d461 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/auth/ProgrammaticDseGssApiAuthProvider.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/auth/ProgrammaticDseGssApiAuthProvider.java @@ -19,7 +19,7 @@ import com.datastax.oss.driver.api.core.auth.AuthProvider; import com.datastax.oss.driver.api.core.metadata.EndPoint; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * {@link AuthProvider} that provides GSSAPI authenticator instances for clients to connect to DSE @@ -165,10 +165,10 @@ public ProgrammaticDseGssApiAuthProvider(GssApiOptions options) { this.options = options; } - @NonNull + @Nonnull @Override protected GssApiOptions getOptions( - @NonNull EndPoint endPoint, @NonNull String serverAuthenticator) { + @Nonnull EndPoint endPoint, @Nonnull String serverAuthenticator) { return options; } } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/auth/ProxyAuthentication.java b/core/src/main/java/com/datastax/dse/driver/api/core/auth/ProxyAuthentication.java index a3624ba736d..159b2e96341 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/auth/ProxyAuthentication.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/auth/ProxyAuthentication.java @@ -21,9 +21,9 @@ import com.datastax.oss.driver.api.core.cql.Statement; import com.datastax.oss.driver.shaded.guava.common.base.Charsets; import com.datastax.oss.protocol.internal.util.collection.NullAllowingImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.util.Map; +import javax.annotation.Nonnull; public class ProxyAuthentication { private static final String PROXY_EXECUTE = "ProxyExecute"; @@ -45,9 +45,9 @@ public class ProxyAuthentication { * href="https://docs.datastax.com/en/dse/6.0/dse-admin/datastax_enterprise/security/secProxy.html">Setting * up roles for applications (DSE 6.0 admin guide) */ - @NonNull + @Nonnull public static > StatementT executeAs( - @NonNull String userOrRole, @NonNull StatementT statement) { + @Nonnull String userOrRole, @Nonnull StatementT statement) { return statement.setCustomPayload( addProxyExecuteEntry(statement.getCustomPayload(), userOrRole)); } @@ -57,15 +57,15 @@ public static > StatementT executeAs( * * @see #executeAs(String, Statement) */ - @NonNull + @Nonnull public static > StatementT executeAs( - @NonNull String userOrRole, @NonNull StatementT statement) { + @Nonnull String userOrRole, @Nonnull StatementT statement) { return statement.setCustomPayload( addProxyExecuteEntry(statement.getCustomPayload(), userOrRole)); } private static Map addProxyExecuteEntry( - Map currentPayload, @NonNull String userOrRole) { + Map currentPayload, @Nonnull String userOrRole) { NullAllowingImmutableMap.Builder builder = NullAllowingImmutableMap.builder(); builder.put(PROXY_EXECUTE, ByteBuffer.wrap(userOrRole.getBytes(Charsets.UTF_8))); diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/config/DseDriverConfigLoader.java b/core/src/main/java/com/datastax/dse/driver/api/core/config/DseDriverConfigLoader.java index 2694b51ffca..b7968773c9a 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/config/DseDriverConfigLoader.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/config/DseDriverConfigLoader.java @@ -19,9 +19,9 @@ import com.datastax.oss.driver.api.core.config.DriverConfigLoader; import com.datastax.oss.driver.api.core.config.ProgrammaticDriverConfigLoaderBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.File; import java.net.URL; +import javax.annotation.Nonnull; /** * @deprecated This class only exists for backward compatibility. All of its methods delegate to @@ -35,8 +35,8 @@ public class DseDriverConfigLoader { * DriverConfigLoader#fromClasspath(String)}, which you should call directly instead. */ @Deprecated - @NonNull - public static DriverConfigLoader fromClasspath(@NonNull String resourceBaseName) { + @Nonnull + public static DriverConfigLoader fromClasspath(@Nonnull String resourceBaseName) { return DriverConfigLoader.fromClasspath(resourceBaseName); } @@ -45,8 +45,8 @@ public static DriverConfigLoader fromClasspath(@NonNull String resourceBaseName) * DriverConfigLoader#fromFile(File)}, which you should call directly instead. */ @Deprecated - @NonNull - public static DriverConfigLoader fromFile(@NonNull File file) { + @Nonnull + public static DriverConfigLoader fromFile(@Nonnull File file) { return DriverConfigLoader.fromFile(file); } @@ -55,8 +55,8 @@ public static DriverConfigLoader fromFile(@NonNull File file) { * DriverConfigLoader#fromUrl(URL)}, which you should call directly instead. */ @Deprecated - @NonNull - public static DriverConfigLoader fromUrl(@NonNull URL url) { + @Nonnull + public static DriverConfigLoader fromUrl(@Nonnull URL url) { return DriverConfigLoader.fromUrl(url); } @@ -65,7 +65,7 @@ public static DriverConfigLoader fromUrl(@NonNull URL url) { * DriverConfigLoader#programmaticBuilder()}, which you should call directly instead. */ @Deprecated - @NonNull + @Nonnull public static ProgrammaticDriverConfigLoaderBuilder programmaticBuilder() { return DriverConfigLoader.programmaticBuilder(); } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/config/DseDriverOption.java b/core/src/main/java/com/datastax/dse/driver/api/core/config/DseDriverOption.java index 4d10501f6d2..685f5426543 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/config/DseDriverOption.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/config/DseDriverOption.java @@ -18,7 +18,7 @@ package com.datastax.dse.driver.api.core.config; import com.datastax.oss.driver.api.core.config.DriverOption; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public enum DseDriverOption implements DriverOption { /** @@ -326,7 +326,7 @@ public enum DseDriverOption implements DriverOption { this.path = path; } - @NonNull + @Nonnull @Override public String getPath() { return path; diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousAsyncResultSet.java b/core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousAsyncResultSet.java index a9491ec2414..70815a038c9 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousAsyncResultSet.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousAsyncResultSet.java @@ -21,9 +21,9 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.cql.Row; import com.datastax.oss.driver.api.core.cql.Statement; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.util.concurrent.CancellationException; +import javax.annotation.Nonnull; /** * The result of an {@linkplain ContinuousSession#executeContinuouslyAsync(Statement) asynchronous @@ -73,7 +73,7 @@ public interface ContinuousAsyncResultSet *

Note: because the driver does not support query traces for continuous queries, {@link * ExecutionInfo#getTracingId()} will always be {@code null}. */ - @NonNull + @Nonnull @Override ExecutionInfo getExecutionInfo(); } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousResultSet.java b/core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousResultSet.java index a333801a59a..5a3f64f879b 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousResultSet.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousResultSet.java @@ -20,9 +20,9 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.cql.ResultSet; import com.datastax.oss.driver.api.core.cql.Statement; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.util.List; +import javax.annotation.Nonnull; /** * The result of a {@linkplain ContinuousSession#executeContinuously(Statement) synchronous @@ -71,7 +71,7 @@ public interface ContinuousResultSet extends ResultSet { *

Note: because the driver does not support query traces for continuous queries, {@link * ExecutionInfo#getTracingId()} will always be {@code null}. */ - @NonNull + @Nonnull @Override default ExecutionInfo getExecutionInfo() { List infos = getExecutionInfos(); diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousSession.java b/core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousSession.java index 1c647b33b92..03470e3f5b9 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousSession.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/ContinuousSession.java @@ -24,10 +24,10 @@ import com.datastax.oss.driver.api.core.loadbalancing.LoadBalancingPolicy; import com.datastax.oss.driver.api.core.metadata.token.Token; import com.datastax.oss.driver.api.core.session.Session; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.util.Objects; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; /** * A session that has the ability to execute continuous paging queries. @@ -84,8 +84,8 @@ public interface ContinuousSession extends Session { * @param statement the query to execute. * @return a synchronous iterable on the results. */ - @NonNull - default ContinuousResultSet executeContinuously(@NonNull Statement statement) { + @Nonnull + default ContinuousResultSet executeContinuously(@Nonnull Statement statement) { return Objects.requireNonNull( execute(statement, ContinuousCqlRequestSyncProcessor.CONTINUOUS_RESULT_SYNC)); } @@ -107,9 +107,9 @@ default ContinuousResultSet executeContinuously(@NonNull Statement statement) * @param statement the query to execute. * @return a future to the first asynchronous result. */ - @NonNull + @Nonnull default CompletionStage executeContinuouslyAsync( - @NonNull Statement statement) { + @Nonnull Statement statement) { return Objects.requireNonNull( execute(statement, ContinuousCqlRequestAsyncProcessor.CONTINUOUS_RESULT_ASYNC)); } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/reactive/ContinuousReactiveSession.java b/core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/reactive/ContinuousReactiveSession.java index d00013731cb..2e6a3a4cfd2 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/reactive/ContinuousReactiveSession.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/cql/continuous/reactive/ContinuousReactiveSession.java @@ -23,8 +23,8 @@ import com.datastax.oss.driver.api.core.cql.SimpleStatement; import com.datastax.oss.driver.api.core.cql.Statement; import com.datastax.oss.driver.api.core.session.Session; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; +import javax.annotation.Nonnull; import org.reactivestreams.Publisher; /** @@ -59,8 +59,8 @@ public interface ContinuousReactiveSession extends Session { * @param query the query to execute. * @return The {@link Publisher} that will publish the returned results. */ - @NonNull - default ContinuousReactiveResultSet executeContinuouslyReactive(@NonNull String query) { + @Nonnull + default ContinuousReactiveResultSet executeContinuouslyReactive(@Nonnull String query) { return executeContinuouslyReactive(SimpleStatement.newInstance(query)); } @@ -76,8 +76,8 @@ default ContinuousReactiveResultSet executeContinuouslyReactive(@NonNull String * @param statement the statement to execute. * @return The {@link Publisher} that will publish the returned results. */ - @NonNull - default ContinuousReactiveResultSet executeContinuouslyReactive(@NonNull Statement statement) { + @Nonnull + default ContinuousReactiveResultSet executeContinuouslyReactive(@Nonnull Statement statement) { return Objects.requireNonNull( execute(statement, ContinuousCqlRequestReactiveProcessor.CONTINUOUS_REACTIVE_RESULT_SET)); } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/cql/reactive/ReactiveQueryMetadata.java b/core/src/main/java/com/datastax/dse/driver/api/core/cql/reactive/ReactiveQueryMetadata.java index 55a898cd3ee..96c383c8e06 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/cql/reactive/ReactiveQueryMetadata.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/cql/reactive/ReactiveQueryMetadata.java @@ -19,7 +19,7 @@ import com.datastax.oss.driver.api.core.cql.ColumnDefinitions; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import org.reactivestreams.Publisher; /** @@ -41,7 +41,7 @@ public interface ReactiveQueryMetadata { * * @see ReactiveRow#getColumnDefinitions() */ - @NonNull + @Nonnull Publisher getColumnDefinitions(); /** @@ -57,7 +57,7 @@ public interface ReactiveQueryMetadata { * * @see ReactiveRow#getExecutionInfo() */ - @NonNull + @Nonnull Publisher getExecutionInfos(); /** @@ -83,6 +83,6 @@ public interface ReactiveQueryMetadata { * * @see ReactiveRow#wasApplied() */ - @NonNull + @Nonnull Publisher wasApplied(); } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/cql/reactive/ReactiveRow.java b/core/src/main/java/com/datastax/dse/driver/api/core/cql/reactive/ReactiveRow.java index c3b94689580..ee2f80a346e 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/cql/reactive/ReactiveRow.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/cql/reactive/ReactiveRow.java @@ -21,7 +21,7 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.cql.Row; import com.datastax.oss.driver.api.core.type.DataTypes; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * A row produced by a {@linkplain ReactiveResultSet reactive result set}. @@ -44,7 +44,7 @@ public interface ReactiveRow extends Row { * @return the column definitions contained in this row. * @see ReactiveResultSet#getColumnDefinitions() */ - @NonNull + @Nonnull @Override ColumnDefinitions getColumnDefinitions(); @@ -57,7 +57,7 @@ public interface ReactiveRow extends Row { * @return the execution information for the paged request that produced this result. * @see ReactiveResultSet#getExecutionInfos() */ - @NonNull + @Nonnull ExecutionInfo getExecutionInfo(); /** diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/cql/reactive/ReactiveSession.java b/core/src/main/java/com/datastax/dse/driver/api/core/cql/reactive/ReactiveSession.java index 2fd8ffe41c2..471a88da470 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/cql/reactive/ReactiveSession.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/cql/reactive/ReactiveSession.java @@ -21,9 +21,9 @@ import com.datastax.oss.driver.api.core.cql.SimpleStatement; import com.datastax.oss.driver.api.core.cql.Statement; import com.datastax.oss.driver.api.core.session.Session; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; import java.util.Objects; +import javax.annotation.Nonnull; import org.reactivestreams.Publisher; /** @@ -49,8 +49,8 @@ public interface ReactiveSession extends Session { * @return The {@link Publisher} that will publish the returned results. * @see SimpleStatement#newInstance(String) */ - @NonNull - default ReactiveResultSet executeReactive(@NonNull String query) { + @Nonnull + default ReactiveResultSet executeReactive(@Nonnull String query) { return executeReactive(SimpleStatement.newInstance(query)); } @@ -67,8 +67,8 @@ default ReactiveResultSet executeReactive(@NonNull String query) { * @return The {@link Publisher} that will publish the returned results. * @see SimpleStatement#newInstance(String,Object...) */ - @NonNull - default ReactiveResultSet executeReactive(@NonNull String query, @NonNull Object... values) { + @Nonnull + default ReactiveResultSet executeReactive(@Nonnull String query, @Nonnull Object... values) { return executeReactive(SimpleStatement.newInstance(query, values)); } @@ -85,9 +85,9 @@ default ReactiveResultSet executeReactive(@NonNull String query, @NonNull Object * @return The {@link Publisher} that will publish the returned results. * @see SimpleStatement#newInstance(String,Map) */ - @NonNull + @Nonnull default ReactiveResultSet executeReactive( - @NonNull String query, @NonNull Map values) { + @Nonnull String query, @Nonnull Map values) { return executeReactive(SimpleStatement.newInstance(query, values)); } @@ -98,8 +98,8 @@ default ReactiveResultSet executeReactive( * @param statement the statement to execute. * @return The {@link Publisher} that will publish the returned results. */ - @NonNull - default ReactiveResultSet executeReactive(@NonNull Statement statement) { + @Nonnull + default ReactiveResultSet executeReactive(@Nonnull Statement statement) { return Objects.requireNonNull( execute(statement, CqlRequestReactiveProcessor.REACTIVE_RESULT_SET)); } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/data/geometry/Geometry.java b/core/src/main/java/com/datastax/dse/driver/api/core/data/geometry/Geometry.java index 66a5708832e..8bc52edfc88 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/data/geometry/Geometry.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/data/geometry/Geometry.java @@ -17,8 +17,8 @@ */ package com.datastax.dse.driver.api.core.data.geometry; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; /** * The driver-side representation for a DSE geospatial type. @@ -38,7 +38,7 @@ public interface Geometry { * Returns a Well-known Text (WKT) * representation of this geospatial type. */ - @NonNull + @Nonnull String asWellKnownText(); /** @@ -48,11 +48,11 @@ public interface Geometry { *

Note that, due to DSE implementation details, the resulting byte buffer always uses * little-endian order, regardless of the platform's native order. */ - @NonNull + @Nonnull ByteBuffer asWellKnownBinary(); /** Returns a JSON representation of this geospatial type. */ - @NonNull + @Nonnull String asGeoJson(); /** @@ -61,5 +61,5 @@ public interface Geometry { * @param other the other instance. * @return whether {@code this} contains {@code other}. */ - boolean contains(@NonNull Geometry other); + boolean contains(@Nonnull Geometry other); } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/data/geometry/LineString.java b/core/src/main/java/com/datastax/dse/driver/api/core/data/geometry/LineString.java index 7f77b3202a2..c0fe8cce700 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/data/geometry/LineString.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/data/geometry/LineString.java @@ -20,9 +20,9 @@ import com.datastax.dse.driver.internal.core.data.geometry.DefaultGeometry; import com.datastax.dse.driver.internal.core.data.geometry.DefaultLineString; import com.esri.core.geometry.ogc.OGCLineString; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.util.List; +import javax.annotation.Nonnull; /** * The driver-side representation for DSE's {@code LineString}. @@ -42,8 +42,8 @@ public interface LineString extends Geometry { * @throws IllegalArgumentException if the string does not contain a valid Well-known Text * representation. */ - @NonNull - static LineString fromWellKnownText(@NonNull String source) { + @Nonnull + static LineString fromWellKnownText(@Nonnull String source) { return new DefaultLineString(DefaultGeometry.fromOgcWellKnownText(source, OGCLineString.class)); } @@ -57,8 +57,8 @@ static LineString fromWellKnownText(@NonNull String source) { * @throws IllegalArgumentException if the provided {@link ByteBuffer} does not contain a valid * Well-known Binary representation. */ - @NonNull - static LineString fromWellKnownBinary(@NonNull ByteBuffer source) { + @Nonnull + static LineString fromWellKnownBinary(@Nonnull ByteBuffer source) { return new DefaultLineString( DefaultGeometry.fromOgcWellKnownBinary(source, OGCLineString.class)); } @@ -75,17 +75,17 @@ static LineString fromWellKnownBinary(@NonNull ByteBuffer source) { * href="https://tools.ietf.org/html/rfc7946#appendix-A">GeoJSON LineString * representation. */ - @NonNull - static LineString fromGeoJson(@NonNull String source) { + @Nonnull + static LineString fromGeoJson(@Nonnull String source) { return new DefaultLineString(DefaultGeometry.fromOgcGeoJson(source, OGCLineString.class)); } /** Creates a line string from two or more points. */ - @NonNull - static LineString fromPoints(@NonNull Point p1, @NonNull Point p2, @NonNull Point... pn) { + @Nonnull + static LineString fromPoints(@Nonnull Point p1, @Nonnull Point p2, @Nonnull Point... pn) { return new DefaultLineString(p1, p2, pn); } - @NonNull + @Nonnull List getPoints(); } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/data/geometry/Point.java b/core/src/main/java/com/datastax/dse/driver/api/core/data/geometry/Point.java index b064b3fb222..1f7b13668e8 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/data/geometry/Point.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/data/geometry/Point.java @@ -20,8 +20,8 @@ import com.datastax.dse.driver.internal.core.data.geometry.DefaultGeometry; import com.datastax.dse.driver.internal.core.data.geometry.DefaultPoint; import com.esri.core.geometry.ogc.OGCPoint; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; /** * The driver-side representation of DSE's {@code Point}. @@ -43,8 +43,8 @@ public interface Point extends Geometry { * @throws IllegalArgumentException if the string does not contain a valid Well-known Text * representation. */ - @NonNull - static Point fromWellKnownText(@NonNull String source) { + @Nonnull + static Point fromWellKnownText(@Nonnull String source) { return new DefaultPoint(DefaultGeometry.fromOgcWellKnownText(source, OGCPoint.class)); } @@ -58,8 +58,8 @@ static Point fromWellKnownText(@NonNull String source) { * @throws IllegalArgumentException if the provided {@link ByteBuffer} does not contain a valid * Well-known Binary representation. */ - @NonNull - static Point fromWellKnownBinary(@NonNull ByteBuffer source) { + @Nonnull + static Point fromWellKnownBinary(@Nonnull ByteBuffer source) { return new DefaultPoint(DefaultGeometry.fromOgcWellKnownBinary(source, OGCPoint.class)); } @@ -74,8 +74,8 @@ static Point fromWellKnownBinary(@NonNull ByteBuffer source) { * @throws IllegalArgumentException if the string does not contain a valid GeoJSON Point representation. */ - @NonNull - static Point fromGeoJson(@NonNull String source) { + @Nonnull + static Point fromGeoJson(@Nonnull String source) { return new DefaultPoint(DefaultGeometry.fromOgcGeoJson(source, OGCPoint.class)); } @@ -86,7 +86,7 @@ static Point fromGeoJson(@NonNull String source) { * @param y The Y coordinate of this point (or its latitude in Geographic Coordinate Systems). * @return the point represented by coordinates. */ - @NonNull + @Nonnull static Point fromCoordinates(double x, double y) { return new DefaultPoint(x, y); } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/data/geometry/Polygon.java b/core/src/main/java/com/datastax/dse/driver/api/core/data/geometry/Polygon.java index d793704defa..f4c32e5b44b 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/data/geometry/Polygon.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/data/geometry/Polygon.java @@ -20,9 +20,9 @@ import com.datastax.dse.driver.internal.core.data.geometry.DefaultGeometry; import com.datastax.dse.driver.internal.core.data.geometry.DefaultPolygon; import com.esri.core.geometry.ogc.OGCPolygon; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.util.List; +import javax.annotation.Nonnull; /** * The driver-side representation of DSE's {@code Polygon}. @@ -42,8 +42,8 @@ public interface Polygon extends Geometry { * @throws IllegalArgumentException if the string does not contain a valid Well-known Text * representation. */ - @NonNull - static Polygon fromWellKnownText(@NonNull String source) { + @Nonnull + static Polygon fromWellKnownText(@Nonnull String source) { return new DefaultPolygon(DefaultGeometry.fromOgcWellKnownText(source, OGCPolygon.class)); } @@ -57,8 +57,8 @@ static Polygon fromWellKnownText(@NonNull String source) { * @throws IllegalArgumentException if the provided {@link ByteBuffer} does not contain a valid * Well-known Binary representation. */ - @NonNull - static Polygon fromWellKnownBinary(@NonNull ByteBuffer source) { + @Nonnull + static Polygon fromWellKnownBinary(@Nonnull ByteBuffer source) { return new DefaultPolygon(DefaultGeometry.fromOgcWellKnownBinary(source, OGCPolygon.class)); } @@ -73,15 +73,15 @@ static Polygon fromWellKnownBinary(@NonNull ByteBuffer source) { * @throws IllegalArgumentException if the string does not contain a valid GeoJSON Polygon representation. */ - @NonNull - static Polygon fromGeoJson(@NonNull String source) { + @Nonnull + static Polygon fromGeoJson(@Nonnull String source) { return new DefaultPolygon(DefaultGeometry.fromOgcGeoJson(source, OGCPolygon.class)); } /** Creates a polygon from a series of 3 or more points. */ - @NonNull + @Nonnull static Polygon fromPoints( - @NonNull Point p1, @NonNull Point p2, @NonNull Point p3, @NonNull Point... pn) { + @Nonnull Point p1, @Nonnull Point p2, @Nonnull Point p3, @Nonnull Point... pn) { return new DefaultPolygon(p1, p2, p3, pn); } @@ -91,20 +91,20 @@ static Polygon fromPoints( *

This is intended for complex polygons with multiple rings (i.e. holes inside the polygon). * For simple cases, consider {@link #fromPoints(Point, Point, Point, Point...)} instead. */ - @NonNull + @Nonnull static Builder builder() { return new DefaultPolygon.Builder(); } /** Returns the external ring of the polygon. */ - @NonNull + @Nonnull List getExteriorRing(); /** * Returns the internal rings of the polygon, i.e. any holes inside of it (or islands inside of * the holes). */ - @NonNull + @Nonnull List> getInteriorRings(); /** Provides a simple DSL to build a polygon. */ @@ -118,10 +118,10 @@ interface Builder { * *

There must be one "main" outer ring that contains all the others. */ - @NonNull - Builder addRing(@NonNull Point p1, @NonNull Point p2, @NonNull Point p3, @NonNull Point... pn); + @Nonnull + Builder addRing(@Nonnull Point p1, @Nonnull Point p2, @Nonnull Point p3, @Nonnull Point... pn); - @NonNull + @Nonnull Polygon build(); } } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/data/time/DateRange.java b/core/src/main/java/com/datastax/dse/driver/api/core/data/time/DateRange.java index 3dd48915dba..0be3ca0214f 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/data/time/DateRange.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/data/time/DateRange.java @@ -19,13 +19,13 @@ import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; import com.datastax.oss.driver.shaded.guava.common.base.Strings; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.Serializable; import java.text.ParseException; import java.time.ZonedDateTime; import java.util.Objects; import java.util.Optional; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A date range, as defined by the server type {@code @@ -63,8 +63,8 @@ public class DateRange implements Serializable { * @see DateRangeBound#parseLowerBound(String) * @see DateRangeBound#parseUpperBound(String) */ - @NonNull - public static DateRange parse(@NonNull String source) throws ParseException { + @Nonnull + public static DateRange parse(@Nonnull String source) throws ParseException { if (Strings.isNullOrEmpty(source)) { throw new ParseException("Date range is null or empty", 0); } @@ -106,7 +106,7 @@ public static DateRange parse(@NonNull String source) throws ParseException { } } - @NonNull private final DateRangeBound lowerBound; + @Nonnull private final DateRangeBound lowerBound; @Nullable private final DateRangeBound upperBound; /** @@ -115,7 +115,7 @@ public static DateRange parse(@NonNull String source) throws ParseException { * * @throws NullPointerException if {@code singleBound} is null. */ - public DateRange(@NonNull DateRangeBound singleBound) { + public DateRange(@Nonnull DateRangeBound singleBound) { this.lowerBound = Preconditions.checkNotNull(singleBound, "singleBound cannot be null"); this.upperBound = null; } @@ -127,7 +127,7 @@ public DateRange(@NonNull DateRangeBound singleBound) { * @throws IllegalArgumentException if both {@code lowerBound} and {@code upperBound} are not * unbounded and {@code lowerBound} is greater than {@code upperBound}. */ - public DateRange(@NonNull DateRangeBound lowerBound, @NonNull DateRangeBound upperBound) { + public DateRange(@Nonnull DateRangeBound lowerBound, @Nonnull DateRangeBound upperBound) { Preconditions.checkNotNull(lowerBound, "lowerBound cannot be null"); Preconditions.checkNotNull(upperBound, "upperBound cannot be null"); if (!lowerBound.isUnbounded() @@ -143,7 +143,7 @@ public DateRange(@NonNull DateRangeBound lowerBound, @NonNull DateRangeBound upp } /** Returns the lower bound of this range (inclusive). */ - @NonNull + @Nonnull public DateRangeBound getLowerBound() { return lowerBound; } @@ -152,7 +152,7 @@ public DateRangeBound getLowerBound() { * Returns the upper bound of this range (inclusive), or empty if the range is {@linkplain * #isSingleBounded() single-bounded}. */ - @NonNull + @Nonnull public Optional getUpperBound() { return Optional.ofNullable(upperBound); } @@ -171,7 +171,7 @@ public boolean isSingleBounded() { * * @see DateRangeBound#toString() */ - @NonNull + @Nonnull @Override public String toString() { if (isSingleBounded()) { diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/data/time/DateRangeBound.java b/core/src/main/java/com/datastax/dse/driver/api/core/data/time/DateRangeBound.java index 1621b8bf742..3921aee33d7 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/data/time/DateRangeBound.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/data/time/DateRangeBound.java @@ -19,12 +19,12 @@ import com.datastax.dse.driver.internal.core.search.DateRangeUtil; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.text.ParseException; import java.time.ZonedDateTime; import java.util.Calendar; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A date range bound. @@ -62,8 +62,8 @@ public class DateRangeBound { * @throws NullPointerException if {@code lowerBound} is {@code null}. * @throws ParseException if the given input cannot be parsed. */ - @NonNull - public static DateRangeBound parseLowerBound(@NonNull String source) throws ParseException { + @Nonnull + public static DateRangeBound parseLowerBound(@Nonnull String source) throws ParseException { Preconditions.checkNotNull(source); Calendar calendar = DateRangeUtil.parseCalendar(source); DateRangePrecision precision = DateRangeUtil.getPrecision(calendar); @@ -119,7 +119,7 @@ public static DateRangeBound upperBound(ZonedDateTime timestamp, DateRangePrecis @Nullable private final ZonedDateTime timestamp; @Nullable private final DateRangePrecision precision; - private DateRangeBound(@NonNull ZonedDateTime timestamp, @NonNull DateRangePrecision precision) { + private DateRangeBound(@Nonnull ZonedDateTime timestamp, @Nonnull DateRangePrecision precision) { Preconditions.checkNotNull(timestamp); Preconditions.checkNotNull(precision); this.timestamp = timestamp; @@ -142,7 +142,7 @@ public boolean isUnbounded() { * * @throws IllegalStateException if this bound is {@linkplain #isUnbounded() unbounded}. */ - @NonNull + @Nonnull public ZonedDateTime getTimestamp() { if (isUnbounded()) { throw new IllegalStateException( @@ -157,7 +157,7 @@ public ZonedDateTime getTimestamp() { * * @throws IllegalStateException if this bound is {@linkplain #isUnbounded() unbounded}. */ - @NonNull + @Nonnull public DateRangePrecision getPrecision() { if (isUnbounded()) { throw new IllegalStateException( @@ -181,7 +181,7 @@ public DateRangePrecision getPrecision() { * DateRangePrecision#MILLISECOND millisecond} precision, where the symbol "Z" is always appended * to the resulting string. */ - @NonNull + @Nonnull @Override public String toString() { if (isUnbounded()) { diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/data/time/DateRangePrecision.java b/core/src/main/java/com/datastax/dse/driver/api/core/data/time/DateRangePrecision.java index ce811466c38..67d7a62db26 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/data/time/DateRangePrecision.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/data/time/DateRangePrecision.java @@ -20,7 +20,6 @@ import com.datastax.dse.driver.internal.core.search.DateRangeUtil; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; @@ -29,6 +28,7 @@ import java.time.temporal.ChronoUnit; import java.util.Locale; import java.util.Map; +import javax.annotation.Nonnull; /** The precision of a {@link DateRangeBound}. */ public enum DateRangePrecision { @@ -172,8 +172,8 @@ public byte getEncoding() { *

Temporal fields smaller than this precision will be rounded up; other fields will be left * untouched. */ - @NonNull - public ZonedDateTime roundUp(@NonNull ZonedDateTime timestamp) { + @Nonnull + public ZonedDateTime roundUp(@Nonnull ZonedDateTime timestamp) { Preconditions.checkNotNull(timestamp); return DateRangeUtil.roundUp(timestamp, roundingUnit); } @@ -184,8 +184,8 @@ public ZonedDateTime roundUp(@NonNull ZonedDateTime timestamp) { *

Temporal fields smaller than this precision will be rounded down; other fields will be left * untouched. */ - @NonNull - public ZonedDateTime roundDown(@NonNull ZonedDateTime timestamp) { + @Nonnull + public ZonedDateTime roundDown(@Nonnull ZonedDateTime timestamp) { Preconditions.checkNotNull(timestamp); return DateRangeUtil.roundDown(timestamp, roundingUnit); } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/graph/AsyncGraphResultSet.java b/core/src/main/java/com/datastax/dse/driver/api/core/graph/AsyncGraphResultSet.java index 995de53959b..ee5907fa766 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/graph/AsyncGraphResultSet.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/graph/AsyncGraphResultSet.java @@ -19,10 +19,10 @@ import com.datastax.dse.driver.internal.core.graph.GraphExecutionInfoConverter; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Iterator; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * The result of an asynchronous graph query. @@ -38,7 +38,7 @@ public interface AsyncGraphResultSet { /** The execution information for this page of results. */ - @NonNull + @Nonnull default ExecutionInfo getRequestExecutionInfo() { return GraphExecutionInfoConverter.convert(getExecutionInfo()); } @@ -49,7 +49,7 @@ default ExecutionInfo getRequestExecutionInfo() { * @deprecated Use {@link #getRequestExecutionInfo()} instead. */ @Deprecated - @NonNull + @Nonnull com.datastax.dse.driver.api.core.graph.GraphExecutionInfo getExecutionInfo(); /** How many rows are left before the current page is exhausted. */ @@ -62,7 +62,7 @@ default ExecutionInfo getRequestExecutionInfo() { *

Note that this method always returns the same object, and that that object can only be * iterated once: nodes are "consumed" as they are read. */ - @NonNull + @Nonnull Iterable currentPage(); /** @@ -88,7 +88,7 @@ default GraphNode one() { * @throws IllegalStateException if there are no more pages. Use {@link #hasMorePages()} to check * if you can call this method. */ - @NonNull + @Nonnull CompletionStage fetchNextPage() throws IllegalStateException; /** diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/graph/BatchGraphStatement.java b/core/src/main/java/com/datastax/dse/driver/api/core/graph/BatchGraphStatement.java index 2169dc5f053..c14efe9965d 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/graph/BatchGraphStatement.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/graph/BatchGraphStatement.java @@ -20,8 +20,8 @@ import com.datastax.dse.driver.internal.core.graph.DefaultBatchGraphStatement; import com.datastax.oss.driver.api.core.cql.Statement; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collections; +import javax.annotation.Nonnull; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; /** @@ -63,7 +63,7 @@ public interface BatchGraphStatement * *

Traversals can be added with {@link #addTraversal(GraphTraversal)}. */ - @NonNull + @Nonnull static BatchGraphStatement newInstance() { return new DefaultBatchGraphStatement( ImmutableList.of(), @@ -83,8 +83,8 @@ static BatchGraphStatement newInstance() { } /** Create a new instance from the given list of traversals. */ - @NonNull - static BatchGraphStatement newInstance(@NonNull Iterable traversals) { + @Nonnull + static BatchGraphStatement newInstance(@Nonnull Iterable traversals) { return new DefaultBatchGraphStatement( traversals, null, @@ -103,8 +103,8 @@ static BatchGraphStatement newInstance(@NonNull Iterable travers } /** Create a new instance from the given list of traversals. */ - @NonNull - static BatchGraphStatement newInstance(@NonNull GraphTraversal... traversals) { + @Nonnull + static BatchGraphStatement newInstance(@Nonnull GraphTraversal... traversals) { return newInstance(ImmutableList.copyOf(traversals)); } @@ -113,7 +113,7 @@ static BatchGraphStatement newInstance(@NonNull GraphTraversal... traversals) { * *

Note that this builder is mutable and not thread-safe. */ - @NonNull + @Nonnull static BatchGraphStatementBuilder builder() { return new BatchGraphStatementBuilder(); } @@ -125,8 +125,8 @@ static BatchGraphStatementBuilder builder() { * *

Note that this builder is mutable and not thread-safe. */ - @NonNull - static BatchGraphStatementBuilder builder(@NonNull BatchGraphStatement template) { + @Nonnull + static BatchGraphStatementBuilder builder(@Nonnull BatchGraphStatement template) { return new BatchGraphStatementBuilder(template); } @@ -135,15 +135,15 @@ static BatchGraphStatementBuilder builder(@NonNull BatchGraphStatement template) * #builder()}, or the {@link #addTraversals(Iterable)} method instead to avoid intermediary * copies. */ - @NonNull - BatchGraphStatement addTraversal(@NonNull GraphTraversal traversal); + @Nonnull + BatchGraphStatement addTraversal(@Nonnull GraphTraversal traversal); /** * Adds several traversals to this statement. If this method is to be called many times, consider * using a {@link #builder()} instead to avoid intermediary copies. */ - @NonNull - BatchGraphStatement addTraversals(@NonNull Iterable traversals); + @Nonnull + BatchGraphStatement addTraversals(@Nonnull Iterable traversals); /** Get the number of traversals already added to this statement. */ int size(); diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/graph/BatchGraphStatementBuilder.java b/core/src/main/java/com/datastax/dse/driver/api/core/graph/BatchGraphStatementBuilder.java index ac1b85bdc71..f50184c311d 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/graph/BatchGraphStatementBuilder.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/graph/BatchGraphStatementBuilder.java @@ -19,7 +19,7 @@ import com.datastax.dse.driver.internal.core.graph.DefaultBatchGraphStatement; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import net.jcip.annotations.NotThreadSafe; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; @@ -46,8 +46,8 @@ public BatchGraphStatementBuilder(BatchGraphStatement template) { } /** Add a traversal to this builder to include in the generated {@link BatchGraphStatement}. */ - @NonNull - public BatchGraphStatementBuilder addTraversal(@NonNull GraphTraversal traversal) { + @Nonnull + public BatchGraphStatementBuilder addTraversal(@Nonnull GraphTraversal traversal) { traversalsBuilder.add(traversal); traversalsCount += 1; return this; @@ -56,8 +56,8 @@ public BatchGraphStatementBuilder addTraversal(@NonNull GraphTraversal traversal /** * Add several traversals to this builder to include in the generated {@link BatchGraphStatement}. */ - @NonNull - public BatchGraphStatementBuilder addTraversals(@NonNull Iterable traversals) { + @Nonnull + public BatchGraphStatementBuilder addTraversals(@Nonnull Iterable traversals) { for (GraphTraversal traversal : traversals) { traversalsBuilder.add(traversal); traversalsCount += 1; @@ -68,8 +68,8 @@ public BatchGraphStatementBuilder addTraversals(@NonNull IterableUse {@link #builder(GraphTraversal)} if you want to set more options before building the * final statement instance. */ - @NonNull - static FluentGraphStatement newInstance(@NonNull GraphTraversal traversal) { + @Nonnull + static FluentGraphStatement newInstance(@Nonnull GraphTraversal traversal) { return new DefaultFluentGraphStatement( traversal, null, @@ -70,8 +70,8 @@ static FluentGraphStatement newInstance(@NonNull GraphTraversal traversal) * *

Note that this builder is mutable and not thread-safe. */ - @NonNull - static FluentGraphStatementBuilder builder(@NonNull GraphTraversal traversal) { + @Nonnull + static FluentGraphStatementBuilder builder(@Nonnull GraphTraversal traversal) { return new FluentGraphStatementBuilder(traversal); } @@ -82,12 +82,12 @@ static FluentGraphStatementBuilder builder(@NonNull GraphTraversal travers * *

Note that this builder is mutable and not thread-safe. */ - @NonNull - static FluentGraphStatementBuilder builder(@NonNull FluentGraphStatement template) { + @Nonnull + static FluentGraphStatementBuilder builder(@Nonnull FluentGraphStatement template) { return new FluentGraphStatementBuilder(template); } /** The underlying TinkerPop object representing the traversal executed by this statement. */ - @NonNull + @Nonnull GraphTraversal getTraversal(); } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/graph/FluentGraphStatementBuilder.java b/core/src/main/java/com/datastax/dse/driver/api/core/graph/FluentGraphStatementBuilder.java index 59e588c564a..e222e40806e 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/graph/FluentGraphStatementBuilder.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/graph/FluentGraphStatementBuilder.java @@ -18,7 +18,7 @@ package com.datastax.dse.driver.api.core.graph; import com.datastax.dse.driver.internal.core.graph.DefaultFluentGraphStatement; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import net.jcip.annotations.NotThreadSafe; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; @@ -33,16 +33,16 @@ public class FluentGraphStatementBuilder private GraphTraversal traversal; - public FluentGraphStatementBuilder(@NonNull GraphTraversal traversal) { + public FluentGraphStatementBuilder(@Nonnull GraphTraversal traversal) { this.traversal = traversal; } - public FluentGraphStatementBuilder(@NonNull FluentGraphStatement template) { + public FluentGraphStatementBuilder(@Nonnull FluentGraphStatement template) { super(template); this.traversal = template.getTraversal(); } - @NonNull + @Nonnull @Override public FluentGraphStatement build() { return new DefaultFluentGraphStatement( diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/graph/GraphResultSet.java b/core/src/main/java/com/datastax/dse/driver/api/core/graph/GraphResultSet.java index d9c8d8fa460..fa33ee2c004 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/graph/GraphResultSet.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/graph/GraphResultSet.java @@ -20,11 +20,11 @@ import com.datastax.dse.driver.internal.core.graph.GraphExecutionInfoConverter; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Collections; import java.util.Iterator; import java.util.List; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * The result of a synchronous Graph query. @@ -62,7 +62,7 @@ default GraphNode one() { *

At this time (DSE 6.0.0), graph queries are not paginated and the server sends all the * results at once. */ - @NonNull + @Nonnull default List all() { if (!iterator().hasNext()) { return Collections.emptyList(); @@ -81,13 +81,13 @@ default List all() { /** * The execution information for the query that have been performed to assemble this result set. */ - @NonNull + @Nonnull default ExecutionInfo getRequestExecutionInfo() { return GraphExecutionInfoConverter.convert(getExecutionInfo()); } /** @deprecated Use {@link #getRequestExecutionInfo()} instead. */ @Deprecated - @NonNull + @Nonnull com.datastax.dse.driver.api.core.graph.GraphExecutionInfo getExecutionInfo(); } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/graph/GraphSession.java b/core/src/main/java/com/datastax/dse/driver/api/core/graph/GraphSession.java index b985bc56353..bc722568938 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/graph/GraphSession.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/graph/GraphSession.java @@ -19,9 +19,9 @@ import com.datastax.oss.driver.api.core.CqlSession; import com.datastax.oss.driver.api.core.session.Session; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; /** * A session that has the ability to execute DSE Graph requests. @@ -58,8 +58,8 @@ public interface GraphSession extends Session { * @param graphStatement the graph query to execute (that can be any {@code GraphStatement}). * @return the result of the graph query. That result will never be null but can be empty. */ - @NonNull - default GraphResultSet execute(@NonNull GraphStatement graphStatement) { + @Nonnull + default GraphResultSet execute(@Nonnull GraphStatement graphStatement) { return Objects.requireNonNull( execute(graphStatement, GraphStatement.SYNC), "The graph processor should never return a null result"); @@ -77,9 +77,9 @@ default GraphResultSet execute(@NonNull GraphStatement graphStatement) { * @param graphStatement the graph query to execute (that can be any {@code GraphStatement}). * @return the {@code CompletionStage} on the result of the graph query. */ - @NonNull + @Nonnull default CompletionStage executeAsync( - @NonNull GraphStatement graphStatement) { + @Nonnull GraphStatement graphStatement) { return Objects.requireNonNull( execute(graphStatement, GraphStatement.ASYNC), "The graph processor should never return a null result"); diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/graph/GraphStatement.java b/core/src/main/java/com/datastax/dse/driver/api/core/graph/GraphStatement.java index f770469b824..f749cadb126 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/graph/GraphStatement.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/graph/GraphStatement.java @@ -30,13 +30,13 @@ import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.api.core.specex.SpeculativeExecutionPolicy; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.time.Duration; import java.util.Map; import java.util.concurrent.CompletionStage; +import javax.annotation.CheckReturnValue; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A request to execute a DSE Graph query. @@ -77,7 +77,7 @@ public interface GraphStatement> extends Req * @param idempotent a boolean instance to set a statement-specific value, or {@code null} to use * the default idempotence defined in the configuration. */ - @NonNull + @Nonnull @CheckReturnValue SelfT setIdempotent(@Nullable Boolean idempotent); @@ -103,7 +103,7 @@ public interface GraphStatement> extends Req * configuration. * @see #getTimeout() */ - @NonNull + @Nonnull @CheckReturnValue SelfT setTimeout(@Nullable Duration newTimeout); @@ -125,7 +125,7 @@ public interface GraphStatement> extends Req * @param newNode The node that should be used to handle executions of this statement or null to * delegate to the configured load balancing policy. */ - @NonNull + @Nonnull @CheckReturnValue SelfT setNode(@Nullable Node newNode); @@ -157,7 +157,7 @@ public interface GraphStatement> extends Req *

All the driver's built-in implementations are immutable, and return a new instance from this * method. However custom implementations may choose to be mutable and return the same instance. */ - @NonNull + @Nonnull @CheckReturnValue SelfT setExecutionProfile(@Nullable DriverExecutionProfile executionProfile); @@ -170,7 +170,7 @@ public interface GraphStatement> extends Req *

All the driver's built-in implementations are immutable, and return a new instance from this * method. However custom implementations may choose to be mutable and return the same instance. */ - @NonNull + @Nonnull @CheckReturnValue SelfT setExecutionProfileName(@Nullable String name); @@ -193,9 +193,9 @@ public interface GraphStatement> extends Req *

All the driver's built-in implementations are immutable, and return a new instance from this * method. However custom implementations may choose to be mutable and return the same instance. */ - @NonNull + @Nonnull @CheckReturnValue - SelfT setCustomPayload(@NonNull Map newCustomPayload); + SelfT setCustomPayload(@Nonnull Map newCustomPayload); /** * The name of the graph to use for this statement. @@ -215,7 +215,7 @@ public interface GraphStatement> extends Req * * @see #getGraphName() */ - @NonNull + @Nonnull @CheckReturnValue SelfT setGraphName(@Nullable String newGraphName); @@ -237,7 +237,7 @@ public interface GraphStatement> extends Req * * @see #getTraversalSource() */ - @NonNull + @Nonnull @CheckReturnValue SelfT setTraversalSource(@Nullable String newTraversalSource); @@ -259,7 +259,7 @@ public interface GraphStatement> extends Req * * @see #getSubProtocol() */ - @NonNull + @Nonnull @CheckReturnValue SelfT setSubProtocol(@Nullable String newSubProtocol); @@ -308,7 +308,7 @@ public interface GraphStatement> extends Req * * @see #getReadConsistencyLevel() */ - @NonNull + @Nonnull @CheckReturnValue SelfT setReadConsistencyLevel(@Nullable ConsistencyLevel newReadConsistencyLevel); @@ -334,7 +334,7 @@ public interface GraphStatement> extends Req * * @see #getWriteConsistencyLevel() */ - @NonNull + @Nonnull @CheckReturnValue SelfT setWriteConsistencyLevel(@Nullable ConsistencyLevel newWriteConsistencyLevel); diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/graph/GraphStatementBuilderBase.java b/core/src/main/java/com/datastax/dse/driver/api/core/graph/GraphStatementBuilderBase.java index 5cb48613cf5..2b62a0da41c 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/graph/GraphStatementBuilderBase.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/graph/GraphStatementBuilderBase.java @@ -22,11 +22,11 @@ import com.datastax.oss.driver.api.core.cql.Statement; import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.protocol.internal.util.collection.NullAllowingImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.time.Duration; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.NotThreadSafe; @NotThreadSafe @@ -76,42 +76,42 @@ protected GraphStatementBuilderBase(StatementT template) { } /** @see GraphStatement#setIdempotent(Boolean) */ - @NonNull + @Nonnull public SelfT setIdempotence(@Nullable Boolean idempotent) { this.isIdempotent = idempotent; return self; } /** @see GraphStatement#setTimeout(Duration) */ - @NonNull + @Nonnull public SelfT setTimeout(@Nullable Duration timeout) { this.timeout = timeout; return self; } /** @see GraphStatement#setNode(Node) */ - @NonNull + @Nonnull public SelfT setNode(@Nullable Node node) { this.node = node; return self; } /** @see GraphStatement#setTimestamp(long) */ - @NonNull + @Nonnull public SelfT setTimestamp(long timestamp) { this.timestamp = timestamp; return self; } /** @see GraphStatement#setExecutionProfileName(String) */ - @NonNull + @Nonnull public SelfT setExecutionProfileName(@Nullable String executionProfileName) { this.executionProfileName = executionProfileName; return self; } /** @see GraphStatement#setExecutionProfile(DriverExecutionProfile) */ - @NonNull + @Nonnull public SelfT setExecutionProfile(@Nullable DriverExecutionProfile executionProfile) { this.executionProfile = executionProfile; this.executionProfileName = null; @@ -119,8 +119,8 @@ public SelfT setExecutionProfile(@Nullable DriverExecutionProfile executionProfi } /** @see GraphStatement#setCustomPayload(Map) */ - @NonNull - public SelfT addCustomPayload(@NonNull String key, @Nullable ByteBuffer value) { + @Nonnull + public SelfT addCustomPayload(@Nonnull String key, @Nullable ByteBuffer value) { if (customPayloadBuilder == null) { customPayloadBuilder = NullAllowingImmutableMap.builder(); } @@ -129,55 +129,55 @@ public SelfT addCustomPayload(@NonNull String key, @Nullable ByteBuffer value) { } /** @see GraphStatement#setCustomPayload(Map) */ - @NonNull + @Nonnull public SelfT clearCustomPayload() { customPayloadBuilder = null; return self; } /** @see GraphStatement#setGraphName(String) */ - @NonNull + @Nonnull public SelfT setGraphName(@Nullable String graphName) { this.graphName = graphName; return self; } /** @see GraphStatement#setTraversalSource(String) */ - @NonNull + @Nonnull public SelfT setTraversalSource(@Nullable String traversalSource) { this.traversalSource = traversalSource; return self; } /** @see GraphStatement#setSubProtocol(String) */ - @NonNull + @Nonnull public SelfT setSubProtocol(@Nullable String subProtocol) { this.subProtocol = subProtocol; return self; } /** @see GraphStatement#setConsistencyLevel(ConsistencyLevel) */ - @NonNull + @Nonnull public SelfT setConsistencyLevel(@Nullable ConsistencyLevel consistencyLevel) { this.consistencyLevel = consistencyLevel; return self; } /** @see GraphStatement#setReadConsistencyLevel(ConsistencyLevel) */ - @NonNull + @Nonnull public SelfT setReadConsistencyLevel(@Nullable ConsistencyLevel readConsistencyLevel) { this.readConsistencyLevel = readConsistencyLevel; return self; } /** @see GraphStatement#setWriteConsistencyLevel(ConsistencyLevel) */ - @NonNull + @Nonnull public SelfT setWriteConsistencyLevel(@Nullable ConsistencyLevel writeConsistencyLevel) { this.writeConsistencyLevel = writeConsistencyLevel; return self; } - @NonNull + @Nonnull protected Map buildCustomPayload() { return (customPayloadBuilder == null) ? NullAllowingImmutableMap.of() @@ -185,6 +185,6 @@ protected Map buildCustomPayload() { } /** Create the statement with the configuration defined by this builder object. */ - @NonNull + @Nonnull public abstract StatementT build(); } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/graph/ScriptGraphStatement.java b/core/src/main/java/com/datastax/dse/driver/api/core/graph/ScriptGraphStatement.java index 2ad7aafc232..e8496418dd3 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/graph/ScriptGraphStatement.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/graph/ScriptGraphStatement.java @@ -20,10 +20,10 @@ import com.datastax.dse.driver.internal.core.graph.DefaultScriptGraphStatement; import com.datastax.oss.driver.api.core.cql.Statement; import com.datastax.oss.protocol.internal.util.collection.NullAllowingImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Collections; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A graph statement that uses a Gremlin-groovy script the query. @@ -44,8 +44,8 @@ public interface ScriptGraphStatement extends GraphStatement { /** Create a new instance from the given script. */ - @NonNull - static ScriptGraphStatement newInstance(@NonNull String script) { + @Nonnull + static ScriptGraphStatement newInstance(@Nonnull String script) { return new DefaultScriptGraphStatement( script, NullAllowingImmutableMap.of(), @@ -70,8 +70,8 @@ static ScriptGraphStatement newInstance(@NonNull String script) { * *

Note that this builder is mutable and not thread-safe. */ - @NonNull - static ScriptGraphStatementBuilder builder(@NonNull String script) { + @Nonnull + static ScriptGraphStatementBuilder builder(@Nonnull String script) { return new ScriptGraphStatementBuilder(script); } @@ -82,13 +82,13 @@ static ScriptGraphStatementBuilder builder(@NonNull String script) { * *

Note that this builder is mutable and not thread-safe. */ - @NonNull - static ScriptGraphStatementBuilder builder(@NonNull ScriptGraphStatement template) { + @Nonnull + static ScriptGraphStatementBuilder builder(@Nonnull ScriptGraphStatement template) { return new ScriptGraphStatementBuilder(template); } /** The Gremlin-groovy script representing the graph query. */ - @NonNull + @Nonnull String getScript(); /** @@ -121,7 +121,7 @@ static ScriptGraphStatementBuilder builder(@NonNull ScriptGraphStatement templat * non-system query; {@code null} to default to the value defined in the configuration. * @see #isSystemQuery() */ - @NonNull + @Nonnull ScriptGraphStatement setSystemQuery(@Nullable Boolean newValue); /** @@ -129,7 +129,7 @@ static ScriptGraphStatementBuilder builder(@NonNull ScriptGraphStatement templat * * @see #setQueryParam(String, Object) */ - @NonNull + @Nonnull Map getQueryParams(); /** @@ -154,8 +154,8 @@ static ScriptGraphStatementBuilder builder(@NonNull ScriptGraphStatement templat * binding for this name, it gets replaced. * @param value the value that will be transmitted with the request. */ - @NonNull - ScriptGraphStatement setQueryParam(@NonNull String name, @Nullable Object value); + @Nonnull + ScriptGraphStatement setQueryParam(@Nonnull String name, @Nullable Object value); /** * Removes a binding for the given name from this statement. @@ -166,6 +166,6 @@ static ScriptGraphStatementBuilder builder(@NonNull ScriptGraphStatement templat * * @see #setQueryParam(String, Object) */ - @NonNull - ScriptGraphStatement removeQueryParam(@NonNull String name); + @Nonnull + ScriptGraphStatement removeQueryParam(@Nonnull String name); } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/graph/ScriptGraphStatementBuilder.java b/core/src/main/java/com/datastax/dse/driver/api/core/graph/ScriptGraphStatementBuilder.java index 1985c58955f..a7389cff17b 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/graph/ScriptGraphStatementBuilder.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/graph/ScriptGraphStatementBuilder.java @@ -20,9 +20,9 @@ import com.datastax.dse.driver.internal.core.graph.DefaultScriptGraphStatement; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; import com.datastax.oss.driver.shaded.guava.common.collect.Maps; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.NotThreadSafe; /** @@ -54,14 +54,14 @@ public ScriptGraphStatementBuilder(ScriptGraphStatement template) { this.isSystemQuery = template.isSystemQuery(); } - @NonNull - public ScriptGraphStatementBuilder setScript(@NonNull String script) { + @Nonnull + public ScriptGraphStatementBuilder setScript(@Nonnull String script) { this.script = script; return this; } /** @see ScriptGraphStatement#isSystemQuery() */ - @NonNull + @Nonnull public ScriptGraphStatementBuilder setSystemQuery(@Nullable Boolean isSystemQuery) { this.isSystemQuery = isSystemQuery; return this; @@ -72,8 +72,8 @@ public ScriptGraphStatementBuilder setSystemQuery(@Nullable Boolean isSystemQuer * * @see ScriptGraphStatement#setQueryParam(String, Object) */ - @NonNull - public ScriptGraphStatementBuilder setQueryParam(@NonNull String name, @Nullable Object value) { + @Nonnull + public ScriptGraphStatementBuilder setQueryParam(@Nonnull String name, @Nullable Object value) { this.queryParams.put(name, value); return this; } @@ -83,8 +83,8 @@ public ScriptGraphStatementBuilder setQueryParam(@NonNull String name, @Nullable * * @see ScriptGraphStatement#setQueryParam(String, Object) */ - @NonNull - public ScriptGraphStatementBuilder setQueryParams(@NonNull Map params) { + @Nonnull + public ScriptGraphStatementBuilder setQueryParams(@Nonnull Map params) { this.queryParams.putAll(params); return this; } @@ -99,8 +99,8 @@ public ScriptGraphStatementBuilder setQueryParams(@NonNull Map p * @see ScriptGraphStatement#setQueryParam(String, Object) * @see #clearQueryParams() */ - @NonNull - public ScriptGraphStatementBuilder removeQueryParam(@NonNull String name) { + @Nonnull + public ScriptGraphStatementBuilder removeQueryParam(@Nonnull String name) { this.queryParams.remove(name); return this; } @@ -111,7 +111,7 @@ public ScriptGraphStatementBuilder clearQueryParams() { return this; } - @NonNull + @Nonnull @Override public ScriptGraphStatement build() { Preconditions.checkNotNull(this.script, "Script hasn't been defined in this builder."); diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/graph/predicates/Geo.java b/core/src/main/java/com/datastax/dse/driver/api/core/graph/predicates/Geo.java index 65dd84d0076..a1e348b8a30 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/graph/predicates/Geo.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/graph/predicates/Geo.java @@ -23,7 +23,7 @@ import com.datastax.dse.driver.internal.core.data.geometry.Distance; import com.datastax.dse.driver.internal.core.graph.GeoPredicate; import com.datastax.dse.driver.internal.core.graph.GeoUtils; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; @@ -80,7 +80,7 @@ static P inside(Polygon polygon) { *

This is just a shortcut to {@link Point#fromCoordinates(double, double)}. It is duplicated * here so that {@code Geo} can be used as a single entry point in Gremlin-groovy scripts. */ - @NonNull + @Nonnull static Point point(double x, double y) { return Point.fromCoordinates(x, y); } @@ -92,9 +92,9 @@ static Point point(double x, double y) { * duplicated here so that {@code Geo} can be used as a single entry point in Gremlin-groovy * scripts. */ - @NonNull + @Nonnull static LineString lineString( - @NonNull Point point1, @NonNull Point point2, @NonNull Point... otherPoints) { + @Nonnull Point point1, @Nonnull Point point2, @Nonnull Point... otherPoints) { return LineString.fromPoints(point1, point2, otherPoints); } @@ -104,7 +104,7 @@ static LineString lineString( *

This is provided for backward compatibility with previous DSE versions. We recommend {@link * #lineString(Point, Point, Point...)} instead. */ - @NonNull + @Nonnull static LineString lineString(double... coordinates) { if (coordinates.length % 2 != 0) { throw new IllegalArgumentException("lineString() must be passed an even number of arguments"); @@ -128,9 +128,9 @@ static LineString lineString(double... coordinates) { * duplicated here so that {@code Geo} can be used as a single entry point in Gremlin-groovy * scripts. */ - @NonNull + @Nonnull static Polygon polygon( - @NonNull Point p1, @NonNull Point p2, @NonNull Point p3, @NonNull Point... otherPoints) { + @Nonnull Point p1, @Nonnull Point p2, @Nonnull Point p3, @Nonnull Point... otherPoints) { return Polygon.fromPoints(p1, p2, p3, otherPoints); } @@ -140,7 +140,7 @@ static Polygon polygon( *

This is provided for backward compatibility with previous DSE versions. We recommend {@link * #polygon(Point, Point, Point, Point...)} instead. */ - @NonNull + @Nonnull static Polygon polygon(double... coordinates) { if (coordinates.length % 2 != 0) { throw new IllegalArgumentException("polygon() must be passed an even number of arguments"); diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/graph/reactive/ReactiveGraphNode.java b/core/src/main/java/com/datastax/dse/driver/api/core/graph/reactive/ReactiveGraphNode.java index ad7849633c6..46bea7186ea 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/graph/reactive/ReactiveGraphNode.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/graph/reactive/ReactiveGraphNode.java @@ -19,7 +19,7 @@ import com.datastax.dse.driver.api.core.graph.GraphNode; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * A {@link GraphNode} produced by a {@linkplain ReactiveGraphResultSet reactive graph result set}. @@ -42,6 +42,6 @@ public interface ReactiveGraphNode extends GraphNode { * @return the execution information for the paged request that produced this result. * @see ReactiveGraphResultSet#getExecutionInfos() */ - @NonNull + @Nonnull ExecutionInfo getExecutionInfo(); } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/graph/reactive/ReactiveGraphResultSet.java b/core/src/main/java/com/datastax/dse/driver/api/core/graph/reactive/ReactiveGraphResultSet.java index a0e3231750e..0d24587e6b6 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/graph/reactive/ReactiveGraphResultSet.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/graph/reactive/ReactiveGraphResultSet.java @@ -19,7 +19,7 @@ import com.datastax.dse.driver.api.core.graph.GraphStatement; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import org.reactivestreams.Publisher; /** @@ -61,6 +61,6 @@ public interface ReactiveGraphResultSet extends Publisher { * * @see ReactiveGraphNode#getExecutionInfo() */ - @NonNull + @Nonnull Publisher getExecutionInfos(); } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/graph/reactive/ReactiveGraphSession.java b/core/src/main/java/com/datastax/dse/driver/api/core/graph/reactive/ReactiveGraphSession.java index 88f0e5def61..f72daedec07 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/graph/reactive/ReactiveGraphSession.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/graph/reactive/ReactiveGraphSession.java @@ -20,8 +20,8 @@ import com.datastax.dse.driver.api.core.graph.GraphStatement; import com.datastax.dse.driver.internal.core.graph.reactive.ReactiveGraphRequestProcessor; import com.datastax.oss.driver.api.core.session.Session; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; +import javax.annotation.Nonnull; /** * A {@link Session} that offers utility methods to issue graph queries using reactive-style @@ -41,8 +41,8 @@ public interface ReactiveGraphSession extends Session { * @see ReactiveGraphResultSet * @see ReactiveGraphNode */ - @NonNull - default ReactiveGraphResultSet executeReactive(@NonNull GraphStatement statement) { + @Nonnull + default ReactiveGraphResultSet executeReactive(@Nonnull GraphStatement statement) { return Objects.requireNonNull( execute(statement, ReactiveGraphRequestProcessor.REACTIVE_GRAPH_RESULT_SET)); } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseAggregateMetadata.java b/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseAggregateMetadata.java index 609c64f7c15..e54a7d75f00 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseAggregateMetadata.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseAggregateMetadata.java @@ -20,8 +20,8 @@ import com.datastax.oss.driver.api.core.metadata.schema.AggregateMetadata; import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.internal.core.metadata.schema.ScriptBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Optional; +import javax.annotation.Nonnull; /** * Specialized aggregate metadata for DSE. @@ -49,7 +49,7 @@ default Optional getDeterministic() { return Optional.of(isDeterministic()); } - @NonNull + @Nonnull @Override default String describe(boolean pretty) { // Easiest to just copy the OSS describe() method and add in DETERMINISTIC diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseEdgeMetadata.java b/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseEdgeMetadata.java index 59ee8a277ff..a380859b441 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseEdgeMetadata.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseEdgeMetadata.java @@ -18,45 +18,45 @@ package com.datastax.dse.driver.api.core.metadata.schema; import com.datastax.oss.driver.api.core.CqlIdentifier; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; +import javax.annotation.Nonnull; /** Edge metadata, for a table that was created with CREATE TABLE ... WITH EDGE LABEL. */ public interface DseEdgeMetadata { /** The label of the edge in graph. */ - @NonNull + @Nonnull CqlIdentifier getLabelName(); /** The identifier of the table representing the incoming vertex. */ - @NonNull + @Nonnull CqlIdentifier getFromTable(); /** The label of the incoming vertex in graph. */ - @NonNull + @Nonnull CqlIdentifier getFromLabel(); /** The columns in this table that match the partition key of the incoming vertex table. */ - @NonNull + @Nonnull List getFromPartitionKeyColumns(); /** The columns in this table that match the clustering columns of the incoming vertex table. */ - @NonNull + @Nonnull List getFromClusteringColumns(); /** The identifier of the table representing the outgoing vertex. */ - @NonNull + @Nonnull CqlIdentifier getToTable(); /** The label of the outgoing vertex in graph. */ - @NonNull + @Nonnull CqlIdentifier getToLabel(); /** The columns in this table that match the partition key of the outgoing vertex table. */ - @NonNull + @Nonnull List getToPartitionKeyColumns(); /** The columns in this table that match the clustering columns of the outgoing vertex table. */ - @NonNull + @Nonnull List getToClusteringColumns(); } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseFunctionMetadata.java b/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseFunctionMetadata.java index 91298795959..01f71726fb3 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseFunctionMetadata.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseFunctionMetadata.java @@ -21,9 +21,9 @@ import com.datastax.oss.driver.api.core.metadata.schema.FunctionMetadata; import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.internal.core.metadata.schema.ScriptBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; import java.util.Optional; +import javax.annotation.Nonnull; /** * Specialized function metadata for DSE. @@ -123,10 +123,10 @@ default Optional getMonotonicity() { * * @return the argument names that the function is monotonic on. */ - @NonNull + @Nonnull List getMonotonicArgumentNames(); - @NonNull + @Nonnull @Override default String describe(boolean pretty) { ScriptBuilder builder = new ScriptBuilder(pretty); diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseGraphKeyspaceMetadata.java b/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseGraphKeyspaceMetadata.java index 8978a8858f9..2211fe3d589 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseGraphKeyspaceMetadata.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseGraphKeyspaceMetadata.java @@ -19,9 +19,9 @@ import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata; import com.datastax.oss.driver.internal.core.metadata.schema.ScriptBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; import java.util.Optional; +import javax.annotation.Nonnull; /** * Specialized keyspace metadata, that handles the graph-specific properties introduced in DSE 6.8. @@ -33,10 +33,10 @@ public interface DseGraphKeyspaceMetadata extends DseKeyspaceMetadata { /** The graph engine that will be used to interpret this keyspace. */ - @NonNull + @Nonnull Optional getGraphEngine(); - @NonNull + @Nonnull @Override default String describe(boolean pretty) { ScriptBuilder builder = new ScriptBuilder(pretty); diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseGraphTableMetadata.java b/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseGraphTableMetadata.java index 8f340b3b447..e935be90d79 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseGraphTableMetadata.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseGraphTableMetadata.java @@ -24,9 +24,9 @@ import com.datastax.oss.driver.api.core.metadata.schema.TableMetadata; import com.datastax.oss.driver.internal.core.metadata.schema.ScriptBuilder; import com.datastax.oss.driver.internal.core.metadata.schema.parsing.RelationParser; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; import java.util.Optional; +import javax.annotation.Nonnull; /** * Specialized table metadata, that handles the graph-specific properties introduced in DSE 6.8. @@ -41,7 +41,7 @@ public interface DseGraphTableMetadata extends DseTableMetadata { * *

This is mutually exclusive with {@link #getEdge()}. */ - @NonNull + @Nonnull Optional getVertex(); /** @@ -49,10 +49,10 @@ public interface DseGraphTableMetadata extends DseTableMetadata { * *

This is mutually exclusive with {@link #getVertex()}. */ - @NonNull + @Nonnull Optional getEdge(); - @NonNull + @Nonnull @Override default String describe(boolean pretty) { ScriptBuilder builder = new ScriptBuilder(pretty); diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseVertexMetadata.java b/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseVertexMetadata.java index c08a7eb1d60..a081b6fe468 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseVertexMetadata.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/metadata/schema/DseVertexMetadata.java @@ -18,12 +18,12 @@ package com.datastax.dse.driver.api.core.metadata.schema; import com.datastax.oss.driver.api.core.CqlIdentifier; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** Vertex metadata, for a table that was created with CREATE TABLE ... WITH VERTEX LABEL. */ public interface DseVertexMetadata { /** The label of the vertex in graph. */ - @NonNull + @Nonnull CqlIdentifier getLabelName(); } diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/metrics/DseNodeMetric.java b/core/src/main/java/com/datastax/dse/driver/api/core/metrics/DseNodeMetric.java index cf4b4d0aa18..e23f5b1d5e6 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/metrics/DseNodeMetric.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/metrics/DseNodeMetric.java @@ -19,8 +19,8 @@ import com.datastax.oss.driver.api.core.metrics.NodeMetric; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.Nonnull; /** See {@code reference.conf} for a description of each metric. */ public enum DseNodeMetric implements NodeMetric { @@ -35,13 +35,13 @@ public enum DseNodeMetric implements NodeMetric { } @Override - @NonNull + @Nonnull public String getPath() { return path; } - @NonNull - public static DseNodeMetric fromPath(@NonNull String path) { + @Nonnull + public static DseNodeMetric fromPath(@Nonnull String path) { DseNodeMetric metric = BY_PATH.get(path); if (metric == null) { throw new IllegalArgumentException("Unknown node metric path " + path); diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/metrics/DseSessionMetric.java b/core/src/main/java/com/datastax/dse/driver/api/core/metrics/DseSessionMetric.java index 79584f3c44a..6419df8d249 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/metrics/DseSessionMetric.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/metrics/DseSessionMetric.java @@ -19,8 +19,8 @@ import com.datastax.oss.driver.api.core.metrics.SessionMetric; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.Nonnull; /** See {@code reference.conf} for a description of each metric. */ public enum DseSessionMetric implements SessionMetric { @@ -37,14 +37,14 @@ public enum DseSessionMetric implements SessionMetric { this.path = path; } - @NonNull + @Nonnull @Override public String getPath() { return path; } - @NonNull - public static DseSessionMetric fromPath(@NonNull String path) { + @Nonnull + public static DseSessionMetric fromPath(@Nonnull String path) { DseSessionMetric metric = BY_PATH.get(path); if (metric == null) { throw new IllegalArgumentException("Unknown DSE session metric path " + path); diff --git a/core/src/main/java/com/datastax/dse/driver/api/core/servererrors/UnfitClientException.java b/core/src/main/java/com/datastax/dse/driver/api/core/servererrors/UnfitClientException.java index 8bf4d80699d..e98e56ac5cd 100644 --- a/core/src/main/java/com/datastax/dse/driver/api/core/servererrors/UnfitClientException.java +++ b/core/src/main/java/com/datastax/dse/driver/api/core/servererrors/UnfitClientException.java @@ -20,8 +20,8 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.servererrors.CoordinatorException; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A server-side error triggered when DSE can't send asynchronous results back to the client. @@ -35,20 +35,20 @@ */ public class UnfitClientException extends CoordinatorException { - public UnfitClientException(@NonNull Node coordinator, @NonNull String message) { + public UnfitClientException(@Nonnull Node coordinator, @Nonnull String message) { this(coordinator, message, null, false); } private UnfitClientException( - @NonNull Node coordinator, - @NonNull String message, + @Nonnull Node coordinator, + @Nonnull String message, @Nullable ExecutionInfo executionInfo, boolean writableStackTrace) { super(coordinator, message, executionInfo, writableStackTrace); } @Override - @NonNull + @Nonnull public UnfitClientException copy() { return new UnfitClientException(getCoordinator(), getMessage(), getExecutionInfo(), true); } diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/auth/DseGssApiAuthProvider.java b/core/src/main/java/com/datastax/dse/driver/internal/core/auth/DseGssApiAuthProvider.java index 6ef6596a870..59570af5b44 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/auth/DseGssApiAuthProvider.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/auth/DseGssApiAuthProvider.java @@ -23,8 +23,8 @@ import com.datastax.oss.driver.api.core.config.DriverExecutionProfile; import com.datastax.oss.driver.api.core.context.DriverContext; import com.datastax.oss.driver.api.core.metadata.EndPoint; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; /** @@ -164,10 +164,10 @@ public DseGssApiAuthProvider(DriverContext context) { this.config = context.getConfig().getDefaultProfile(); } - @NonNull + @Nonnull @Override protected GssApiOptions getOptions( - @NonNull EndPoint endPoint, @NonNull String serverAuthenticator) { + @Nonnull EndPoint endPoint, @Nonnull String serverAuthenticator) { // A login configuration is always necessary, throw an exception if that option is missing. AuthUtils.validateConfigPresent( config, diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/continuous/ContinuousCqlRequestHandler.java b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/continuous/ContinuousCqlRequestHandler.java index dd308c11854..fa6384fe127 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/continuous/ContinuousCqlRequestHandler.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/continuous/ContinuousCqlRequestHandler.java @@ -36,12 +36,12 @@ import com.datastax.oss.driver.internal.core.util.CountingIterator; import com.datastax.oss.protocol.internal.Message; import com.datastax.oss.protocol.internal.response.result.Rows; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.time.Duration; import java.util.List; import java.util.Map; import java.util.Queue; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; /** @@ -52,10 +52,10 @@ public class ContinuousCqlRequestHandler extends ContinuousRequestHandlerBase, ContinuousAsyncResultSet> { ContinuousCqlRequestHandler( - @NonNull Statement statement, - @NonNull DefaultSession session, - @NonNull InternalDriverContext context, - @NonNull String sessionLogPrefix) { + @Nonnull Statement statement, + @Nonnull DefaultSession session, + @Nonnull InternalDriverContext context, + @Nonnull String sessionLogPrefix) { super( statement, session, @@ -71,15 +71,15 @@ public class ContinuousCqlRequestHandler throttler.register(this); } - @NonNull + @Nonnull @Override protected Duration getGlobalTimeout() { return Duration.ZERO; } - @NonNull + @Nonnull @Override - protected Duration getPageTimeout(@NonNull Statement statement, int pageNumber) { + protected Duration getPageTimeout(@Nonnull Statement statement, int pageNumber) { DriverExecutionProfile executionProfile = Conversions.resolveExecutionProfile(statement, context); if (pageNumber == 1) { @@ -89,60 +89,60 @@ protected Duration getPageTimeout(@NonNull Statement statement, int pageNumbe } } - @NonNull + @Nonnull @Override - protected Duration getReviseRequestTimeout(@NonNull Statement statement) { + protected Duration getReviseRequestTimeout(@Nonnull Statement statement) { DriverExecutionProfile executionProfile = Conversions.resolveExecutionProfile(statement, context); return executionProfile.getDuration(DseDriverOption.CONTINUOUS_PAGING_TIMEOUT_OTHER_PAGES); } @Override - protected int getMaxEnqueuedPages(@NonNull Statement statement) { + protected int getMaxEnqueuedPages(@Nonnull Statement statement) { DriverExecutionProfile executionProfile = Conversions.resolveExecutionProfile(statement, context); return executionProfile.getInt(DseDriverOption.CONTINUOUS_PAGING_MAX_ENQUEUED_PAGES); } @Override - protected int getMaxPages(@NonNull Statement statement) { + protected int getMaxPages(@Nonnull Statement statement) { DriverExecutionProfile executionProfile = Conversions.resolveExecutionProfile(statement, context); return executionProfile.getInt(DseDriverOption.CONTINUOUS_PAGING_MAX_PAGES); } - @NonNull + @Nonnull @Override - protected Message getMessage(@NonNull Statement statement) { + protected Message getMessage(@Nonnull Statement statement) { DriverExecutionProfile executionProfile = Conversions.resolveExecutionProfile(statement, context); return DseConversions.toContinuousPagingMessage(statement, executionProfile, context); } @Override - protected boolean isTracingEnabled(@NonNull Statement statement) { + protected boolean isTracingEnabled(@Nonnull Statement statement) { return false; } - @NonNull + @Nonnull @Override - protected Map createPayload(@NonNull Statement statement) { + protected Map createPayload(@Nonnull Statement statement) { return statement.getCustomPayload(); } - @NonNull + @Nonnull @Override - protected ContinuousAsyncResultSet createEmptyResultSet(@NonNull ExecutionInfo executionInfo) { + protected ContinuousAsyncResultSet createEmptyResultSet(@Nonnull ExecutionInfo executionInfo) { return DefaultContinuousAsyncResultSet.empty(executionInfo); } - @NonNull + @Nonnull @Override protected DefaultContinuousAsyncResultSet createResultSet( - @NonNull Statement statement, - @NonNull Rows rows, - @NonNull ExecutionInfo executionInfo, - @NonNull ColumnDefinitions columnDefinitions) { + @Nonnull Statement statement, + @Nonnull Rows rows, + @Nonnull ExecutionInfo executionInfo, + @Nonnull ColumnDefinitions columnDefinitions) { Queue> data = rows.getData(); CountingIterator iterator = new CountingIterator(data.size()) { @@ -165,7 +165,7 @@ protected Row computeNext() { } @Override - protected int pageNumber(@NonNull ContinuousAsyncResultSet resultSet) { + protected int pageNumber(@Nonnull ContinuousAsyncResultSet resultSet) { return resultSet.pageNumber(); } } diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/continuous/ContinuousRequestHandlerBase.java b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/continuous/ContinuousRequestHandlerBase.java index 44df3b3a03d..76976dfc0f1 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/continuous/ContinuousRequestHandlerBase.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/continuous/ContinuousRequestHandlerBase.java @@ -77,8 +77,6 @@ import com.datastax.oss.protocol.internal.response.result.Rows; import com.datastax.oss.protocol.internal.response.result.Void; import com.datastax.oss.protocol.internal.util.Bytes; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import io.netty.handler.codec.EncoderException; import io.netty.util.Timeout; import io.netty.util.Timer; @@ -101,6 +99,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantLock; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.GuardedBy; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; @@ -166,11 +166,11 @@ public abstract class ContinuousRequestHandlerBase resultSetClass; public ContinuousRequestHandlerBase( - @NonNull StatementT statement, - @NonNull DefaultSession session, - @NonNull InternalDriverContext context, - @NonNull String sessionLogPrefix, - @NonNull Class resultSetClass, + @Nonnull StatementT statement, + @Nonnull DefaultSession session, + @Nonnull InternalDriverContext context, + @Nonnull String sessionLogPrefix, + @Nonnull Class resultSetClass, boolean specExecEnabled, SessionMetric clientTimeoutsMetric, SessionMetric continuousRequestsMetric, @@ -212,38 +212,38 @@ public ContinuousRequestHandlerBase( this.scheduledExecutions = this.specExecEnabled ? new CopyOnWriteArrayList<>() : null; } - @NonNull + @Nonnull protected abstract Duration getGlobalTimeout(); - @NonNull - protected abstract Duration getPageTimeout(@NonNull StatementT statement, int pageNumber); + @Nonnull + protected abstract Duration getPageTimeout(@Nonnull StatementT statement, int pageNumber); - @NonNull - protected abstract Duration getReviseRequestTimeout(@NonNull StatementT statement); + @Nonnull + protected abstract Duration getReviseRequestTimeout(@Nonnull StatementT statement); - protected abstract int getMaxEnqueuedPages(@NonNull StatementT statement); + protected abstract int getMaxEnqueuedPages(@Nonnull StatementT statement); - protected abstract int getMaxPages(@NonNull StatementT statement); + protected abstract int getMaxPages(@Nonnull StatementT statement); - @NonNull - protected abstract Message getMessage(@NonNull StatementT statement); + @Nonnull + protected abstract Message getMessage(@Nonnull StatementT statement); - protected abstract boolean isTracingEnabled(@NonNull StatementT statement); + protected abstract boolean isTracingEnabled(@Nonnull StatementT statement); - @NonNull - protected abstract Map createPayload(@NonNull StatementT statement); + @Nonnull + protected abstract Map createPayload(@Nonnull StatementT statement); - @NonNull - protected abstract ResultSetT createEmptyResultSet(@NonNull ExecutionInfo executionInfo); + @Nonnull + protected abstract ResultSetT createEmptyResultSet(@Nonnull ExecutionInfo executionInfo); - protected abstract int pageNumber(@NonNull ResultSetT resultSet); + protected abstract int pageNumber(@Nonnull ResultSetT resultSet); - @NonNull + @Nonnull protected abstract ResultSetT createResultSet( - @NonNull StatementT statement, - @NonNull Rows rows, - @NonNull ExecutionInfo executionInfo, - @NonNull ColumnDefinitions columnDefinitions) + @Nonnull StatementT statement, + @Nonnull Rows rows, + @Nonnull ExecutionInfo executionInfo, + @Nonnull ColumnDefinitions columnDefinitions) throws IOException; // MAIN LIFECYCLE @@ -269,7 +269,7 @@ public void onThrottleReady(boolean wasDelayed) { } @Override - public void onThrottleFailure(@NonNull RequestThrottlingException error) { + public void onThrottleFailure(@Nonnull RequestThrottlingException error) { DriverExecutionProfile executionProfile = Conversions.resolveExecutionProfile(initialStatement, context); session @@ -278,7 +278,7 @@ public void onThrottleFailure(@NonNull RequestThrottlingException error) { abortGlobalRequestOrChosenCallback(error); } - private void abortGlobalRequestOrChosenCallback(@NonNull Throwable error) { + private void abortGlobalRequestOrChosenCallback(@Nonnull Throwable error) { if (!chosenCallback.completeExceptionally(error)) { chosenCallback.thenAccept(callback -> callback.abort(error, false)); } @@ -460,7 +460,7 @@ CompletableFuture getPendingResult() { } } - private void recordError(@NonNull Node node, @NonNull Throwable error) { + private void recordError(@Nonnull Node node, @Nonnull Throwable error) { errors.add(new AbstractMap.SimpleEntry<>(node, error)); } @@ -577,7 +577,7 @@ public void onStreamIdAssigned(int streamId) { } @Override - public boolean isLastResponse(@NonNull Frame responseFrame) { + public boolean isLastResponse(@Nonnull Frame responseFrame) { lock.lock(); try { Message message = responseFrame.message; @@ -621,7 +621,7 @@ public boolean isLastResponse(@NonNull Frame responseFrame) { * @param future The future representing the outcome of the write operation. */ @Override - public void operationComplete(@NonNull Future future) { + public void operationComplete(@Nonnull Future future) { if (!future.isSuccess()) { Throwable error = future.cause(); if (error instanceof EncoderException @@ -742,7 +742,7 @@ private void onPageTimeout(int expectedPage) { * @param response the received {@link Frame}. */ @Override - public void onResponse(@NonNull Frame response) { + public void onResponse(@Nonnull Frame response) { stopNodeMessageTimer(); cancelTimeout(pageTimeout); lock.lock(); @@ -783,7 +783,7 @@ public void onResponse(@NonNull Frame response) { * @param error the error encountered, usually a network problem. */ @Override - public void onFailure(@NonNull Throwable error) { + public void onFailure(@Nonnull Throwable error) { cancelTimeout(pageTimeout); LOG.trace(String.format("[%s] Request failure", logPrefix), error); RetryVerdict verdict; @@ -826,7 +826,7 @@ public void onFailure(@NonNull Throwable error) { * @param frame the {@link Frame} (used to create the {@link ExecutionInfo} the first time). */ @SuppressWarnings("GuardedBy") // this method is only called with the lock held - private void processResultResponse(@NonNull Result result, @Nullable Frame frame) { + private void processResultResponse(@Nonnull Result result, @Nullable Frame frame) { assert lock.isHeldByCurrentThread(); try { ExecutionInfo executionInfo = createExecutionInfo(result, frame); @@ -900,7 +900,7 @@ private void processResultResponse(@NonNull Result result, @Nullable Frame frame * @param errorMessage the error message received. */ @SuppressWarnings("GuardedBy") // this method is only called with the lock held - private void processErrorResponse(@NonNull Error errorMessage) { + private void processErrorResponse(@Nonnull Error errorMessage) { assert lock.isHeldByCurrentThread(); if (errorMessage instanceof Unprepared) { processUnprepared((Unprepared) errorMessage); @@ -941,7 +941,7 @@ private void processErrorResponse(@NonNull Error errorMessage) { * * @param error the recoverable error. */ - private void processRecoverableError(@NonNull CoordinatorException error) { + private void processRecoverableError(@Nonnull CoordinatorException error) { assert lock.isHeldByCurrentThread(); NodeMetricUpdater metricUpdater = ((DefaultNode) node).getMetricUpdater(); RetryVerdict verdict; @@ -1018,7 +1018,7 @@ private void processRecoverableError(@NonNull CoordinatorException error) { * @param errorMessage the unprepared error message. */ @SuppressWarnings("GuardedBy") // this method is only called with the lock held - private void processUnprepared(@NonNull Unprepared errorMessage) { + private void processUnprepared(@Nonnull Unprepared errorMessage) { assert lock.isHeldByCurrentThread(); ByteBuffer idToReprepare = ByteBuffer.wrap(errorMessage.id); LOG.trace( @@ -1112,7 +1112,7 @@ private void processUnprepared(@NonNull Unprepared errorMessage) { * @param verdict the verdict to process. * @param error the original error. */ - private void processRetryVerdict(@NonNull RetryVerdict verdict, @NonNull Throwable error) { + private void processRetryVerdict(@Nonnull RetryVerdict verdict, @Nonnull Throwable error) { assert lock.isHeldByCurrentThread(); LOG.trace("[{}] Processing retry decision {}", logPrefix, verdict); switch (verdict.getRetryDecision()) { @@ -1149,7 +1149,7 @@ private void processRetryVerdict(@NonNull RetryVerdict verdict, @NonNull Throwab * @param pageOrError the next page, or an error. */ @SuppressWarnings("GuardedBy") // this method is only called with the lock held - private void enqueueOrCompletePending(@NonNull Object pageOrError) { + private void enqueueOrCompletePending(@Nonnull Object pageOrError) { assert lock.isHeldByCurrentThread(); if (queue == null) { @@ -1213,7 +1213,7 @@ private void enqueueOrCompletePending(@NonNull Object pageOrError) { * * @return the next page's future; never null. */ - @NonNull + @Nonnull public CompletableFuture dequeueOrCreatePending() { lock.lock(); try { @@ -1442,7 +1442,7 @@ private void reenableAutoReadIfNeeded() { // ERROR HANDLING - private void trackNodeError(@NonNull Node node, @NonNull Throwable error) { + private void trackNodeError(@Nonnull Node node, @Nonnull Throwable error) { if (nodeErrorReported.compareAndSet(false, true)) { long latencyNanos = System.nanoTime() - this.messageStartTimeNanos; context @@ -1459,7 +1459,7 @@ private void trackNodeError(@NonNull Node node, @NonNull Throwable error) { * @param fromServer whether the error was triggered by the coordinator or by the driver. */ @SuppressWarnings("GuardedBy") // this method is only called with the lock held - private void abort(@NonNull Throwable error, boolean fromServer) { + private void abort(@Nonnull Throwable error, boolean fromServer) { assert lock.isHeldByCurrentThread(); LOG.trace( "[{}] Aborting due to {} ({})", @@ -1515,11 +1515,11 @@ private void stopGlobalRequestTimer() { } private void updateErrorMetrics( - @NonNull NodeMetricUpdater metricUpdater, - @NonNull RetryVerdict verdict, - @NonNull DefaultNodeMetric error, - @NonNull DefaultNodeMetric retriesOnError, - @NonNull DefaultNodeMetric ignoresOnError) { + @Nonnull NodeMetricUpdater metricUpdater, + @Nonnull RetryVerdict verdict, + @Nonnull DefaultNodeMetric error, + @Nonnull DefaultNodeMetric retriesOnError, + @Nonnull DefaultNodeMetric ignoresOnError) { metricUpdater.incrementCounter(error, executionProfile.getName()); switch (verdict.getRetryDecision()) { case RETRY_SAME: @@ -1538,14 +1538,14 @@ private void updateErrorMetrics( // UTILITY METHODS - @NonNull - private CompletableFuture immediateResultSetFuture(@NonNull Object pageOrError) { + @Nonnull + private CompletableFuture immediateResultSetFuture(@Nonnull Object pageOrError) { CompletableFuture future = new CompletableFuture<>(); completeResultSetFuture(future, pageOrError); return future; } - @NonNull + @Nonnull private CompletableFuture cancelledResultSetFuture() { return immediateResultSetFuture( new CancellationException( @@ -1554,7 +1554,7 @@ private CompletableFuture cancelledResultSetFuture() { } private void completeResultSetFuture( - @NonNull CompletableFuture future, @NonNull Object pageOrError) { + @Nonnull CompletableFuture future, @Nonnull Object pageOrError) { long now = System.nanoTime(); long totalLatencyNanos = now - startTimeNanos; long nodeLatencyNanos = now - messageStartTimeNanos; @@ -1588,8 +1588,8 @@ private void completeResultSetFuture( } } - @NonNull - private ExecutionInfo createExecutionInfo(@NonNull Result result, @Nullable Frame response) { + @Nonnull + private ExecutionInfo createExecutionInfo(@Nonnull Result result, @Nullable Frame response) { ByteBuffer pagingState = result instanceof Rows ? ((Rows) result).getMetadata().pagingState : null; return new DefaultExecutionInfo( @@ -1615,8 +1615,8 @@ private void logTimeoutSchedulingError(IllegalStateException timeoutError) { } } - @NonNull - private String asTraceString(@NonNull Object pageOrError) { + @Nonnull + private String asTraceString(@Nonnull Object pageOrError) { return resultSetClass.isInstance(pageOrError) ? "page " + pageNumber(resultSetClass.cast(pageOrError)) : ((Exception) pageOrError).getClass().getSimpleName(); diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/continuous/DefaultContinuousAsyncResultSet.java b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/continuous/DefaultContinuousAsyncResultSet.java index 8562fde5905..58ab1b90ee5 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/continuous/DefaultContinuousAsyncResultSet.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/continuous/DefaultContinuousAsyncResultSet.java @@ -23,9 +23,9 @@ import com.datastax.oss.driver.api.core.cql.Row; import com.datastax.oss.driver.internal.core.cql.EmptyColumnDefinitions; import com.datastax.oss.driver.internal.core.util.CountingIterator; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collections; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; import net.jcip.annotations.NotThreadSafe; @NotThreadSafe // wraps a mutable queue @@ -55,7 +55,7 @@ public DefaultContinuousAsyncResultSet( this.currentPage = () -> iterator; } - @NonNull + @Nonnull @Override public ColumnDefinitions getColumnDefinitions() { return columnDefinitions; @@ -67,7 +67,7 @@ public boolean wasApplied() { return true; } - @NonNull + @Nonnull @Override public ExecutionInfo getExecutionInfo() { return executionInfo; @@ -83,7 +83,7 @@ public boolean hasMorePages() { return hasMorePages; } - @NonNull + @Nonnull @Override public Iterable currentPage() { return currentPage; @@ -94,7 +94,7 @@ public int remaining() { return iterator.remaining(); } - @NonNull + @Nonnull @Override public CompletionStage fetchNextPage() throws IllegalStateException { if (!hasMorePages()) { @@ -113,19 +113,19 @@ public static ContinuousAsyncResultSet empty(ExecutionInfo executionInfo) { return new ContinuousAsyncResultSet() { - @NonNull + @Nonnull @Override public ColumnDefinitions getColumnDefinitions() { return EmptyColumnDefinitions.INSTANCE; } - @NonNull + @Nonnull @Override public ExecutionInfo getExecutionInfo() { return executionInfo; } - @NonNull + @Nonnull @Override public Iterable currentPage() { return Collections.emptyList(); @@ -146,7 +146,7 @@ public int pageNumber() { return 1; } - @NonNull + @Nonnull @Override public CompletionStage fetchNextPage() throws IllegalStateException { diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/continuous/DefaultContinuousResultSet.java b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/continuous/DefaultContinuousResultSet.java index 929400bc7a6..ba5970dc692 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/continuous/DefaultContinuousResultSet.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/continuous/DefaultContinuousResultSet.java @@ -25,10 +25,10 @@ import com.datastax.oss.driver.internal.core.util.CountingIterator; import com.datastax.oss.driver.internal.core.util.concurrent.BlockingOperation; import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import javax.annotation.Nonnull; import net.jcip.annotations.NotThreadSafe; /** @@ -54,19 +54,19 @@ public void cancel() { iterator.cancel(); } - @NonNull + @Nonnull @Override public ColumnDefinitions getColumnDefinitions() { return columnDefinitions; } - @NonNull + @Nonnull @Override public List getExecutionInfos() { return executionInfos; } - @NonNull + @Nonnull @Override public Iterator iterator() { return iterator; diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/DefaultReactiveRow.java b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/DefaultReactiveRow.java index ca3b93e7f6b..b75ea31c117 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/DefaultReactiveRow.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/DefaultReactiveRow.java @@ -32,7 +32,6 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; import java.math.BigDecimal; import java.math.BigInteger; import java.net.InetAddress; @@ -44,6 +43,7 @@ import java.util.Map; import java.util.Set; import java.util.UUID; +import javax.annotation.Nonnull; import net.jcip.annotations.NotThreadSafe; @NotThreadSafe @@ -52,18 +52,18 @@ class DefaultReactiveRow implements ReactiveRow { private final Row row; private final ExecutionInfo executionInfo; - DefaultReactiveRow(@NonNull Row row, @NonNull ExecutionInfo executionInfo) { + DefaultReactiveRow(@Nonnull Row row, @Nonnull ExecutionInfo executionInfo) { this.row = row; this.executionInfo = executionInfo; } - @NonNull + @Nonnull @Override public ExecutionInfo getExecutionInfo() { return executionInfo; } - @NonNull + @Nonnull @Override public ColumnDefinitions getColumnDefinitions() { return row.getColumnDefinitions(); @@ -190,17 +190,17 @@ public Token getToken(int i) { } @Override - public List getList(int i, @NonNull Class elementsClass) { + public List getList(int i, @Nonnull Class elementsClass) { return row.getList(i, elementsClass); } @Override - public Set getSet(int i, @NonNull Class elementsClass) { + public Set getSet(int i, @Nonnull Class elementsClass) { return row.getSet(i, elementsClass); } @Override - public Map getMap(int i, @NonNull Class keyClass, @NonNull Class valueClass) { + public Map getMap(int i, @Nonnull Class keyClass, @Nonnull Class valueClass) { return row.getMap(i, keyClass, valueClass); } @@ -219,347 +219,347 @@ public int size() { return row.size(); } - @NonNull + @Nonnull @Override public DataType getType(int i) { return row.getType(i); } - @NonNull + @Nonnull @Override public CodecRegistry codecRegistry() { return row.codecRegistry(); } - @NonNull + @Nonnull @Override public ProtocolVersion protocolVersion() { return row.protocolVersion(); } @Override - public ByteBuffer getBytesUnsafe(@NonNull String name) { + public ByteBuffer getBytesUnsafe(@Nonnull String name) { return row.getBytesUnsafe(name); } @Override - public boolean isNull(@NonNull String name) { + public boolean isNull(@Nonnull String name) { return row.isNull(name); } @Override - public T get(@NonNull String name, @NonNull TypeCodec codec) { + public T get(@Nonnull String name, @Nonnull TypeCodec codec) { return row.get(name, codec); } @Override - public T get(@NonNull String name, @NonNull GenericType targetType) { + public T get(@Nonnull String name, @Nonnull GenericType targetType) { return row.get(name, targetType); } @Override - public T get(@NonNull String name, @NonNull Class targetClass) { + public T get(@Nonnull String name, @Nonnull Class targetClass) { return row.get(name, targetClass); } @Override - public Object getObject(@NonNull String name) { + public Object getObject(@Nonnull String name) { return row.getObject(name); } @Override - public boolean getBoolean(@NonNull String name) { + public boolean getBoolean(@Nonnull String name) { return row.getBoolean(name); } @Override - public byte getByte(@NonNull String name) { + public byte getByte(@Nonnull String name) { return row.getByte(name); } @Override - public double getDouble(@NonNull String name) { + public double getDouble(@Nonnull String name) { return row.getDouble(name); } @Override - public float getFloat(@NonNull String name) { + public float getFloat(@Nonnull String name) { return row.getFloat(name); } @Override - public int getInt(@NonNull String name) { + public int getInt(@Nonnull String name) { return row.getInt(name); } @Override - public long getLong(@NonNull String name) { + public long getLong(@Nonnull String name) { return row.getLong(name); } @Override - public short getShort(@NonNull String name) { + public short getShort(@Nonnull String name) { return row.getShort(name); } @Override - public Instant getInstant(@NonNull String name) { + public Instant getInstant(@Nonnull String name) { return row.getInstant(name); } @Override - public LocalDate getLocalDate(@NonNull String name) { + public LocalDate getLocalDate(@Nonnull String name) { return row.getLocalDate(name); } @Override - public LocalTime getLocalTime(@NonNull String name) { + public LocalTime getLocalTime(@Nonnull String name) { return row.getLocalTime(name); } @Override - public ByteBuffer getByteBuffer(@NonNull String name) { + public ByteBuffer getByteBuffer(@Nonnull String name) { return row.getByteBuffer(name); } @Override - public String getString(@NonNull String name) { + public String getString(@Nonnull String name) { return row.getString(name); } @Override - public BigInteger getBigInteger(@NonNull String name) { + public BigInteger getBigInteger(@Nonnull String name) { return row.getBigInteger(name); } @Override - public BigDecimal getBigDecimal(@NonNull String name) { + public BigDecimal getBigDecimal(@Nonnull String name) { return row.getBigDecimal(name); } @Override - public UUID getUuid(@NonNull String name) { + public UUID getUuid(@Nonnull String name) { return row.getUuid(name); } @Override - public InetAddress getInetAddress(@NonNull String name) { + public InetAddress getInetAddress(@Nonnull String name) { return row.getInetAddress(name); } @Override - public CqlDuration getCqlDuration(@NonNull String name) { + public CqlDuration getCqlDuration(@Nonnull String name) { return row.getCqlDuration(name); } @Override - public Token getToken(@NonNull String name) { + public Token getToken(@Nonnull String name) { return row.getToken(name); } @Override - public List getList(@NonNull String name, @NonNull Class elementsClass) { + public List getList(@Nonnull String name, @Nonnull Class elementsClass) { return row.getList(name, elementsClass); } @Override - public Set getSet(@NonNull String name, @NonNull Class elementsClass) { + public Set getSet(@Nonnull String name, @Nonnull Class elementsClass) { return row.getSet(name, elementsClass); } @Override public Map getMap( - @NonNull String name, @NonNull Class keyClass, @NonNull Class valueClass) { + @Nonnull String name, @Nonnull Class keyClass, @Nonnull Class valueClass) { return row.getMap(name, keyClass, valueClass); } @Override - public UdtValue getUdtValue(@NonNull String name) { + public UdtValue getUdtValue(@Nonnull String name) { return row.getUdtValue(name); } @Override - public TupleValue getTupleValue(@NonNull String name) { + public TupleValue getTupleValue(@Nonnull String name) { return row.getTupleValue(name); } - @NonNull + @Nonnull @Override - public List allIndicesOf(@NonNull String name) { + public List allIndicesOf(@Nonnull String name) { return row.allIndicesOf(name); } @Override - public int firstIndexOf(@NonNull String name) { + public int firstIndexOf(@Nonnull String name) { return row.firstIndexOf(name); } - @NonNull + @Nonnull @Override - public DataType getType(@NonNull String name) { + public DataType getType(@Nonnull String name) { return row.getType(name); } @Override - public ByteBuffer getBytesUnsafe(@NonNull CqlIdentifier id) { + public ByteBuffer getBytesUnsafe(@Nonnull CqlIdentifier id) { return row.getBytesUnsafe(id); } @Override - public boolean isNull(@NonNull CqlIdentifier id) { + public boolean isNull(@Nonnull CqlIdentifier id) { return row.isNull(id); } @Override - public T get(@NonNull CqlIdentifier id, @NonNull TypeCodec codec) { + public T get(@Nonnull CqlIdentifier id, @Nonnull TypeCodec codec) { return row.get(id, codec); } @Override - public T get(@NonNull CqlIdentifier id, @NonNull GenericType targetType) { + public T get(@Nonnull CqlIdentifier id, @Nonnull GenericType targetType) { return row.get(id, targetType); } @Override - public T get(@NonNull CqlIdentifier id, @NonNull Class targetClass) { + public T get(@Nonnull CqlIdentifier id, @Nonnull Class targetClass) { return row.get(id, targetClass); } @Override - public Object getObject(@NonNull CqlIdentifier id) { + public Object getObject(@Nonnull CqlIdentifier id) { return row.getObject(id); } @Override - public boolean getBoolean(@NonNull CqlIdentifier id) { + public boolean getBoolean(@Nonnull CqlIdentifier id) { return row.getBoolean(id); } @Override - public byte getByte(@NonNull CqlIdentifier id) { + public byte getByte(@Nonnull CqlIdentifier id) { return row.getByte(id); } @Override - public double getDouble(@NonNull CqlIdentifier id) { + public double getDouble(@Nonnull CqlIdentifier id) { return row.getDouble(id); } @Override - public float getFloat(@NonNull CqlIdentifier id) { + public float getFloat(@Nonnull CqlIdentifier id) { return row.getFloat(id); } @Override - public int getInt(@NonNull CqlIdentifier id) { + public int getInt(@Nonnull CqlIdentifier id) { return row.getInt(id); } @Override - public long getLong(@NonNull CqlIdentifier id) { + public long getLong(@Nonnull CqlIdentifier id) { return row.getLong(id); } @Override - public short getShort(@NonNull CqlIdentifier id) { + public short getShort(@Nonnull CqlIdentifier id) { return row.getShort(id); } @Override - public Instant getInstant(@NonNull CqlIdentifier id) { + public Instant getInstant(@Nonnull CqlIdentifier id) { return row.getInstant(id); } @Override - public LocalDate getLocalDate(@NonNull CqlIdentifier id) { + public LocalDate getLocalDate(@Nonnull CqlIdentifier id) { return row.getLocalDate(id); } @Override - public LocalTime getLocalTime(@NonNull CqlIdentifier id) { + public LocalTime getLocalTime(@Nonnull CqlIdentifier id) { return row.getLocalTime(id); } @Override - public ByteBuffer getByteBuffer(@NonNull CqlIdentifier id) { + public ByteBuffer getByteBuffer(@Nonnull CqlIdentifier id) { return row.getByteBuffer(id); } @Override - public String getString(@NonNull CqlIdentifier id) { + public String getString(@Nonnull CqlIdentifier id) { return row.getString(id); } @Override - public BigInteger getBigInteger(@NonNull CqlIdentifier id) { + public BigInteger getBigInteger(@Nonnull CqlIdentifier id) { return row.getBigInteger(id); } @Override - public BigDecimal getBigDecimal(@NonNull CqlIdentifier id) { + public BigDecimal getBigDecimal(@Nonnull CqlIdentifier id) { return row.getBigDecimal(id); } @Override - public UUID getUuid(@NonNull CqlIdentifier id) { + public UUID getUuid(@Nonnull CqlIdentifier id) { return row.getUuid(id); } @Override - public InetAddress getInetAddress(@NonNull CqlIdentifier id) { + public InetAddress getInetAddress(@Nonnull CqlIdentifier id) { return row.getInetAddress(id); } @Override - public CqlDuration getCqlDuration(@NonNull CqlIdentifier id) { + public CqlDuration getCqlDuration(@Nonnull CqlIdentifier id) { return row.getCqlDuration(id); } @Override - public Token getToken(@NonNull CqlIdentifier id) { + public Token getToken(@Nonnull CqlIdentifier id) { return row.getToken(id); } @Override - public List getList(@NonNull CqlIdentifier id, @NonNull Class elementsClass) { + public List getList(@Nonnull CqlIdentifier id, @Nonnull Class elementsClass) { return row.getList(id, elementsClass); } @Override - public Set getSet(@NonNull CqlIdentifier id, @NonNull Class elementsClass) { + public Set getSet(@Nonnull CqlIdentifier id, @Nonnull Class elementsClass) { return row.getSet(id, elementsClass); } @Override public Map getMap( - @NonNull CqlIdentifier id, @NonNull Class keyClass, @NonNull Class valueClass) { + @Nonnull CqlIdentifier id, @Nonnull Class keyClass, @Nonnull Class valueClass) { return row.getMap(id, keyClass, valueClass); } @Override - public UdtValue getUdtValue(@NonNull CqlIdentifier id) { + public UdtValue getUdtValue(@Nonnull CqlIdentifier id) { return row.getUdtValue(id); } @Override - public TupleValue getTupleValue(@NonNull CqlIdentifier id) { + public TupleValue getTupleValue(@Nonnull CqlIdentifier id) { return row.getTupleValue(id); } - @NonNull + @Nonnull @Override - public List allIndicesOf(@NonNull CqlIdentifier id) { + public List allIndicesOf(@Nonnull CqlIdentifier id) { return row.allIndicesOf(id); } @Override - public int firstIndexOf(@NonNull CqlIdentifier id) { + public int firstIndexOf(@Nonnull CqlIdentifier id) { return row.firstIndexOf(id); } - @NonNull + @Nonnull @Override - public DataType getType(@NonNull CqlIdentifier id) { + public DataType getType(@Nonnull CqlIdentifier id) { return row.getType(id); } @@ -569,7 +569,7 @@ public boolean isDetached() { } @Override - public void attach(@NonNull AttachmentPoint attachmentPoint) { + public void attach(@Nonnull AttachmentPoint attachmentPoint) { row.attach(attachmentPoint); } diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/FailedReactiveResultSet.java b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/FailedReactiveResultSet.java index 31c34d649aa..be10de0e914 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/FailedReactiveResultSet.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/FailedReactiveResultSet.java @@ -23,7 +23,7 @@ import com.datastax.dse.driver.internal.core.cql.continuous.reactive.ContinuousCqlRequestReactiveProcessor; import com.datastax.oss.driver.api.core.cql.ColumnDefinitions; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import org.reactivestreams.Publisher; /** @@ -40,19 +40,19 @@ public FailedReactiveResultSet(Throwable error) { super(error); } - @NonNull + @Nonnull @Override public Publisher getColumnDefinitions() { return new FailedPublisher<>(error); } - @NonNull + @Nonnull @Override public Publisher getExecutionInfos() { return new FailedPublisher<>(error); } - @NonNull + @Nonnull @Override public Publisher wasApplied() { return new FailedPublisher<>(error); diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/ReactiveOperators.java b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/ReactiveOperators.java index f058149f570..331c0bcce7c 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/ReactiveOperators.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/ReactiveOperators.java @@ -17,8 +17,8 @@ */ package com.datastax.dse.driver.internal.core.cql.reactive; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.concurrent.atomic.AtomicLong; +import javax.annotation.Nonnull; public final class ReactiveOperators { @@ -28,7 +28,7 @@ public final class ReactiveOperators { * @param current the current value. * @param toAdd the delta to add. */ - public static void addCap(@NonNull AtomicLong current, long toAdd) { + public static void addCap(@Nonnull AtomicLong current, long toAdd) { long r, u; do { r = current.get(); @@ -48,7 +48,7 @@ public static void addCap(@NonNull AtomicLong current, long toAdd) { * @param current the current value. * @param toSub the delta to subtract. */ - public static void subCap(@NonNull AtomicLong current, long toSub) { + public static void subCap(@Nonnull AtomicLong current, long toSub) { long r, u; do { r = current.get(); diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/ReactiveResultSetBase.java b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/ReactiveResultSetBase.java index 5ba00e22298..987539b59fe 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/ReactiveResultSetBase.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/ReactiveResultSetBase.java @@ -23,11 +23,11 @@ import com.datastax.oss.driver.api.core.cql.ColumnDefinitions; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.cql.Row; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; import java.util.concurrent.Callable; import java.util.concurrent.CompletionStage; import java.util.concurrent.atomic.AtomicBoolean; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; @@ -54,7 +54,7 @@ protected ReactiveResultSetBase(Callable> firstPage) } @Override - public void subscribe(@NonNull Subscriber subscriber) { + public void subscribe(@Nonnull Subscriber subscriber) { // As per rule 1.9, we need to throw an NPE if subscriber is null Objects.requireNonNull(subscriber, "Subscriber cannot be null"); // As per rule 1.11, this publisher is allowed to support only one subscriber. @@ -85,19 +85,19 @@ public void subscribe(@NonNull Subscriber subscriber) { // As per 2.13, this method must return normally (i.e. not throw) } - @NonNull + @Nonnull @Override public Publisher getColumnDefinitions() { return columnDefinitionsPublisher; } - @NonNull + @Nonnull @Override public Publisher getExecutionInfos() { return executionInfosPublisher; } - @NonNull + @Nonnull @Override public Publisher wasApplied() { return wasAppliedPublisher; diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/ReactiveResultSetSubscription.java b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/ReactiveResultSetSubscription.java index 500a291e9d2..ec43034d963 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/ReactiveResultSetSubscription.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/ReactiveResultSetSubscription.java @@ -25,8 +25,6 @@ import com.datastax.oss.driver.api.core.cql.Row; import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures; import com.datastax.oss.driver.shaded.guava.common.collect.Iterators; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Collections; import java.util.Iterator; import java.util.Objects; @@ -36,6 +34,8 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; @@ -106,10 +106,10 @@ public class ReactiveResultSetSubscription mainSubscriber, - @NonNull Subscriber columnDefinitionsSubscriber, - @NonNull Subscriber executionInfosSubscriber, - @NonNull Subscriber wasAppliedSubscriber) { + @Nonnull Subscriber mainSubscriber, + @Nonnull Subscriber columnDefinitionsSubscriber, + @Nonnull Subscriber executionInfosSubscriber, + @Nonnull Subscriber wasAppliedSubscriber) { this.mainSubscriber = mainSubscriber; this.columnDefinitionsSubscriber = columnDefinitionsSubscriber; this.executionInfosSubscriber = executionInfosSubscriber; @@ -124,7 +124,7 @@ public class ReactiveResultSetSubscription> firstPage) { + void start(@Nonnull Callable> firstPage) { firstSubscriberRequestArrived.thenAccept( (aVoid) -> fetchNextPageAndEnqueue(new Page<>(firstPage), true)); } @@ -312,7 +312,7 @@ private boolean isExhausted() { * concurrently due to the fact that one can only fetch the next page when the current one is * arrived and enqueued. */ - private void fetchNextPageAndEnqueue(@NonNull Page current, boolean firstPage) { + private void fetchNextPageAndEnqueue(@Nonnull Page current, boolean firstPage) { current .fetchNextPage() // as soon as the response arrives, @@ -361,7 +361,7 @@ private void fetchNextPageAndEnqueue(@NonNull Page current, boolean }); } - private void doOnNext(@NonNull ReactiveRow result) { + private void doOnNext(@Nonnull ReactiveRow result) { try { mainSubscriber.onNext(result); } catch (Throwable t) { @@ -389,7 +389,7 @@ private void doOnComplete() { // package-private because it can be invoked by the publisher if the subscription handshake // process fails. - void doOnError(@NonNull Throwable error) { + void doOnError(@Nonnull Throwable error) { try { // Then we signal the error downstream, as per rules 1.2 and 1.4. mainSubscriber.onError(error); @@ -425,8 +425,8 @@ private void clear() { * @param rs the result object to convert. * @return a new page. */ - @NonNull - private Page toPage(@NonNull ResultSetT rs) { + @Nonnull + private Page toPage(@Nonnull ResultSetT rs) { ExecutionInfo executionInfo = rs.getExecutionInfo(); Iterator results = Iterators.transform( @@ -436,8 +436,8 @@ private Page toPage(@NonNull ResultSetT rs) { } /** Converts the given error into a {@link Page}, containing the error as its only element. */ - @NonNull - private Page toErrorPage(@NonNull Throwable t) { + @Nonnull + private Page toErrorPage(@Nonnull Throwable t) { return new Page<>(Iterators.singletonIterator(t), null); } @@ -447,18 +447,18 @@ private Page toErrorPage(@NonNull Throwable t) { */ static class Page> { - @NonNull final Iterator iterator; + @Nonnull final Iterator iterator; // A pointer to the next page, or null if this is the last page. @Nullable final Callable> nextPage; /** called only from start() */ - Page(@NonNull Callable> nextPage) { + Page(@Nonnull Callable> nextPage) { this.iterator = Collections.emptyIterator(); this.nextPage = nextPage; } - Page(@NonNull Iterator iterator, @Nullable Callable> nextPage) { + Page(@Nonnull Iterator iterator, @Nullable Callable> nextPage) { this.iterator = iterator; this.nextPage = nextPage; } @@ -467,7 +467,7 @@ boolean hasMorePages() { return nextPage != null; } - @NonNull + @Nonnull CompletionStage fetchNextPage() { try { return Objects.requireNonNull(nextPage).call(); @@ -485,7 +485,7 @@ boolean hasMoreRows() { return iterator.hasNext(); } - @NonNull + @Nonnull Object nextRow() { return iterator.next(); } diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/SimpleUnicastProcessor.java b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/SimpleUnicastProcessor.java index 845cbe2349b..895c81a4b1c 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/SimpleUnicastProcessor.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/cql/reactive/SimpleUnicastProcessor.java @@ -17,13 +17,13 @@ */ package com.datastax.dse.driver.internal.core.cql.reactive; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; +import javax.annotation.Nonnull; import org.reactivestreams.Processor; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; @@ -210,7 +210,7 @@ private void drain() { } } - private void doOnNext(@NonNull ElementT result) { + private void doOnNext(@Nonnull ElementT result) { try { subscriber.onNext(result); } catch (Throwable t) { @@ -236,7 +236,7 @@ private void doOnComplete() { cancel(); } - private void doOnError(@NonNull Throwable error) { + private void doOnError(@Nonnull Throwable error) { try { // Then we signal the error downstream, as per rules 1.2 and 1.4. subscriber.onError(error); diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultGeometry.java b/core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultGeometry.java index 885d9bd48b7..ee8d210f310 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultGeometry.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultGeometry.java @@ -25,11 +25,11 @@ import com.esri.core.geometry.SpatialReference; import com.esri.core.geometry.ogc.OGCGeometry; import com.esri.core.geometry.ogc.OGCLineString; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.Serializable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -46,9 +46,9 @@ public abstract class DefaultGeometry implements Geometry, Serializable { */ public static final SpatialReference SPATIAL_REFERENCE_4326 = SpatialReference.create(4326); - @NonNull + @Nonnull public static T fromOgcWellKnownText( - @NonNull String source, @NonNull Class klass) { + @Nonnull String source, @Nonnull Class klass) { OGCGeometry geometry; try { geometry = OGCGeometry.fromText(source); @@ -59,9 +59,9 @@ public static T fromOgcWellKnownText( return klass.cast(geometry); } - @NonNull + @Nonnull public static T fromOgcWellKnownBinary( - @NonNull ByteBuffer source, @NonNull Class klass) { + @Nonnull ByteBuffer source, @Nonnull Class klass) { OGCGeometry geometry; try { geometry = OGCGeometry.fromBinary(source); @@ -72,9 +72,9 @@ public static T fromOgcWellKnownBinary( return klass.cast(geometry); } - @NonNull + @Nonnull public static T fromOgcGeoJson( - @NonNull String source, @NonNull Class klass) { + @Nonnull String source, @Nonnull Class klass) { OGCGeometry geometry; try { geometry = OGCGeometry.fromGeoJson(source); @@ -95,7 +95,7 @@ private static void validateType(OGCGeometry geometry, Class getPoints(@NonNull OGCLineString lineString) { + @Nonnull + public static ImmutableList getPoints(@Nonnull OGCLineString lineString) { ImmutableList.Builder builder = ImmutableList.builder(); for (int i = 0; i < lineString.numPoints(); i++) { builder.add(new DefaultPoint(lineString.pointN(i))); @@ -129,36 +129,36 @@ protected static com.esri.core.geometry.Point toEsri(Point p) { return new com.esri.core.geometry.Point(p.X(), p.Y()); } - @NonNull + @Nonnull public OGCGeometry getOgcGeometry() { return ogcGeometry; } - @NonNull + @Nonnull public com.esri.core.geometry.Geometry getEsriGeometry() { return ogcGeometry.getEsriGeometry(); } - @NonNull + @Nonnull @Override public String asWellKnownText() { return ogcGeometry.asText(); } - @NonNull + @Nonnull @Override public ByteBuffer asWellKnownBinary() { return WkbUtil.asLittleEndianBinary(ogcGeometry); } - @NonNull + @Nonnull @Override public String asGeoJson() { return ogcGeometry.asGeoJson(); } @Override - public boolean contains(@NonNull Geometry other) { + public boolean contains(@Nonnull Geometry other) { Preconditions.checkNotNull(other); if (other instanceof DefaultGeometry) { DefaultGeometry defautlOther = (DefaultGeometry) other; diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultLineString.java b/core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultLineString.java index 1cf64bb366d..fec4a05513f 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultLineString.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultLineString.java @@ -22,8 +22,8 @@ import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; import com.esri.core.geometry.Polyline; import com.esri.core.geometry.ogc.OGCLineString; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -41,17 +41,17 @@ private static OGCLineString fromPoints(Point p1, Point p2, Point... pn) { private final List points; - public DefaultLineString(@NonNull Point p1, @NonNull Point p2, @NonNull Point... pn) { + public DefaultLineString(@Nonnull Point p1, @Nonnull Point p2, @Nonnull Point... pn) { super(fromPoints(p1, p2, pn)); this.points = ImmutableList.builder().add(p1).add(p2).add(pn).build(); } - public DefaultLineString(@NonNull OGCLineString lineString) { + public DefaultLineString(@Nonnull OGCLineString lineString) { super(lineString); this.points = getPoints(lineString); } - @NonNull + @Nonnull @Override public List getPoints() { return points; diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultPoint.java b/core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultPoint.java index c9540b10d8a..f476197461c 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultPoint.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultPoint.java @@ -19,7 +19,7 @@ import com.datastax.dse.driver.api.core.data.geometry.Point; import com.esri.core.geometry.ogc.OGCPoint; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -33,11 +33,11 @@ public DefaultPoint(double x, double y) { new com.esri.core.geometry.Point(x, y), DefaultGeometry.SPATIAL_REFERENCE_4326)); } - public DefaultPoint(@NonNull OGCPoint point) { + public DefaultPoint(@Nonnull OGCPoint point) { super(point); } - @NonNull + @Nonnull @Override public OGCPoint getOgcGeometry() { return (OGCPoint) super.getOgcGeometry(); diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultPolygon.java b/core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultPolygon.java index 27d375d42b1..a33544226eb 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultPolygon.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultPolygon.java @@ -24,9 +24,9 @@ import com.esri.core.geometry.OperatorFactoryLocal; import com.esri.core.geometry.OperatorSimplifyOGC; import com.esri.core.geometry.ogc.OGCPolygon; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collections; import java.util.List; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -38,13 +38,13 @@ public class DefaultPolygon extends DefaultGeometry implements Polygon { private final List> interiorRings; public DefaultPolygon( - @NonNull Point p1, @NonNull Point p2, @NonNull Point p3, @NonNull Point... pn) { + @Nonnull Point p1, @Nonnull Point p2, @Nonnull Point p3, @Nonnull Point... pn) { super(fromPoints(p1, p2, p3, pn)); this.exteriorRing = ImmutableList.builder().add(p1).add(p2).add(p3).add(pn).build(); this.interiorRings = Collections.emptyList(); } - public DefaultPolygon(@NonNull OGCPolygon polygon) { + public DefaultPolygon(@Nonnull OGCPolygon polygon) { super(polygon); if (polygon.isEmpty()) { this.exteriorRing = ImmutableList.of(); @@ -59,13 +59,13 @@ public DefaultPolygon(@NonNull OGCPolygon polygon) { this.interiorRings = builder.build(); } - @NonNull + @Nonnull @Override public List getExteriorRing() { return exteriorRing; } - @NonNull + @Nonnull @Override public List> getInteriorRings() { return interiorRings; @@ -108,10 +108,10 @@ private Object writeReplace() { public static class Builder implements Polygon.Builder { private final com.esri.core.geometry.Polygon polygon = new com.esri.core.geometry.Polygon(); - @NonNull + @Nonnull @Override public Builder addRing( - @NonNull Point p1, @NonNull Point p2, @NonNull Point p3, @NonNull Point... pn) { + @Nonnull Point p1, @Nonnull Point p2, @Nonnull Point p3, @Nonnull Point... pn) { addPath(polygon, p1, p2, p3, pn); return this; } @@ -121,7 +121,7 @@ public Builder addRing( * * @return the polygon. */ - @NonNull + @Nonnull @Override public Polygon build() { return new DefaultPolygon( diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/Distance.java b/core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/Distance.java index 518f6aa1346..adc1b95410c 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/Distance.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/Distance.java @@ -28,11 +28,11 @@ import com.esri.core.geometry.MultiPath; import com.esri.core.geometry.ogc.OGCGeometry; import com.esri.core.geometry.ogc.OGCPoint; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; /** @@ -69,8 +69,8 @@ public class Distance extends DefaultGeometry { * representation. * @see Distance#asWellKnownText() */ - @NonNull - public static Distance fromWellKnownText(@NonNull String source) { + @Nonnull + public static Distance fromWellKnownText(@Nonnull String source) { Matcher matcher = WKT_PATTERN.matcher(source.trim()); if (matcher.matches() && matcher.groupCount() == 3) { try { @@ -96,7 +96,7 @@ public static Distance fromWellKnownText(@NonNull String source) { * @param center The center point. * @param radius The radius of the circle representing distance. */ - public Distance(@NonNull Point center, double radius) { + public Distance(@Nonnull Point center, double radius) { super(((DefaultPoint) center).getOgcGeometry()); Preconditions.checkNotNull(center); Preconditions.checkArgument(radius >= 0.0D, "Radius must be >= 0 (got %s)", radius); @@ -105,7 +105,7 @@ public Distance(@NonNull Point center, double radius) { } /** @return The center point of the circle representing this distance. */ - @NonNull + @Nonnull public Point getCenter() { return center; } @@ -124,7 +124,7 @@ public double getRadius() { * * @return a Well-known Text representation of this object. */ - @NonNull + @Nonnull @Override public String asWellKnownText() { return String.format("DISTANCE((%s %s) %s)", this.center.X(), this.center.Y(), this.radius); @@ -134,7 +134,7 @@ public String asWellKnownText() { * The distance type has no equivalent in the OGC standard: this method throws an {@link * UnsupportedOperationException}. */ - @NonNull + @Nonnull @Override public OGCGeometry getOgcGeometry() { throw new UnsupportedOperationException(); @@ -144,7 +144,7 @@ public OGCGeometry getOgcGeometry() { * The distance type has no equivalent in the OGC standard: this method throws an {@link * UnsupportedOperationException}. */ - @NonNull + @Nonnull @Override public ByteBuffer asWellKnownBinary() { throw new UnsupportedOperationException(); @@ -155,7 +155,7 @@ public ByteBuffer asWellKnownBinary() { * UnsupportedOperationException}. */ @Override - @NonNull + @Nonnull public String asGeoJson() { throw new UnsupportedOperationException(); } @@ -179,7 +179,7 @@ public int hashCode() { @SuppressWarnings("SimplifiableConditionalExpression") @Override - public boolean contains(@NonNull Geometry geometry) { + public boolean contains(@Nonnull Geometry geometry) { return geometry instanceof Distance ? this.containsDistance((Distance) geometry) : geometry instanceof Point diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/ContinuousAsyncGraphResultSet.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/ContinuousAsyncGraphResultSet.java index 9c7f773c3a2..b6895957543 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/ContinuousAsyncGraphResultSet.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/ContinuousAsyncGraphResultSet.java @@ -21,10 +21,10 @@ import com.datastax.dse.driver.api.core.graph.GraphNode; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.internal.core.util.CountingIterator; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collections; import java.util.Queue; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; import net.jcip.annotations.NotThreadSafe; @NotThreadSafe // wraps a mutable queue @@ -53,13 +53,13 @@ public ContinuousAsyncGraphResultSet( this.currentPage = () -> iterator; } - @NonNull + @Nonnull @Override public ExecutionInfo getRequestExecutionInfo() { return executionInfo; } - @NonNull + @Nonnull @Override @Deprecated public com.datastax.dse.driver.api.core.graph.GraphExecutionInfo getExecutionInfo() { @@ -71,7 +71,7 @@ public int remaining() { return iterator.remaining(); } - @NonNull + @Nonnull @Override public Iterable currentPage() { return currentPage; @@ -82,7 +82,7 @@ public boolean hasMorePages() { return hasMorePages; } - @NonNull + @Nonnull @Override public CompletionStage fetchNextPage() throws IllegalStateException { if (!hasMorePages()) { @@ -106,20 +106,20 @@ static AsyncGraphResultSet empty(ExecutionInfo executionInfo) { return new AsyncGraphResultSet() { - @NonNull + @Nonnull @Override public ExecutionInfo getRequestExecutionInfo() { return executionInfo; } - @NonNull + @Nonnull @Override @Deprecated public com.datastax.dse.driver.api.core.graph.GraphExecutionInfo getExecutionInfo() { return GraphExecutionInfoConverter.convert(executionInfo); } - @NonNull + @Nonnull @Override public Iterable currentPage() { return Collections.emptyList(); @@ -135,7 +135,7 @@ public boolean hasMorePages() { return false; } - @NonNull + @Nonnull @Override public CompletionStage fetchNextPage() throws IllegalStateException { throw new IllegalStateException( diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/ContinuousGraphRequestHandler.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/ContinuousGraphRequestHandler.java index 07d9e4c84a3..c9315064831 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/ContinuousGraphRequestHandler.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/ContinuousGraphRequestHandler.java @@ -35,7 +35,6 @@ import com.datastax.oss.driver.shaded.guava.common.base.MoreObjects; import com.datastax.oss.protocol.internal.Message; import com.datastax.oss.protocol.internal.response.result.Rows; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.nio.ByteBuffer; import java.time.Duration; @@ -43,6 +42,7 @@ import java.util.List; import java.util.Map; import java.util.Queue; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; /** @@ -58,12 +58,12 @@ public class ContinuousGraphRequestHandler private final Duration globalTimeout; ContinuousGraphRequestHandler( - @NonNull GraphStatement statement, - @NonNull DefaultSession session, - @NonNull InternalDriverContext context, - @NonNull String sessionLogPrefix, - @NonNull GraphBinaryModule graphBinaryModule, - @NonNull GraphSupportChecker graphSupportChecker) { + @Nonnull GraphStatement statement, + @Nonnull DefaultSession session, + @Nonnull InternalDriverContext context, + @Nonnull String sessionLogPrefix, + @Nonnull GraphBinaryModule graphBinaryModule, + @Nonnull GraphSupportChecker graphSupportChecker) { super( statement, session, @@ -87,41 +87,41 @@ public class ContinuousGraphRequestHandler throttler.register(this); } - @NonNull + @Nonnull @Override protected Duration getGlobalTimeout() { return globalTimeout; } - @NonNull + @Nonnull @Override - protected Duration getPageTimeout(@NonNull GraphStatement statement, int pageNumber) { + protected Duration getPageTimeout(@Nonnull GraphStatement statement, int pageNumber) { return Duration.ZERO; } - @NonNull + @Nonnull @Override - protected Duration getReviseRequestTimeout(@NonNull GraphStatement statement) { + protected Duration getReviseRequestTimeout(@Nonnull GraphStatement statement) { return Duration.ZERO; } @Override - protected int getMaxEnqueuedPages(@NonNull GraphStatement statement) { + protected int getMaxEnqueuedPages(@Nonnull GraphStatement statement) { DriverExecutionProfile executionProfile = Conversions.resolveExecutionProfile(statement, context); return executionProfile.getInt(DseDriverOption.GRAPH_CONTINUOUS_PAGING_MAX_ENQUEUED_PAGES); } @Override - protected int getMaxPages(@NonNull GraphStatement statement) { + protected int getMaxPages(@Nonnull GraphStatement statement) { DriverExecutionProfile executionProfile = Conversions.resolveExecutionProfile(statement, context); return executionProfile.getInt(DseDriverOption.GRAPH_CONTINUOUS_PAGING_MAX_PAGES); } - @NonNull + @Nonnull @Override - protected Message getMessage(@NonNull GraphStatement statement) { + protected Message getMessage(@Nonnull GraphStatement statement) { DriverExecutionProfile executionProfile = Conversions.resolveExecutionProfile(statement, context); GraphProtocol subProtocol = @@ -131,13 +131,13 @@ protected Message getMessage(@NonNull GraphStatement statement) { } @Override - protected boolean isTracingEnabled(@NonNull GraphStatement statement) { + protected boolean isTracingEnabled(@Nonnull GraphStatement statement) { return statement.isTracing(); } - @NonNull + @Nonnull @Override - protected Map createPayload(@NonNull GraphStatement statement) { + protected Map createPayload(@Nonnull GraphStatement statement) { DriverExecutionProfile executionProfile = Conversions.resolveExecutionProfile(statement, context); GraphProtocol subProtocol = @@ -146,19 +146,19 @@ protected Map createPayload(@NonNull GraphStatement state statement, subProtocol, executionProfile, context, graphBinaryModule); } - @NonNull + @Nonnull @Override - protected AsyncGraphResultSet createEmptyResultSet(@NonNull ExecutionInfo executionInfo) { + protected AsyncGraphResultSet createEmptyResultSet(@Nonnull ExecutionInfo executionInfo) { return ContinuousAsyncGraphResultSet.empty(executionInfo); } - @NonNull + @Nonnull @Override protected ContinuousAsyncGraphResultSet createResultSet( - @NonNull GraphStatement statement, - @NonNull Rows rows, - @NonNull ExecutionInfo executionInfo, - @NonNull ColumnDefinitions columnDefinitions) + @Nonnull GraphStatement statement, + @Nonnull Rows rows, + @Nonnull ExecutionInfo executionInfo, + @Nonnull ColumnDefinitions columnDefinitions) throws IOException { DriverExecutionProfile executionProfile = Conversions.resolveExecutionProfile(statement, context); @@ -185,7 +185,7 @@ protected ContinuousAsyncGraphResultSet createResultSet( } @Override - protected int pageNumber(@NonNull AsyncGraphResultSet resultSet) { + protected int pageNumber(@Nonnull AsyncGraphResultSet resultSet) { return ((ContinuousAsyncGraphResultSet) resultSet).pageNumber(); } } diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/DefaultAsyncGraphResultSet.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/DefaultAsyncGraphResultSet.java index abc7cc9514e..643c39e55ec 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/DefaultAsyncGraphResultSet.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/DefaultAsyncGraphResultSet.java @@ -21,9 +21,9 @@ import com.datastax.dse.driver.api.core.graph.GraphNode; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.internal.core.util.CountingIterator; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Queue; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; import net.jcip.annotations.NotThreadSafe; @NotThreadSafe // wraps a mutable queue @@ -40,13 +40,13 @@ public DefaultAsyncGraphResultSet( this.currentPage = () -> iterator; } - @NonNull + @Nonnull @Override public ExecutionInfo getRequestExecutionInfo() { return executionInfo; } - @NonNull + @Nonnull @Override @Deprecated public com.datastax.dse.driver.api.core.graph.GraphExecutionInfo getExecutionInfo() { @@ -58,7 +58,7 @@ public int remaining() { return iterator.remaining(); } - @NonNull + @Nonnull @Override public Iterable currentPage() { return currentPage; @@ -69,7 +69,7 @@ public boolean hasMorePages() { return false; } - @NonNull + @Nonnull @Override public CompletionStage fetchNextPage() throws IllegalStateException { throw new IllegalStateException( diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/DefaultBatchGraphStatement.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/DefaultBatchGraphStatement.java index e16287c415d..744a0f3dadd 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/DefaultBatchGraphStatement.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/DefaultBatchGraphStatement.java @@ -22,12 +22,12 @@ import com.datastax.oss.driver.api.core.config.DriverExecutionProfile; import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.time.Duration; import java.util.Iterator; import java.util.List; import java.util.Map; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; @@ -69,9 +69,9 @@ public DefaultBatchGraphStatement( this.traversals = ImmutableList.copyOf(traversals); } - @NonNull + @Nonnull @Override - public DefaultBatchGraphStatement addTraversal(@NonNull GraphTraversal newTraversal) { + public DefaultBatchGraphStatement addTraversal(@Nonnull GraphTraversal newTraversal) { return new DefaultBatchGraphStatement( ImmutableList.builder().addAll(traversals).add(newTraversal).build(), isIdempotent(), @@ -89,9 +89,9 @@ public DefaultBatchGraphStatement addTraversal(@NonNull GraphTraversal newTraver getWriteConsistencyLevel()); } - @NonNull + @Nonnull @Override - public DefaultBatchGraphStatement addTraversals(@NonNull Iterable newTraversals) { + public DefaultBatchGraphStatement addTraversals(@Nonnull Iterable newTraversals) { return new DefaultBatchGraphStatement( ImmutableList.builder().addAll(traversals).addAll(newTraversals).build(), isIdempotent(), @@ -146,7 +146,7 @@ protected BatchGraphStatement newInstance( writeConsistencyLevel); } - @NonNull + @Nonnull @Override public Iterator iterator() { return this.traversals.iterator(); diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/DefaultFluentGraphStatement.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/DefaultFluentGraphStatement.java index 0f6f1faabbf..e35d1f50624 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/DefaultFluentGraphStatement.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/DefaultFluentGraphStatement.java @@ -21,10 +21,10 @@ import com.datastax.oss.driver.api.core.ConsistencyLevel; import com.datastax.oss.driver.api.core.config.DriverExecutionProfile; import com.datastax.oss.driver.api.core.metadata.Node; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.time.Duration; import java.util.Map; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; @@ -98,7 +98,7 @@ protected FluentGraphStatement newInstance( writeConsistencyLevel); } - @NonNull + @Nonnull @Override public GraphTraversal getTraversal() { return traversal; diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/DefaultScriptGraphStatement.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/DefaultScriptGraphStatement.java index 71f79134237..2c8f11c1154 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/DefaultScriptGraphStatement.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/DefaultScriptGraphStatement.java @@ -22,11 +22,11 @@ import com.datastax.oss.driver.api.core.config.DriverExecutionProfile; import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.protocol.internal.util.collection.NullAllowingImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.time.Duration; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; @Immutable @@ -75,13 +75,13 @@ public DefaultScriptGraphStatement( //// Script GraphStatement level options - @NonNull + @Nonnull @Override public String getScript() { return script; } - @NonNull + @Nonnull @Override public ScriptGraphStatement setSystemQuery(@Nullable Boolean newValue) { return new DefaultScriptGraphStatement( @@ -109,15 +109,15 @@ public Boolean isSystemQuery() { return isSystemQuery; } - @NonNull + @Nonnull @Override public Map getQueryParams() { return this.queryParams; } - @NonNull + @Nonnull @Override - public ScriptGraphStatement setQueryParam(@NonNull String name, @Nullable Object value) { + public ScriptGraphStatement setQueryParam(@Nonnull String name, @Nullable Object value) { NullAllowingImmutableMap.Builder newQueryParamsBuilder = NullAllowingImmutableMap.builder(); for (Map.Entry entry : queryParams.entrySet()) { @@ -129,9 +129,9 @@ public ScriptGraphStatement setQueryParam(@NonNull String name, @Nullable Object return setQueryParams(newQueryParamsBuilder.build()); } - @NonNull + @Nonnull @Override - public ScriptGraphStatement removeQueryParam(@NonNull String name) { + public ScriptGraphStatement removeQueryParam(@Nonnull String name) { if (!queryParams.containsKey(name)) { return this; } else { diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphExecutionInfoConverter.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphExecutionInfoConverter.java index b6472f690d3..373c27c56b6 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphExecutionInfoConverter.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphExecutionInfoConverter.java @@ -24,14 +24,14 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.session.Request; import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.UUID; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Handles conversions from / to GraphExecutionInfo and ExecutionInfo since GraphExecutionInfo has @@ -50,13 +50,13 @@ public static ExecutionInfo convert( com.datastax.dse.driver.api.core.graph.GraphExecutionInfo graphExecutionInfo) { return new ExecutionInfo() { - @NonNull + @Nonnull @Override public Request getRequest() { return graphExecutionInfo.getStatement(); } - @NonNull + @Nonnull @Override public Statement getStatement() { throw new ClassCastException("GraphStatement cannot be cast to Statement"); @@ -78,7 +78,7 @@ public int getSuccessfulExecutionIndex() { return graphExecutionInfo.getSuccessfulExecutionIndex(); } - @NonNull + @Nonnull @Override public List> getErrors() { return graphExecutionInfo.getErrors(); @@ -90,13 +90,13 @@ public ByteBuffer getPagingState() { return null; } - @NonNull + @Nonnull @Override public List getWarnings() { return graphExecutionInfo.getWarnings(); } - @NonNull + @Nonnull @Override public Map getIncomingPayload() { return graphExecutionInfo.getIncomingPayload(); @@ -113,7 +113,7 @@ public UUID getTracingId() { return null; } - @NonNull + @Nonnull @Override public CompletionStage getQueryTraceAsync() { return CompletableFutures.failedFuture( diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphProtocol.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphProtocol.java index 6b7a9f4c430..5da7ae41725 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphProtocol.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphProtocol.java @@ -17,11 +17,11 @@ */ package com.datastax.dse.driver.internal.core.graph; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public enum GraphProtocol { GRAPHSON_1_0("graphson-1.0"), @@ -45,12 +45,12 @@ public enum GraphProtocol { this.stringRepresentation = stringRepresentation; } - @NonNull + @Nonnull public String toInternalCode() { return stringRepresentation; } - @NonNull + @Nonnull public static GraphProtocol fromString(@Nullable String stringRepresentation) { if (stringRepresentation == null || !BY_CODE.containsKey(stringRepresentation)) { StringBuilder sb = diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphRequestAsyncProcessor.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphRequestAsyncProcessor.java index 050b03c66f4..de95520b4f7 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphRequestAsyncProcessor.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphRequestAsyncProcessor.java @@ -30,8 +30,8 @@ import com.datastax.oss.driver.internal.core.session.DefaultSession; import com.datastax.oss.driver.internal.core.session.RequestProcessor; import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader; import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter; @@ -55,7 +55,7 @@ public GraphRequestAsyncProcessor( this.graphSupportChecker = graphSupportChecker; } - @NonNull + @Nonnull public GraphBinaryModule getGraphBinaryModule() { return graphBinaryModule; } diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphRequestHandler.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphRequestHandler.java index c2298458805..468f8ef5645 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphRequestHandler.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphRequestHandler.java @@ -67,7 +67,6 @@ import com.datastax.oss.protocol.internal.response.Result; import com.datastax.oss.protocol.internal.response.result.Rows; import com.datastax.oss.protocol.internal.response.result.Void; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.handler.codec.EncoderException; import io.netty.util.Timeout; import io.netty.util.Timer; @@ -86,6 +85,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -134,12 +134,12 @@ public class GraphRequestHandler implements Throttled { private volatile List> errors; GraphRequestHandler( - @NonNull GraphStatement statement, - @NonNull DefaultSession dseSession, - @NonNull InternalDriverContext context, - @NonNull String sessionLogPrefix, - @NonNull GraphBinaryModule graphBinaryModule, - @NonNull GraphSupportChecker graphSupportChecker) { + @Nonnull GraphStatement statement, + @Nonnull DefaultSession dseSession, + @Nonnull InternalDriverContext context, + @Nonnull String sessionLogPrefix, + @Nonnull GraphBinaryModule graphBinaryModule, + @Nonnull GraphSupportChecker graphSupportChecker) { this.startTimeNanos = System.nanoTime(); this.logPrefix = sessionLogPrefix + "|" + this.hashCode(); LOG.trace("[{}] Creating new Graph request handler for request {}", logPrefix, statement); @@ -434,7 +434,7 @@ private ExecutionInfo buildExecutionInfo(NodeResponseCallback callback, Frame re } @Override - public void onThrottleFailure(@NonNull RequestThrottlingException error) { + public void onThrottleFailure(@Nonnull RequestThrottlingException error) { DriverExecutionProfile executionProfile = Conversions.resolveExecutionProfile(initialStatement, context); sessionMetricUpdater.incrementCounter( diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphSONUtils.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphSONUtils.java index 02b35f7ee36..46ae5421b7f 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphSONUtils.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphSONUtils.java @@ -25,12 +25,12 @@ import com.datastax.oss.driver.shaded.guava.common.cache.CacheLoader; import com.datastax.oss.driver.shaded.guava.common.cache.LoadingCache; import com.datastax.oss.protocol.internal.util.Bytes; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.nio.ByteBuffer; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.function.Supplier; +import javax.annotation.Nonnull; import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper; import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader; import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion; @@ -46,7 +46,7 @@ public class GraphSONUtils { .build( new CacheLoader() { @Override - public ObjectMapper load(@NonNull GraphProtocol graphSubProtocol) throws Exception { + public ObjectMapper load(@Nonnull GraphProtocol graphSubProtocol) throws Exception { switch (graphSubProtocol) { case GRAPHSON_1_0: com.datastax.oss.driver.api.core.Version driverVersion = diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphStatementBase.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphStatementBase.java index b8baa2f5e49..578a54252a4 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphStatementBase.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphStatementBase.java @@ -21,11 +21,11 @@ import com.datastax.oss.driver.api.core.ConsistencyLevel; import com.datastax.oss.driver.api.core.config.DriverExecutionProfile; import com.datastax.oss.driver.api.core.metadata.Node; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.time.Duration; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; @Immutable @@ -94,7 +94,7 @@ public Boolean isIdempotent() { return isIdempotent; } - @NonNull + @Nonnull @Override public SelfT setIdempotent(@Nullable Boolean newIdempotence) { return newInstance( @@ -119,7 +119,7 @@ public Duration getTimeout() { return timeout; } - @NonNull + @Nonnull @Override public SelfT setTimeout(@Nullable Duration newTimeout) { return newInstance( @@ -144,7 +144,7 @@ public Node getNode() { return node; } - @NonNull + @Nonnull @Override public SelfT setNode(@Nullable Node newNode) { return newInstance( @@ -168,7 +168,7 @@ public long getTimestamp() { return this.timestamp; } - @NonNull + @Nonnull @Override public SelfT setTimestamp(long newTimestamp) { return newInstance( @@ -193,7 +193,7 @@ public DriverExecutionProfile getExecutionProfile() { return executionProfile; } - @NonNull + @Nonnull @Override public SelfT setExecutionProfile(@Nullable DriverExecutionProfile newExecutionProfile) { return newInstance( @@ -218,7 +218,7 @@ public String getExecutionProfileName() { return executionProfileName; } - @NonNull + @Nonnull @Override public SelfT setExecutionProfileName(@Nullable String newExecutionProfileName) { return newInstance( @@ -237,15 +237,15 @@ public SelfT setExecutionProfileName(@Nullable String newExecutionProfileName) { writeConsistencyLevel); } - @NonNull + @Nonnull @Override public Map getCustomPayload() { return customPayload; } - @NonNull + @Nonnull @Override - public SelfT setCustomPayload(@NonNull Map newCustomPayload) { + public SelfT setCustomPayload(@Nonnull Map newCustomPayload) { return newInstance( isIdempotent, timeout, @@ -268,7 +268,7 @@ public String getGraphName() { return graphName; } - @NonNull + @Nonnull @Override public SelfT setGraphName(@Nullable String newGraphName) { return newInstance( @@ -293,7 +293,7 @@ public String getTraversalSource() { return traversalSource; } - @NonNull + @Nonnull @Override public SelfT setTraversalSource(@Nullable String newTraversalSource) { return newInstance( @@ -318,7 +318,7 @@ public String getSubProtocol() { return subProtocol; } - @NonNull + @Nonnull @Override public SelfT setSubProtocol(@Nullable String newSubProtocol) { return newInstance( @@ -367,7 +367,7 @@ public ConsistencyLevel getReadConsistencyLevel() { return readConsistencyLevel; } - @NonNull + @Nonnull @Override public SelfT setReadConsistencyLevel(@Nullable ConsistencyLevel newReadConsistencyLevel) { return newInstance( @@ -392,7 +392,7 @@ public ConsistencyLevel getWriteConsistencyLevel() { return writeConsistencyLevel; } - @NonNull + @Nonnull @Override public SelfT setWriteConsistencyLevel(@Nullable ConsistencyLevel newWriteConsistencyLevel) { return newInstance( diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphSupportChecker.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphSupportChecker.java index 6e586bbcf3f..dade2b06ae1 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphSupportChecker.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphSupportChecker.java @@ -29,9 +29,9 @@ import com.datastax.oss.driver.internal.core.context.InternalDriverContext; import com.datastax.oss.driver.internal.core.cql.Conversions; import com.datastax.oss.driver.shaded.guava.common.annotations.VisibleForTesting; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collection; import java.util.Objects; +import javax.annotation.Nonnull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -68,7 +68,7 @@ public class GraphSupportChecker { * cluster later and do not support graph paging, the user has to manually disable graph paging. */ public boolean isPagingEnabled( - @NonNull GraphStatement graphStatement, @NonNull InternalDriverContext context) { + @Nonnull GraphStatement graphStatement, @Nonnull InternalDriverContext context) { DriverExecutionProfile driverExecutionProfile = Conversions.resolveExecutionProfile(graphStatement, context); PagingEnabledOptions pagingEnabledOptions = @@ -110,11 +110,11 @@ public boolean isPagingEnabled( * you are targeting a "classic" graph engine instead, the user has to manually set the graph * protocol to something else. */ - @NonNull + @Nonnull public GraphProtocol inferGraphProtocol( - @NonNull GraphStatement statement, - @NonNull DriverExecutionProfile config, - @NonNull InternalDriverContext context) { + @Nonnull GraphStatement statement, + @Nonnull DriverExecutionProfile config, + @Nonnull InternalDriverContext context) { String graphProtocol = statement.getSubProtocol(); if (graphProtocol == null) { // use the protocol specified in configuration, otherwise get the default from the context @@ -154,7 +154,7 @@ private boolean isContextGraphPagingEnabled(InternalDriverContext context) { * @return The default GraphProtocol to used based on the provided context. */ @VisibleForTesting - GraphProtocol getDefaultGraphProtocol(@NonNull InternalDriverContext context) { + GraphProtocol getDefaultGraphProtocol(@Nonnull InternalDriverContext context) { if (isDse68OrAbove == null) { isDse68OrAbove = checkIsDse68OrAbove(context); } @@ -162,7 +162,7 @@ GraphProtocol getDefaultGraphProtocol(@NonNull InternalDriverContext context) { return isDse68OrAbove ? GraphProtocol.GRAPH_BINARY_1_0 : GraphProtocol.GRAPHSON_2_0; } - private boolean checkIsDse68OrAbove(@NonNull InternalDriverContext context) { + private boolean checkIsDse68OrAbove(@Nonnull InternalDriverContext context) { Collection nodes = context.getMetadataManager().getMetadata().getNodes().values(); for (Node node : nodes) { diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/MultiPageGraphResultSet.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/MultiPageGraphResultSet.java index fe81d73ba00..131a13e7b37 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/MultiPageGraphResultSet.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/MultiPageGraphResultSet.java @@ -25,10 +25,10 @@ import com.datastax.oss.driver.internal.core.util.concurrent.BlockingOperation; import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures; import com.datastax.oss.driver.shaded.guava.common.collect.Lists; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import javax.annotation.Nonnull; public class MultiPageGraphResultSet implements GraphResultSet { private final RowIterator iterator; @@ -44,13 +44,13 @@ public void cancel() { iterator.cancel(); } - @NonNull + @Nonnull @Override public ExecutionInfo getRequestExecutionInfo() { return executionInfos.get(executionInfos.size() - 1); } - @NonNull + @Nonnull @Override @Deprecated public com.datastax.dse.driver.api.core.graph.GraphExecutionInfo getExecutionInfo() { @@ -64,19 +64,19 @@ public com.datastax.dse.driver.api.core.graph.GraphExecutionInfo getExecutionInf *

This will have multiple elements if the query is paged, since the driver performs blocking * background queries to fetch additional pages transparently as the result set is being iterated. */ - @NonNull + @Nonnull public List getRequestExecutionInfos() { return executionInfos; } /** @deprecated use {@link #getRequestExecutionInfos()} instead. */ - @NonNull + @Nonnull @Deprecated public List getExecutionInfos() { return Lists.transform(executionInfos, GraphExecutionInfoConverter::convert); } - @NonNull + @Nonnull @Override public Iterator iterator() { return iterator; diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/SinglePageGraphResultSet.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/SinglePageGraphResultSet.java index ff1d984d745..fce0cbf9b82 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/SinglePageGraphResultSet.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/SinglePageGraphResultSet.java @@ -21,8 +21,8 @@ import com.datastax.dse.driver.api.core.graph.GraphNode; import com.datastax.dse.driver.api.core.graph.GraphResultSet; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Iterator; +import javax.annotation.Nonnull; import net.jcip.annotations.NotThreadSafe; @NotThreadSafe @@ -35,20 +35,20 @@ public SinglePageGraphResultSet(AsyncGraphResultSet onlyPage) { assert !onlyPage.hasMorePages(); } - @NonNull + @Nonnull @Override public ExecutionInfo getRequestExecutionInfo() { return onlyPage.getRequestExecutionInfo(); } - @NonNull + @Nonnull @Override @Deprecated public com.datastax.dse.driver.api.core.graph.GraphExecutionInfo getExecutionInfo() { return onlyPage.getExecutionInfo(); } - @NonNull + @Nonnull @Override public Iterator iterator() { return onlyPage.currentPage().iterator(); diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/binary/ComplexTypeSerializerUtil.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/binary/ComplexTypeSerializerUtil.java index bec3c78743a..1931dfe3e64 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/binary/ComplexTypeSerializerUtil.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/binary/ComplexTypeSerializerUtil.java @@ -36,10 +36,10 @@ import com.datastax.oss.protocol.internal.PrimitiveCodec; import com.datastax.oss.protocol.internal.ProtocolConstants; import com.datastax.oss.protocol.internal.response.result.RawType; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; import java.util.Objects; +import javax.annotation.Nullable; import org.apache.tinkerpop.gremlin.structure.io.Buffer; class ComplexTypeSerializerUtil { diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/reactive/DefaultReactiveGraphNode.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/reactive/DefaultReactiveGraphNode.java index fda0eed5333..42915e9590b 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/reactive/DefaultReactiveGraphNode.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/reactive/DefaultReactiveGraphNode.java @@ -21,10 +21,10 @@ import com.datastax.dse.driver.api.core.graph.reactive.ReactiveGraphNode; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; import java.util.Map; import java.util.Set; +import javax.annotation.Nonnull; import net.jcip.annotations.NotThreadSafe; import org.apache.tinkerpop.gremlin.process.traversal.Path; import org.apache.tinkerpop.gremlin.structure.Edge; @@ -38,12 +38,12 @@ class DefaultReactiveGraphNode implements ReactiveGraphNode { private final GraphNode graphNode; private final ExecutionInfo executionInfo; - DefaultReactiveGraphNode(@NonNull GraphNode graphNode, @NonNull ExecutionInfo executionInfo) { + DefaultReactiveGraphNode(@Nonnull GraphNode graphNode, @Nonnull ExecutionInfo executionInfo) { this.graphNode = graphNode; this.executionInfo = executionInfo; } - @NonNull + @Nonnull @Override public ExecutionInfo getExecutionInfo() { return executionInfo; diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/reactive/DefaultReactiveGraphResultSet.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/reactive/DefaultReactiveGraphResultSet.java index 137e44e4d95..9002ea2ec1f 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/reactive/DefaultReactiveGraphResultSet.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/reactive/DefaultReactiveGraphResultSet.java @@ -23,11 +23,11 @@ import com.datastax.dse.driver.internal.core.cql.reactive.EmptySubscription; import com.datastax.dse.driver.internal.core.cql.reactive.SimpleUnicastProcessor; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; import java.util.concurrent.Callable; import java.util.concurrent.CompletionStage; import java.util.concurrent.atomic.AtomicBoolean; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; @@ -47,7 +47,7 @@ public DefaultReactiveGraphResultSet(Callable subscriber) { + public void subscribe(@Nonnull Subscriber subscriber) { // As per rule 1.9, we need to throw an NPE if subscriber is null Objects.requireNonNull(subscriber, "Subscriber cannot be null"); // As per rule 1.11, this publisher is allowed to support only one subscriber. @@ -77,7 +77,7 @@ public void subscribe(@NonNull Subscriber subscriber) // As per 2.13, this method must return normally (i.e. not throw) } - @NonNull + @Nonnull @Override public Publisher getExecutionInfos() { return executionInfosPublisher; diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/reactive/FailedReactiveGraphResultSet.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/reactive/FailedReactiveGraphResultSet.java index 45bbd8c62b0..6d50c0a7fe5 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/reactive/FailedReactiveGraphResultSet.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/reactive/FailedReactiveGraphResultSet.java @@ -21,7 +21,7 @@ import com.datastax.dse.driver.api.core.graph.reactive.ReactiveGraphResultSet; import com.datastax.dse.driver.internal.core.cql.reactive.FailedPublisher; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import org.reactivestreams.Publisher; public class FailedReactiveGraphResultSet extends FailedPublisher @@ -31,7 +31,7 @@ public FailedReactiveGraphResultSet(Throwable error) { super(error); } - @NonNull + @Nonnull @Override public Publisher getExecutionInfos() { return new FailedPublisher<>(error); diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/reactive/ReactiveGraphRequestProcessor.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/reactive/ReactiveGraphRequestProcessor.java index ed2cd28926c..01bc328a8fa 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/reactive/ReactiveGraphRequestProcessor.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/reactive/ReactiveGraphRequestProcessor.java @@ -25,7 +25,7 @@ import com.datastax.oss.driver.internal.core.context.InternalDriverContext; import com.datastax.oss.driver.internal.core.session.DefaultSession; import com.datastax.oss.driver.internal.core.session.RequestProcessor; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -37,7 +37,7 @@ public class ReactiveGraphRequestProcessor private final GraphRequestAsyncProcessor asyncGraphProcessor; - public ReactiveGraphRequestProcessor(@NonNull GraphRequestAsyncProcessor asyncGraphProcessor) { + public ReactiveGraphRequestProcessor(@Nonnull GraphRequestAsyncProcessor asyncGraphProcessor) { this.asyncGraphProcessor = asyncGraphProcessor; } diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/reactive/ReactiveGraphResultSetSubscription.java b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/reactive/ReactiveGraphResultSetSubscription.java index c3234d74ebc..c6c6fd870f8 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/graph/reactive/ReactiveGraphResultSetSubscription.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/graph/reactive/ReactiveGraphResultSetSubscription.java @@ -24,8 +24,6 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures; import com.datastax.oss.driver.shaded.guava.common.collect.Iterators; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Collections; import java.util.Iterator; import java.util.Objects; @@ -35,6 +33,8 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; @@ -103,8 +103,8 @@ public class ReactiveGraphResultSetSubscription implements Subscription { private volatile boolean cancelled = false; ReactiveGraphResultSetSubscription( - @NonNull Subscriber mainSubscriber, - @NonNull Subscriber executionInfosSubscriber) { + @Nonnull Subscriber mainSubscriber, + @Nonnull Subscriber executionInfosSubscriber) { this.mainSubscriber = mainSubscriber; this.executionInfosSubscriber = executionInfosSubscriber; } @@ -117,7 +117,7 @@ public class ReactiveGraphResultSetSubscription implements Subscription { * * @param firstPage The future that, when complete, will produce the first page. */ - void start(@NonNull Callable> firstPage) { + void start(@Nonnull Callable> firstPage) { firstSubscriberRequestArrived.thenAccept( (aVoid) -> fetchNextPageAndEnqueue(new Page(firstPage))); } @@ -308,7 +308,7 @@ private boolean isExhausted() { * concurrently due to the fact that one can only fetch the next page when the current one is * arrived and enqueued. */ - private void fetchNextPageAndEnqueue(@NonNull Page current) { + private void fetchNextPageAndEnqueue(@Nonnull Page current) { current .fetchNextPage() // as soon as the response arrives, @@ -343,7 +343,7 @@ private void fetchNextPageAndEnqueue(@NonNull Page current) { }); } - private void doOnNext(@NonNull ReactiveGraphNode result) { + private void doOnNext(@Nonnull ReactiveGraphNode result) { try { mainSubscriber.onNext(result); } catch (Throwable t) { @@ -371,7 +371,7 @@ private void doOnComplete() { // package-private because it can be invoked by the publisher if the subscription handshake // process fails. - void doOnError(@NonNull Throwable error) { + void doOnError(@Nonnull Throwable error) { try { // Then we signal the error downstream, as per rules 1.2 and 1.4. mainSubscriber.onError(error); @@ -405,8 +405,8 @@ private void clear() { * @param rs the result object to convert. * @return a new page. */ - @NonNull - private Page toPage(@NonNull AsyncGraphResultSet rs) { + @Nonnull + private Page toPage(@Nonnull AsyncGraphResultSet rs) { ExecutionInfo executionInfo = rs.getRequestExecutionInfo(); Iterator results = Iterators.transform( @@ -416,8 +416,8 @@ private Page toPage(@NonNull AsyncGraphResultSet rs) { } /** Converts the given error into a {@link Page}, containing the error as its only element. */ - @NonNull - private Page toErrorPage(@NonNull Throwable t) { + @Nonnull + private Page toErrorPage(@Nonnull Throwable t) { return new Page(Iterators.singletonIterator(t), null); } @@ -427,19 +427,19 @@ private Page toErrorPage(@NonNull Throwable t) { */ static class Page { - @NonNull final Iterator iterator; + @Nonnull final Iterator iterator; // A pointer to the next page, or null if this is the last page. @Nullable final Callable> nextPage; /** called only from start() */ - Page(@NonNull Callable> nextPage) { + Page(@Nonnull Callable> nextPage) { this.iterator = Collections.emptyIterator(); this.nextPage = nextPage; } Page( - @NonNull Iterator iterator, + @Nonnull Iterator iterator, @Nullable Callable> nextPage) { this.iterator = iterator; this.nextPage = nextPage; @@ -449,7 +449,7 @@ boolean hasMorePages() { return nextPage != null; } - @NonNull + @Nonnull CompletionStage fetchNextPage() { try { return Objects.requireNonNull(nextPage).call(); @@ -467,7 +467,7 @@ boolean hasMoreRows() { return iterator.hasNext(); } - @NonNull + @Nonnull Object nextRow() { return iterator.next(); } diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/loadbalancing/DseDcInferringLoadBalancingPolicy.java b/core/src/main/java/com/datastax/dse/driver/internal/core/loadbalancing/DseDcInferringLoadBalancingPolicy.java index 501fa263258..b5dcdaeb70e 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/loadbalancing/DseDcInferringLoadBalancingPolicy.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/loadbalancing/DseDcInferringLoadBalancingPolicy.java @@ -19,7 +19,7 @@ import com.datastax.oss.driver.api.core.context.DriverContext; import com.datastax.oss.driver.internal.core.loadbalancing.DcInferringLoadBalancingPolicy; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * @deprecated This class only exists for backward compatibility. It is equivalent to {@link @@ -28,7 +28,7 @@ @Deprecated public class DseDcInferringLoadBalancingPolicy extends DcInferringLoadBalancingPolicy { public DseDcInferringLoadBalancingPolicy( - @NonNull DriverContext context, @NonNull String profileName) { + @Nonnull DriverContext context, @Nonnull String profileName) { super(context, profileName); } } diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/loadbalancing/DseLoadBalancingPolicy.java b/core/src/main/java/com/datastax/dse/driver/internal/core/loadbalancing/DseLoadBalancingPolicy.java index 059a37c4774..b177856fd69 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/loadbalancing/DseLoadBalancingPolicy.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/loadbalancing/DseLoadBalancingPolicy.java @@ -19,7 +19,7 @@ import com.datastax.oss.driver.api.core.context.DriverContext; import com.datastax.oss.driver.internal.core.loadbalancing.DefaultLoadBalancingPolicy; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * @deprecated This class only exists for backward compatibility. It is equivalent to {@link @@ -27,7 +27,7 @@ */ @Deprecated public class DseLoadBalancingPolicy extends DefaultLoadBalancingPolicy { - public DseLoadBalancingPolicy(@NonNull DriverContext context, @NonNull String profileName) { + public DseLoadBalancingPolicy(@Nonnull DriverContext context, @Nonnull String profileName) { super(context, profileName); } } diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseAggregateMetadata.java b/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseAggregateMetadata.java index 52a0b846076..50d25474849 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseAggregateMetadata.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseAggregateMetadata.java @@ -23,10 +23,10 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.internal.core.metadata.schema.DefaultAggregateMetadata; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Objects; import java.util.Optional; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; @Immutable @@ -36,14 +36,14 @@ public class DefaultDseAggregateMetadata extends DefaultAggregateMetadata @Nullable private final Boolean deterministic; public DefaultDseAggregateMetadata( - @NonNull CqlIdentifier keyspace, - @NonNull FunctionSignature signature, + @Nonnull CqlIdentifier keyspace, + @Nonnull FunctionSignature signature, @Nullable FunctionSignature finalFuncSignature, @Nullable Object initCond, - @NonNull DataType returnType, - @NonNull FunctionSignature stateFuncSignature, - @NonNull DataType stateType, - @NonNull TypeCodec stateTypeCodec, + @Nonnull DataType returnType, + @Nonnull FunctionSignature stateFuncSignature, + @Nonnull DataType stateType, + @Nonnull TypeCodec stateTypeCodec, @Nullable Boolean deterministic) { super( keyspace, diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseColumnMetadata.java b/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseColumnMetadata.java index 2168f20fdc7..3beaf3c4590 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseColumnMetadata.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseColumnMetadata.java @@ -21,17 +21,17 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.internal.core.metadata.schema.DefaultColumnMetadata; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable public class DefaultDseColumnMetadata extends DefaultColumnMetadata implements DseColumnMetadata { public DefaultDseColumnMetadata( - @NonNull CqlIdentifier keyspace, - @NonNull CqlIdentifier parent, - @NonNull CqlIdentifier name, - @NonNull DataType dataType, + @Nonnull CqlIdentifier keyspace, + @Nonnull CqlIdentifier parent, + @Nonnull CqlIdentifier name, + @Nonnull DataType dataType, boolean isStatic) { super(keyspace, parent, name, dataType, isStatic); } diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseEdgeMetadata.java b/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseEdgeMetadata.java index e4de62f294c..f0247d97876 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseEdgeMetadata.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseEdgeMetadata.java @@ -20,37 +20,37 @@ import com.datastax.dse.driver.api.core.metadata.schema.DseEdgeMetadata; import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.Serializable; import java.util.List; import java.util.Objects; +import javax.annotation.Nonnull; public class DefaultDseEdgeMetadata implements DseEdgeMetadata, Serializable { private static final long serialVersionUID = 1; - @NonNull private final CqlIdentifier labelName; + @Nonnull private final CqlIdentifier labelName; - @NonNull private final CqlIdentifier fromTable; - @NonNull private final CqlIdentifier fromLabel; - @NonNull private final List fromPartitionKeyColumns; - @NonNull private final List fromClusteringColumns; + @Nonnull private final CqlIdentifier fromTable; + @Nonnull private final CqlIdentifier fromLabel; + @Nonnull private final List fromPartitionKeyColumns; + @Nonnull private final List fromClusteringColumns; - @NonNull private final CqlIdentifier toTable; - @NonNull private final CqlIdentifier toLabel; - @NonNull private final List toPartitionKeyColumns; - @NonNull private final List toClusteringColumns; + @Nonnull private final CqlIdentifier toTable; + @Nonnull private final CqlIdentifier toLabel; + @Nonnull private final List toPartitionKeyColumns; + @Nonnull private final List toClusteringColumns; public DefaultDseEdgeMetadata( - @NonNull CqlIdentifier labelName, - @NonNull CqlIdentifier fromTable, - @NonNull CqlIdentifier fromLabel, - @NonNull List fromPartitionKeyColumns, - @NonNull List fromClusteringColumns, - @NonNull CqlIdentifier toTable, - @NonNull CqlIdentifier toLabel, - @NonNull List toPartitionKeyColumns, - @NonNull List toClusteringColumns) { + @Nonnull CqlIdentifier labelName, + @Nonnull CqlIdentifier fromTable, + @Nonnull CqlIdentifier fromLabel, + @Nonnull List fromPartitionKeyColumns, + @Nonnull List fromClusteringColumns, + @Nonnull CqlIdentifier toTable, + @Nonnull CqlIdentifier toLabel, + @Nonnull List toPartitionKeyColumns, + @Nonnull List toClusteringColumns) { this.labelName = Preconditions.checkNotNull(labelName); this.fromTable = Preconditions.checkNotNull(fromTable); this.fromLabel = Preconditions.checkNotNull(fromLabel); @@ -62,55 +62,55 @@ public DefaultDseEdgeMetadata( this.toClusteringColumns = Preconditions.checkNotNull(toClusteringColumns); } - @NonNull + @Nonnull @Override public CqlIdentifier getLabelName() { return labelName; } - @NonNull + @Nonnull @Override public CqlIdentifier getFromTable() { return fromTable; } - @NonNull + @Nonnull @Override public CqlIdentifier getFromLabel() { return fromLabel; } - @NonNull + @Nonnull @Override public List getFromPartitionKeyColumns() { return fromPartitionKeyColumns; } - @NonNull + @Nonnull @Override public List getFromClusteringColumns() { return fromClusteringColumns; } - @NonNull + @Nonnull @Override public CqlIdentifier getToTable() { return toTable; } - @NonNull + @Nonnull @Override public CqlIdentifier getToLabel() { return toLabel; } - @NonNull + @Nonnull @Override public List getToPartitionKeyColumns() { return toPartitionKeyColumns; } - @NonNull + @Nonnull @Override public List getToClusteringColumns() { return toClusteringColumns; diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseFunctionMetadata.java b/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseFunctionMetadata.java index 0a94491f1f7..9ae5b701f16 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseFunctionMetadata.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseFunctionMetadata.java @@ -23,11 +23,11 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.internal.core.metadata.schema.DefaultFunctionMetadata; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.List; import java.util.Objects; import java.util.Optional; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; @Immutable @@ -36,19 +36,19 @@ public class DefaultDseFunctionMetadata extends DefaultFunctionMetadata @Nullable private final Boolean deterministic; @Nullable private final Monotonicity monotonicity; - @NonNull private final List monotonicArgumentNames; + @Nonnull private final List monotonicArgumentNames; public DefaultDseFunctionMetadata( - @NonNull CqlIdentifier keyspace, - @NonNull FunctionSignature signature, - @NonNull List parameterNames, - @NonNull String body, + @Nonnull CqlIdentifier keyspace, + @Nonnull FunctionSignature signature, + @Nonnull List parameterNames, + @Nonnull String body, boolean calledOnNullInput, - @NonNull String language, - @NonNull DataType returnType, + @Nonnull String language, + @Nonnull DataType returnType, @Nullable Boolean deterministic, @Nullable Boolean monotonic, - @NonNull List monotonicArgumentNames) { + @Nonnull List monotonicArgumentNames) { super(keyspace, signature, parameterNames, body, calledOnNullInput, language, returnType); // set DSE extension attributes this.deterministic = deterministic; @@ -85,7 +85,7 @@ public Optional getMonotonicity() { return Optional.ofNullable(monotonicity); } - @NonNull + @Nonnull @Override public List getMonotonicArgumentNames() { return this.monotonicArgumentNames; diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseIndexMetadata.java b/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseIndexMetadata.java index c66d7934151..0a61997cd46 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseIndexMetadata.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseIndexMetadata.java @@ -21,20 +21,20 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.core.metadata.schema.IndexKind; import com.datastax.oss.driver.internal.core.metadata.schema.DefaultIndexMetadata; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable public class DefaultDseIndexMetadata extends DefaultIndexMetadata implements DseIndexMetadata { public DefaultDseIndexMetadata( - @NonNull CqlIdentifier keyspace, - @NonNull CqlIdentifier table, - @NonNull CqlIdentifier name, - @NonNull IndexKind kind, - @NonNull String target, - @NonNull Map options) { + @Nonnull CqlIdentifier keyspace, + @Nonnull CqlIdentifier table, + @Nonnull CqlIdentifier name, + @Nonnull IndexKind kind, + @Nonnull String target, + @Nonnull Map options) { super(keyspace, table, name, kind, target, options); } } diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseKeyspaceMetadata.java b/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseKeyspaceMetadata.java index 8e54c9082e1..28a547b3c57 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseKeyspaceMetadata.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseKeyspaceMetadata.java @@ -25,12 +25,12 @@ import com.datastax.oss.driver.api.core.metadata.schema.TableMetadata; import com.datastax.oss.driver.api.core.metadata.schema.ViewMetadata; import com.datastax.oss.driver.api.core.type.UserDefinedType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.Serializable; import java.util.Map; import java.util.Objects; import java.util.Optional; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; @Immutable @@ -38,28 +38,28 @@ public class DefaultDseKeyspaceMetadata implements DseGraphKeyspaceMetadata, Ser private static final long serialVersionUID = 1; - @NonNull private final CqlIdentifier name; + @Nonnull private final CqlIdentifier name; private final boolean durableWrites; private final boolean virtual; @Nullable private final String graphEngine; - @NonNull private final Map replication; - @NonNull private final Map types; - @NonNull private final Map tables; - @NonNull private final Map views; - @NonNull private final Map functions; - @NonNull private final Map aggregates; + @Nonnull private final Map replication; + @Nonnull private final Map types; + @Nonnull private final Map tables; + @Nonnull private final Map views; + @Nonnull private final Map functions; + @Nonnull private final Map aggregates; public DefaultDseKeyspaceMetadata( - @NonNull CqlIdentifier name, + @Nonnull CqlIdentifier name, boolean durableWrites, boolean virtual, @Nullable String graphEngine, - @NonNull Map replication, - @NonNull Map types, - @NonNull Map tables, - @NonNull Map views, - @NonNull Map functions, - @NonNull Map aggregates) { + @Nonnull Map replication, + @Nonnull Map types, + @Nonnull Map tables, + @Nonnull Map views, + @Nonnull Map functions, + @Nonnull Map aggregates) { this.name = name; this.durableWrites = durableWrites; this.virtual = virtual; @@ -72,7 +72,7 @@ public DefaultDseKeyspaceMetadata( this.aggregates = aggregates; } - @NonNull + @Nonnull @Override public CqlIdentifier getName() { return name; @@ -88,43 +88,43 @@ public boolean isVirtual() { return virtual; } - @NonNull + @Nonnull @Override public Optional getGraphEngine() { return Optional.ofNullable(graphEngine); } - @NonNull + @Nonnull @Override public Map getReplication() { return replication; } - @NonNull + @Nonnull @Override public Map getUserDefinedTypes() { return types; } - @NonNull + @Nonnull @Override public Map getTables() { return tables; } - @NonNull + @Nonnull @Override public Map getViews() { return views; } - @NonNull + @Nonnull @Override public Map getFunctions() { return functions; } - @NonNull + @Nonnull @Override public Map getAggregates() { return aggregates; diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseTableMetadata.java b/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseTableMetadata.java index f8fb8cc10d1..8868e1d8858 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseTableMetadata.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseTableMetadata.java @@ -24,14 +24,14 @@ import com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder; import com.datastax.oss.driver.api.core.metadata.schema.ColumnMetadata; import com.datastax.oss.driver.api.core.metadata.schema.IndexMetadata; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.Serializable; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.UUID; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; @Immutable @@ -39,31 +39,31 @@ public class DefaultDseTableMetadata implements DseGraphTableMetadata, Serializa private static final long serialVersionUID = 1; - @NonNull private final CqlIdentifier keyspace; - @NonNull private final CqlIdentifier name; + @Nonnull private final CqlIdentifier keyspace; + @Nonnull private final CqlIdentifier name; // null for virtual tables @Nullable private final UUID id; private final boolean compactStorage; private final boolean virtual; - @NonNull private final List partitionKey; - @NonNull private final Map clusteringColumns; - @NonNull private final Map columns; - @NonNull private final Map options; - @NonNull private final Map indexes; + @Nonnull private final List partitionKey; + @Nonnull private final Map clusteringColumns; + @Nonnull private final Map columns; + @Nonnull private final Map options; + @Nonnull private final Map indexes; @Nullable private final DseVertexMetadata vertex; @Nullable private final DseEdgeMetadata edge; public DefaultDseTableMetadata( - @NonNull CqlIdentifier keyspace, - @NonNull CqlIdentifier name, + @Nonnull CqlIdentifier keyspace, + @Nonnull CqlIdentifier name, @Nullable UUID id, boolean compactStorage, boolean virtual, - @NonNull List partitionKey, - @NonNull Map clusteringColumns, - @NonNull Map columns, - @NonNull Map options, - @NonNull Map indexes, + @Nonnull List partitionKey, + @Nonnull Map clusteringColumns, + @Nonnull Map columns, + @Nonnull Map options, + @Nonnull Map indexes, @Nullable DseVertexMetadata vertex, @Nullable DseEdgeMetadata edge) { this.keyspace = keyspace; @@ -80,19 +80,19 @@ public DefaultDseTableMetadata( this.edge = edge; } - @NonNull + @Nonnull @Override public CqlIdentifier getKeyspace() { return keyspace; } - @NonNull + @Nonnull @Override public CqlIdentifier getName() { return name; } - @NonNull + @Nonnull @Override public Optional getId() { return Optional.ofNullable(id); @@ -108,43 +108,43 @@ public boolean isVirtual() { return virtual; } - @NonNull + @Nonnull @Override public List getPartitionKey() { return partitionKey; } - @NonNull + @Nonnull @Override public Map getClusteringColumns() { return clusteringColumns; } - @NonNull + @Nonnull @Override public Map getColumns() { return columns; } - @NonNull + @Nonnull @Override public Map getOptions() { return options; } - @NonNull + @Nonnull @Override public Map getIndexes() { return indexes; } - @NonNull + @Nonnull @Override public Optional getVertex() { return Optional.ofNullable(vertex); } - @NonNull + @Nonnull @Override public Optional getEdge() { return Optional.ofNullable(edge); diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseVertexMetadata.java b/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseVertexMetadata.java index 05ba2823704..a2e2d8264b0 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseVertexMetadata.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseVertexMetadata.java @@ -20,21 +20,21 @@ import com.datastax.dse.driver.api.core.metadata.schema.DseVertexMetadata; import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.Serializable; import java.util.Objects; +import javax.annotation.Nonnull; public class DefaultDseVertexMetadata implements DseVertexMetadata, Serializable { private static final long serialVersionUID = 1; - @NonNull private final CqlIdentifier labelName; + @Nonnull private final CqlIdentifier labelName; - public DefaultDseVertexMetadata(@NonNull CqlIdentifier labelName) { + public DefaultDseVertexMetadata(@Nonnull CqlIdentifier labelName) { this.labelName = Preconditions.checkNotNull(labelName); } - @NonNull + @Nonnull @Override public CqlIdentifier getLabelName() { return labelName; diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseViewMetadata.java b/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseViewMetadata.java index f04b7640041..cebf5ee41a2 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseViewMetadata.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseViewMetadata.java @@ -23,14 +23,14 @@ import com.datastax.oss.driver.api.core.metadata.schema.ColumnMetadata; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.Serializable; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.UUID; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; @Immutable @@ -38,28 +38,28 @@ public class DefaultDseViewMetadata implements DseViewMetadata, Serializable { private static final long serialVersionUID = 1; - @NonNull private final CqlIdentifier keyspace; - @NonNull private final CqlIdentifier name; - @NonNull private final CqlIdentifier baseTable; + @Nonnull private final CqlIdentifier keyspace; + @Nonnull private final CqlIdentifier name; + @Nonnull private final CqlIdentifier baseTable; private final boolean includesAllColumns; @Nullable private final String whereClause; - @NonNull private final UUID id; - @NonNull private final ImmutableList partitionKey; - @NonNull private final ImmutableMap clusteringColumns; - @NonNull private final ImmutableMap columns; - @NonNull private final Map options; + @Nonnull private final UUID id; + @Nonnull private final ImmutableList partitionKey; + @Nonnull private final ImmutableMap clusteringColumns; + @Nonnull private final ImmutableMap columns; + @Nonnull private final Map options; public DefaultDseViewMetadata( - @NonNull CqlIdentifier keyspace, - @NonNull CqlIdentifier name, - @NonNull CqlIdentifier baseTable, + @Nonnull CqlIdentifier keyspace, + @Nonnull CqlIdentifier name, + @Nonnull CqlIdentifier baseTable, boolean includesAllColumns, @Nullable String whereClause, - @NonNull UUID id, - @NonNull ImmutableList partitionKey, - @NonNull ImmutableMap clusteringColumns, - @NonNull ImmutableMap columns, - @NonNull Map options) { + @Nonnull UUID id, + @Nonnull ImmutableList partitionKey, + @Nonnull ImmutableMap clusteringColumns, + @Nonnull ImmutableMap columns, + @Nonnull Map options) { this.keyspace = keyspace; this.name = name; this.baseTable = baseTable; @@ -72,25 +72,25 @@ public DefaultDseViewMetadata( this.options = options; } - @NonNull + @Nonnull @Override public CqlIdentifier getKeyspace() { return keyspace; } - @NonNull + @Nonnull @Override public CqlIdentifier getName() { return name; } - @NonNull + @Nonnull @Override public Optional getId() { return Optional.of(id); } - @NonNull + @Nonnull @Override public CqlIdentifier getBaseTable() { return baseTable; @@ -101,31 +101,31 @@ public boolean includesAllColumns() { return includesAllColumns; } - @NonNull + @Nonnull @Override public Optional getWhereClause() { return Optional.ofNullable(whereClause); } - @NonNull + @Nonnull @Override public List getPartitionKey() { return partitionKey; } - @NonNull + @Nonnull @Override public Map getClusteringColumns() { return clusteringColumns; } - @NonNull + @Nonnull @Override public Map getColumns() { return columns; } - @NonNull + @Nonnull @Override public Map getOptions() { return options; diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/search/DateRangeUtil.java b/core/src/main/java/com/datastax/dse/driver/internal/core/search/DateRangeUtil.java index 15e278260c5..56a9fb05248 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/search/DateRangeUtil.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/search/DateRangeUtil.java @@ -19,8 +19,6 @@ import com.datastax.dse.driver.api.core.data.time.DateRangePrecision; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.text.ParseException; import java.time.LocalDateTime; import java.time.ZoneOffset; @@ -32,12 +30,14 @@ import java.util.Locale; import java.util.Map; import java.util.TimeZone; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class DateRangeUtil { /** Sets all the fields smaller than the given unit to their lowest possible value. */ - @NonNull - public static ZonedDateTime roundDown(@NonNull ZonedDateTime date, @NonNull ChronoUnit unit) { + @Nonnull + public static ZonedDateTime roundDown(@Nonnull ZonedDateTime date, @Nonnull ChronoUnit unit) { switch (unit) { case YEARS: return date.with(TemporalAdjusters.firstDayOfYear()).truncatedTo(ChronoUnit.DAYS); @@ -55,8 +55,8 @@ public static ZonedDateTime roundDown(@NonNull ZonedDateTime date, @NonNull Chro } /** Sets all the fields smaller than the given unit to their highest possible value. */ - @NonNull - public static ZonedDateTime roundUp(@NonNull ZonedDateTime date, @NonNull ChronoUnit unit) { + @Nonnull + public static ZonedDateTime roundUp(@Nonnull ZonedDateTime date, @Nonnull ChronoUnit unit) { return roundDown(date, unit) .plus(1, unit) // Even though ZDT has nanosecond-precision, DSE only rounds to millisecond precision so be diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/geometry/GeometryCodec.java b/core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/geometry/GeometryCodec.java index f6309bc1860..0ee42e37590 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/geometry/GeometryCodec.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/geometry/GeometryCodec.java @@ -23,9 +23,9 @@ import com.datastax.oss.driver.api.core.ProtocolVersion; import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.internal.core.util.Strings; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; /** Base class for geospatial type codecs. */ @@ -34,13 +34,13 @@ public abstract class GeometryCodec implements TypeCodec @Nullable @Override - public T decode(@Nullable ByteBuffer bb, @NonNull ProtocolVersion protocolVersion) { + public T decode(@Nullable ByteBuffer bb, @Nonnull ProtocolVersion protocolVersion) { return bb == null || bb.remaining() == 0 ? null : fromWellKnownBinary(bb.slice()); } @Nullable @Override - public ByteBuffer encode(@Nullable T geometry, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(@Nullable T geometry, @Nonnull ProtocolVersion protocolVersion) { return geometry == null ? null : toWellKnownBinary(geometry); } @@ -60,7 +60,7 @@ public T parse(@Nullable String s) { return fromWellKnownText(Strings.unquote(s)); } - @NonNull + @Nonnull @Override public String format(@Nullable T geometry) throws IllegalArgumentException { return geometry == null ? "NULL" : Strings.quote(toWellKnownText(geometry)); @@ -75,8 +75,8 @@ public String format(@Nullable T geometry) throws IllegalArgumentException { * @throws IllegalArgumentException if the string does not contain a valid Well-known Text * representation. */ - @NonNull - protected abstract T fromWellKnownText(@NonNull String source); + @Nonnull + protected abstract T fromWellKnownText(@Nonnull String source); /** * Creates an instance of a geospatial type from its Well-known Text (WKT) @@ -98,8 +98,8 @@ public String format(@Nullable T geometry) throws IllegalArgumentException { * @param geometry the geospatial object to convert. Cannot be null. * @return A Well-known Text representation of the given object. */ - @NonNull - protected abstract String toWellKnownText(@NonNull T geometry); + @Nonnull + protected abstract String toWellKnownText(@Nonnull T geometry); /** * Returns a Well-known @@ -108,6 +108,6 @@ public String format(@Nullable T geometry) throws IllegalArgumentException { * @param geometry the geospatial object to convert. Cannot be null. * @return A Well-known Binary representation of the given object. */ - @NonNull - protected abstract ByteBuffer toWellKnownBinary(@NonNull T geometry); + @Nonnull + protected abstract ByteBuffer toWellKnownBinary(@Nonnull T geometry); } diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/geometry/LineStringCodec.java b/core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/geometry/LineStringCodec.java index bbec99a4103..817d030dd50 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/geometry/LineStringCodec.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/geometry/LineStringCodec.java @@ -24,8 +24,8 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.esri.core.geometry.ogc.OGCLineString; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; /** @@ -39,47 +39,47 @@ public class LineStringCodec extends GeometryCodec { private static final GenericType JAVA_TYPE = GenericType.of(LineString.class); - @NonNull + @Nonnull @Override public GenericType getJavaType() { return JAVA_TYPE; } - @NonNull + @Nonnull @Override - protected LineString fromWellKnownText(@NonNull String source) { + protected LineString fromWellKnownText(@Nonnull String source) { return new DefaultLineString(DefaultGeometry.fromOgcWellKnownText(source, OGCLineString.class)); } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return javaClass == LineString.class; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof LineString; } - @NonNull + @Nonnull @Override - protected LineString fromWellKnownBinary(@NonNull ByteBuffer bb) { + protected LineString fromWellKnownBinary(@Nonnull ByteBuffer bb) { return new DefaultLineString(DefaultGeometry.fromOgcWellKnownBinary(bb, OGCLineString.class)); } - @NonNull + @Nonnull @Override - protected String toWellKnownText(@NonNull LineString geometry) { + protected String toWellKnownText(@Nonnull LineString geometry) { return geometry.asWellKnownText(); } - @NonNull + @Nonnull @Override - protected ByteBuffer toWellKnownBinary(@NonNull LineString geometry) { + protected ByteBuffer toWellKnownBinary(@Nonnull LineString geometry) { return geometry.asWellKnownBinary(); } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DseDataTypes.LINE_STRING; diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/geometry/PointCodec.java b/core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/geometry/PointCodec.java index 5ebae64cbab..a9c5af73fbb 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/geometry/PointCodec.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/geometry/PointCodec.java @@ -24,8 +24,8 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.esri.core.geometry.ogc.OGCPoint; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; /** @@ -39,49 +39,49 @@ public class PointCodec extends GeometryCodec { private static final GenericType JAVA_TYPE = GenericType.of(Point.class); - @NonNull + @Nonnull @Override public GenericType getJavaType() { return JAVA_TYPE; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DseDataTypes.POINT; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return javaClass == Point.class; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof Point; } - @NonNull + @Nonnull @Override - protected String toWellKnownText(@NonNull Point geometry) { + protected String toWellKnownText(@Nonnull Point geometry) { return geometry.asWellKnownText(); } - @NonNull + @Nonnull @Override - protected ByteBuffer toWellKnownBinary(@NonNull Point geometry) { + protected ByteBuffer toWellKnownBinary(@Nonnull Point geometry) { return geometry.asWellKnownBinary(); } - @NonNull + @Nonnull @Override - protected Point fromWellKnownText(@NonNull String source) { + protected Point fromWellKnownText(@Nonnull String source) { return new DefaultPoint(DefaultGeometry.fromOgcWellKnownText(source, OGCPoint.class)); } - @NonNull + @Nonnull @Override - protected Point fromWellKnownBinary(@NonNull ByteBuffer source) { + protected Point fromWellKnownBinary(@Nonnull ByteBuffer source) { return new DefaultPoint(DefaultGeometry.fromOgcWellKnownBinary(source, OGCPoint.class)); } } diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/geometry/PolygonCodec.java b/core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/geometry/PolygonCodec.java index 00a070a4b4a..6ac3b3a99de 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/geometry/PolygonCodec.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/geometry/PolygonCodec.java @@ -24,8 +24,8 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.esri.core.geometry.ogc.OGCPolygon; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; /** @@ -39,49 +39,49 @@ public class PolygonCodec extends GeometryCodec { private static final GenericType JAVA_TYPE = GenericType.of(Polygon.class); - @NonNull + @Nonnull @Override public GenericType getJavaType() { return JAVA_TYPE; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DseDataTypes.POLYGON; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return javaClass == Polygon.class; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof Polygon; } - @NonNull + @Nonnull @Override - protected Polygon fromWellKnownText(@NonNull String source) { + protected Polygon fromWellKnownText(@Nonnull String source) { return new DefaultPolygon(DefaultGeometry.fromOgcWellKnownText(source, OGCPolygon.class)); } - @NonNull + @Nonnull @Override - protected Polygon fromWellKnownBinary(@NonNull ByteBuffer bb) { + protected Polygon fromWellKnownBinary(@Nonnull ByteBuffer bb) { return new DefaultPolygon(DefaultGeometry.fromOgcWellKnownBinary(bb, OGCPolygon.class)); } - @NonNull + @Nonnull @Override - protected String toWellKnownText(@NonNull Polygon geometry) { + protected String toWellKnownText(@Nonnull Polygon geometry) { return geometry.asWellKnownText(); } - @NonNull + @Nonnull @Override - protected ByteBuffer toWellKnownBinary(@NonNull Polygon geometry) { + protected ByteBuffer toWellKnownBinary(@Nonnull Polygon geometry) { return geometry.asWellKnownBinary(); } } diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/time/DateRangeCodec.java b/core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/time/DateRangeCodec.java index e8a23e88848..62d6fcc0d5b 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/time/DateRangeCodec.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/time/DateRangeCodec.java @@ -26,14 +26,14 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.internal.core.util.Strings; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.text.ParseException; import java.time.Instant; import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.util.Optional; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class DateRangeCodec implements TypeCodec { @@ -53,27 +53,27 @@ public class DateRangeCodec implements TypeCodec { // * private static final byte DATE_RANGE_TYPE_SINGLE_DATE_OPEN = 0x05; - @NonNull + @Nonnull @Override public GenericType getJavaType() { return JAVA_TYPE; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return CQL_TYPE; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return javaClass == DateRange.class; } @Nullable @Override public ByteBuffer encode( - @Nullable DateRange dateRange, @NonNull ProtocolVersion protocolVersion) { + @Nullable DateRange dateRange, @Nonnull ProtocolVersion protocolVersion) { if (dateRange == null) { return null; } @@ -128,7 +128,7 @@ private static void put(ByteBuffer buffer, DateRangeBound bound) { @Nullable @Override - public DateRange decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public DateRange decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { return null; } @@ -167,7 +167,7 @@ private static DateRangeBound decodeUpperBound(ByteBuffer bytes) { return DateRangeBound.upperBound(timestamp, precision); } - @NonNull + @Nonnull @Override public String format(@Nullable DateRange dateRange) { return (dateRange == null) ? "NULL" : Strings.quote(dateRange.toString()); diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/util/concurrent/BoundedConcurrentQueue.java b/core/src/main/java/com/datastax/dse/driver/internal/core/util/concurrent/BoundedConcurrentQueue.java index ea9ccd7d622..7339d635e5e 100644 --- a/core/src/main/java/com/datastax/dse/driver/internal/core/util/concurrent/BoundedConcurrentQueue.java +++ b/core/src/main/java/com/datastax/dse/driver/internal/core/util/concurrent/BoundedConcurrentQueue.java @@ -17,13 +17,13 @@ */ package com.datastax.dse.driver.internal.core.util.concurrent; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Deque; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.atomic.AtomicReference; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A concurrent queue with a limited size. @@ -49,8 +49,8 @@ public BoundedConcurrentQueue(int maxSize) { * @throws IllegalStateException if the method is invoked before the stage returned by the * previous call has completed. */ - @NonNull - public CompletionStage offer(@NonNull ElementT element) { + @Nonnull + public CompletionStage offer(@Nonnull ElementT element) { while (true) { State oldState = state.get(); State newState = oldState.increment(); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/AllNodesFailedException.java b/core/src/main/java/com/datastax/oss/driver/api/core/AllNodesFailedException.java index b6f1bf93838..42e9eae9ae2 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/AllNodesFailedException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/AllNodesFailedException.java @@ -22,14 +22,14 @@ import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; import com.datastax.oss.driver.shaded.guava.common.collect.Iterables; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Thrown when a query failed on all the coordinators it was tried on. This exception may wrap @@ -39,7 +39,7 @@ public class AllNodesFailedException extends DriverException { /** @deprecated Use {@link #fromErrors(List)} instead. */ - @NonNull + @Nonnull @Deprecated public static AllNodesFailedException fromErrors(@Nullable Map errors) { if (errors == null || errors.isEmpty()) { @@ -49,7 +49,7 @@ public static AllNodesFailedException fromErrors(@Nullable Map } } - @NonNull + @Nonnull public static AllNodesFailedException fromErrors(@Nullable List> errors) { if (errors == null || errors.isEmpty()) { return new NoNodeAvailableException(); @@ -63,18 +63,18 @@ public static AllNodesFailedException fromErrors(@Nullable List errors) { + @Nonnull Map errors) { super(message, executionInfo, null, true); this.errors = toDeepImmutableMap(groupByNode(errors)); addSuppressedErrors(); } protected AllNodesFailedException( - @NonNull String message, + @Nonnull String message, @Nullable ExecutionInfo executionInfo, - @NonNull Iterable>> errors) { + @Nonnull Iterable>> errors) { super(message, executionInfo, null, true); this.errors = toDeepImmutableMap(errors); addSuppressedErrors(); @@ -118,7 +118,7 @@ private static String buildMessage(String baseMessage, Map * * @deprecated Use {@link #getAllErrors()} instead. */ - @NonNull + @Nonnull @Deprecated public Map getErrors() { ImmutableMap.Builder builder = ImmutableMap.builder(); @@ -132,18 +132,18 @@ public Map getErrors() { } /** An immutable map containing all errors on each tried node. */ - @NonNull + @Nonnull public Map> getAllErrors() { return errors; } - @NonNull + @Nonnull @Override public DriverException copy() { return new AllNodesFailedException(getMessage(), getExecutionInfo(), errors.entrySet()); } - @NonNull + @Nonnull public AllNodesFailedException reword(String newMessage) { return new AllNodesFailedException( buildMessage(newMessage, errors), getExecutionInfo(), errors.entrySet()); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/AsyncAutoCloseable.java b/core/src/main/java/com/datastax/oss/driver/api/core/AsyncAutoCloseable.java index 7f8cafbc895..7ad10e743f2 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/AsyncAutoCloseable.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/AsyncAutoCloseable.java @@ -19,8 +19,8 @@ import com.datastax.oss.driver.internal.core.util.concurrent.BlockingOperation; import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; /** * An object that can be closed in an asynchronous, non-blocking manner. @@ -34,7 +34,7 @@ public interface AsyncAutoCloseable extends AutoCloseable { * Returns a stage that will complete when {@link #close()} or {@link #forceCloseAsync()} is * called, and the shutdown sequence completes. */ - @NonNull + @Nonnull CompletionStage closeFuture(); /** @@ -53,7 +53,7 @@ default boolean isClosed() { * @return a stage that will complete when the shutdown sequence is complete. Multiple calls to * this method or {@link #forceCloseAsync()} always return the same instance. */ - @NonNull + @Nonnull CompletionStage closeAsync(); /** @@ -63,7 +63,7 @@ default boolean isClosed() { * @return a stage that will complete when the shutdown sequence is complete. Multiple calls to * this method or {@link #close()} always return the same instance. */ - @NonNull + @Nonnull CompletionStage forceCloseAsync(); /** diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/AsyncPagingIterable.java b/core/src/main/java/com/datastax/oss/driver/api/core/AsyncPagingIterable.java index fd7c5be6baa..0236dba9293 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/AsyncPagingIterable.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/AsyncPagingIterable.java @@ -20,11 +20,11 @@ import com.datastax.oss.driver.api.core.cql.ColumnDefinitions; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.internal.core.AsyncPagingIterableWrapper; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Iterator; import java.util.concurrent.CompletionStage; import java.util.function.Function; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * An iterable of elements which are fetched asynchronously by the driver, possibly in multiple @@ -33,11 +33,11 @@ public interface AsyncPagingIterable> { /** Metadata about the columns returned by the CQL request that was used to build this result. */ - @NonNull + @Nonnull ColumnDefinitions getColumnDefinitions(); /** Returns {@linkplain ExecutionInfo information about the execution} of this page of results. */ - @NonNull + @Nonnull ExecutionInfo getExecutionInfo(); /** How many rows are left before the current page is exhausted. */ @@ -50,7 +50,7 @@ public interface AsyncPagingIterableNote that this method always returns the same object, and that that object can only be * iterated once: elements are "consumed" as they are read. */ - @NonNull + @Nonnull Iterable currentPage(); /** @@ -77,7 +77,7 @@ default ElementT one() { * @throws IllegalStateException if there are no more pages. Use {@link #hasMorePages()} to check * if you can call this method. */ - @NonNull + @Nonnull CompletionStage fetchNextPage() throws IllegalStateException; /** diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/ConsistencyLevel.java b/core/src/main/java/com/datastax/oss/driver/api/core/ConsistencyLevel.java index a1b6d8006df..94591c12cc5 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/ConsistencyLevel.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/ConsistencyLevel.java @@ -17,7 +17,7 @@ */ package com.datastax.oss.driver.api.core; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * The consistency level of a request. @@ -44,7 +44,7 @@ public interface ConsistencyLevel { int getProtocolCode(); /** The textual representation of the level in configuration files. */ - @NonNull + @Nonnull String name(); /** Whether this consistency level applies to the local datacenter only. */ diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/CqlIdentifier.java b/core/src/main/java/com/datastax/oss/driver/api/core/CqlIdentifier.java index 82e4c2b30a6..e8c0f7e1d73 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/CqlIdentifier.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/CqlIdentifier.java @@ -19,11 +19,11 @@ import com.datastax.oss.driver.internal.core.util.Strings; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.io.ObjectInputStream; import java.io.Serializable; import java.util.Locale; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; /** @@ -71,8 +71,8 @@ public class CqlIdentifier implements Serializable { // One exception is named getters, where we keep raw strings with the 3.x rules. /** Creates an identifier from its {@link CqlIdentifier CQL form}. */ - @NonNull - public static CqlIdentifier fromCql(@NonNull String cql) { + @Nonnull + public static CqlIdentifier fromCql(@Nonnull String cql) { Preconditions.checkNotNull(cql, "cql must not be null"); final String internal; if (Strings.isDoubleQuoted(cql)) { @@ -86,8 +86,8 @@ public static CqlIdentifier fromCql(@NonNull String cql) { } /** Creates an identifier from its {@link CqlIdentifier internal form}. */ - @NonNull - public static CqlIdentifier fromInternal(@NonNull String internal) { + @Nonnull + public static CqlIdentifier fromInternal(@Nonnull String internal) { Preconditions.checkNotNull(internal, "internal must not be null"); return new CqlIdentifier(internal); } @@ -104,7 +104,7 @@ private CqlIdentifier(String internal) { * * @return the identifier in its exact case, unquoted. */ - @NonNull + @Nonnull public String asInternal() { return this.internal; } @@ -117,7 +117,7 @@ public String asInternal() { * {@code false}, always use the double-quoted form (this is slightly more efficient since we * don't need to inspect the string). */ - @NonNull + @Nonnull public String asCql(boolean pretty) { if (pretty) { return Strings.needsDoubleQuotes(internal) ? Strings.doubleQuote(internal) : internal; diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/CqlSession.java b/core/src/main/java/com/datastax/oss/driver/api/core/CqlSession.java index ff096719f3e..d3b5bf343df 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/CqlSession.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/CqlSession.java @@ -25,7 +25,7 @@ import com.datastax.oss.driver.api.core.cql.AsyncCqlSession; import com.datastax.oss.driver.api.core.cql.SyncCqlSession; import com.datastax.oss.driver.api.core.session.Session; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * The default session type built by the driver. @@ -63,7 +63,7 @@ public interface CqlSession * * @return {@code CqlSessionBuilder} to create a new instance. */ - @NonNull + @Nonnull static CqlSessionBuilder builder() { return new CqlSessionBuilder(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/CqlSessionBuilder.java b/core/src/main/java/com/datastax/oss/driver/api/core/CqlSessionBuilder.java index 4598c078dca..025a1dab2fc 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/CqlSessionBuilder.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/CqlSessionBuilder.java @@ -18,7 +18,7 @@ package com.datastax.oss.driver.api.core; import com.datastax.oss.driver.api.core.session.SessionBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import net.jcip.annotations.NotThreadSafe; /** @@ -30,7 +30,7 @@ public class CqlSessionBuilder extends SessionBuilder { @Override - protected CqlSession wrap(@NonNull CqlSession defaultSession) { + protected CqlSession wrap(@Nonnull CqlSession defaultSession) { return defaultSession; } } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/DefaultConsistencyLevel.java b/core/src/main/java/com/datastax/oss/driver/api/core/DefaultConsistencyLevel.java index 2e5a4a6f022..b313377b049 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/DefaultConsistencyLevel.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/DefaultConsistencyLevel.java @@ -19,8 +19,8 @@ import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; import com.datastax.oss.protocol.internal.ProtocolConstants; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.Nonnull; /** A default consistency level supported by the driver out of the box. */ public enum DefaultConsistencyLevel implements ConsistencyLevel { @@ -52,7 +52,7 @@ public int getProtocolCode() { return protocolCode; } - @NonNull + @Nonnull public static DefaultConsistencyLevel fromCode(int code) { DefaultConsistencyLevel level = BY_CODE.get(code); if (level == null) { diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/DriverException.java b/core/src/main/java/com/datastax/oss/driver/api/core/DriverException.java index f5cf76e29eb..cfc18dde879 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/DriverException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/DriverException.java @@ -19,8 +19,8 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.cql.ResultSet; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Base class for all exceptions thrown by the driver. @@ -107,6 +107,6 @@ public void setExecutionInfo(ExecutionInfo executionInfo) { * more user-friendly stack trace (that includes the line in the user code where the driver * rethrew the error). */ - @NonNull + @Nonnull public abstract DriverException copy(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/DriverExecutionException.java b/core/src/main/java/com/datastax/oss/driver/api/core/DriverExecutionException.java index 90ff875e375..5aec8be8ccb 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/DriverExecutionException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/DriverExecutionException.java @@ -19,7 +19,7 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.cql.Statement; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * Thrown by synchronous wrapper methods (such as {@link CqlSession#execute(Statement)}, when the @@ -37,7 +37,7 @@ private DriverExecutionException(ExecutionInfo executionInfo, Throwable cause) { super(null, executionInfo, cause, true); } - @NonNull + @Nonnull @Override public DriverException copy() { return new DriverExecutionException(getExecutionInfo(), getCause()); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/DriverTimeoutException.java b/core/src/main/java/com/datastax/oss/driver/api/core/DriverTimeoutException.java index 8b4cc5dc5bb..e56b10ff4b0 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/DriverTimeoutException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/DriverTimeoutException.java @@ -18,11 +18,11 @@ package com.datastax.oss.driver.api.core; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** Thrown when a driver request timed out. */ public class DriverTimeoutException extends DriverException { - public DriverTimeoutException(@NonNull String message) { + public DriverTimeoutException(@Nonnull String message) { this(message, null); } @@ -30,7 +30,7 @@ private DriverTimeoutException(String message, ExecutionInfo executionInfo) { super(message, executionInfo, null, true); } - @NonNull + @Nonnull @Override public DriverException copy() { return new DriverTimeoutException(getMessage(), getExecutionInfo()); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/InvalidKeyspaceException.java b/core/src/main/java/com/datastax/oss/driver/api/core/InvalidKeyspaceException.java index aa3f774800c..e56c2449817 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/InvalidKeyspaceException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/InvalidKeyspaceException.java @@ -18,11 +18,11 @@ package com.datastax.oss.driver.api.core; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** Thrown when a session gets created with an invalid keyspace. */ public class InvalidKeyspaceException extends DriverException { - public InvalidKeyspaceException(@NonNull String message) { + public InvalidKeyspaceException(@Nonnull String message) { this(message, null); } @@ -30,7 +30,7 @@ private InvalidKeyspaceException(String message, ExecutionInfo executionInfo) { super(message, executionInfo, null, true); } - @NonNull + @Nonnull @Override public DriverException copy() { return new InvalidKeyspaceException(getMessage(), getExecutionInfo()); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/MavenCoordinates.java b/core/src/main/java/com/datastax/oss/driver/api/core/MavenCoordinates.java index 3c3f18a5dc2..25e0bbdb6b7 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/MavenCoordinates.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/MavenCoordinates.java @@ -17,19 +17,19 @@ */ package com.datastax.oss.driver.api.core; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface MavenCoordinates { - @NonNull + @Nonnull String getGroupId(); - @NonNull + @Nonnull String getArtifactId(); - @NonNull + @Nonnull Version getVersion(); - @NonNull + @Nonnull String getName(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/NoNodeAvailableException.java b/core/src/main/java/com/datastax/oss/driver/api/core/NoNodeAvailableException.java index 9ef51fb99b6..adbb823320b 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/NoNodeAvailableException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/NoNodeAvailableException.java @@ -18,8 +18,8 @@ package com.datastax.oss.driver.api.core; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collections; +import javax.annotation.Nonnull; /** * Specialization of {@code AllNodesFailedException} when no coordinators were tried. @@ -36,7 +36,7 @@ private NoNodeAvailableException(ExecutionInfo executionInfo) { super("No node was available to execute the query", executionInfo, Collections.emptySet()); } - @NonNull + @Nonnull @Override public DriverException copy() { return new NoNodeAvailableException(getExecutionInfo()); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/NodeUnavailableException.java b/core/src/main/java/com/datastax/oss/driver/api/core/NodeUnavailableException.java index 5303119844e..0150b04acd9 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/NodeUnavailableException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/NodeUnavailableException.java @@ -18,8 +18,8 @@ package com.datastax.oss.driver.api.core; import com.datastax.oss.driver.api.core.metadata.Node; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; +import javax.annotation.Nonnull; /** * Indicates that a {@link Node} was selected in a query plan, but it had no connection available. @@ -49,13 +49,13 @@ public NodeUnavailableException(Node node) { this.node = Objects.requireNonNull(node); } - @NonNull + @Nonnull public Node getNode() { return node; } @Override - @NonNull + @Nonnull public DriverException copy() { return new NodeUnavailableException(node); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/PagingIterable.java b/core/src/main/java/com/datastax/oss/driver/api/core/PagingIterable.java index c2a81b554d0..f03baeb1a89 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/PagingIterable.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/PagingIterable.java @@ -24,13 +24,13 @@ import com.datastax.oss.driver.internal.core.cql.PagingIterableSpliterator; import com.datastax.oss.driver.shaded.guava.common.collect.Iterables; import com.datastax.oss.driver.shaded.guava.common.collect.Lists; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Spliterator; import java.util.function.Function; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * An iterable of elements which are fetched synchronously by the driver, possibly in multiple @@ -51,7 +51,7 @@ public interface PagingIterable extends Iterable { /** Metadata about the columns returned by the CQL request that was used to build this result. */ - @NonNull + @Nonnull ColumnDefinitions getColumnDefinitions(); /** @@ -65,7 +65,7 @@ public interface PagingIterable extends Iterable { * * @see #getExecutionInfos() */ - @NonNull + @Nonnull default ExecutionInfo getExecutionInfo() { List infos = getExecutionInfos(); return infos.get(infos.size() - 1); @@ -78,7 +78,7 @@ default ExecutionInfo getExecutionInfo() { *

This will have multiple elements if the query is paged, since the driver performs blocking * background queries to fetch additional pages transparently as the result set is being iterated. */ - @NonNull + @Nonnull List getExecutionInfos(); /** @@ -103,7 +103,7 @@ default ElementT one() { * Therefore it is crucial to only call this method for queries that are known to return a * reasonable number of results. */ - @NonNull + @Nonnull @SuppressWarnings("MixedMutabilityReturnType") default List all() { if (!iterator().hasNext()) { @@ -159,7 +159,7 @@ default List all() { *

Note that both instances share the same underlying data: consuming elements from the * transformed iterable will also consume them from this object, and vice-versa. */ - @NonNull + @Nonnull default PagingIterable map( Function elementMapper) { return new PagingIterableWrapper<>(this, elementMapper); @@ -178,7 +178,7 @@ default PagingIterable map( * iterable should not be consumed through calls to other methods such as {@link * #iterator()}, {@link #one()} or {@link #all()}; doing so will result in unpredictable results. */ - @NonNull + @Nonnull @Override default Spliterator spliterator() { return new PagingIterableSpliterator<>(this); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/ProtocolVersion.java b/core/src/main/java/com/datastax/oss/driver/api/core/ProtocolVersion.java index dd69f705453..53bf83f56ed 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/ProtocolVersion.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/ProtocolVersion.java @@ -19,7 +19,7 @@ import com.datastax.dse.driver.api.core.DseProtocolVersion; import com.datastax.oss.driver.api.core.detach.Detachable; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * A version of the native protocol used by the driver to communicate with the server. @@ -48,7 +48,7 @@ public interface ProtocolVersion { int getCode(); /** A string representation of the version. */ - @NonNull + @Nonnull String name(); /** diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/RequestThrottlingException.java b/core/src/main/java/com/datastax/oss/driver/api/core/RequestThrottlingException.java index acf569d55f6..1cc16916cca 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/RequestThrottlingException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/RequestThrottlingException.java @@ -18,7 +18,7 @@ package com.datastax.oss.driver.api.core; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * Thrown if the session uses a request throttler, and it didn't allow the current request to @@ -29,7 +29,7 @@ */ public class RequestThrottlingException extends DriverException { - public RequestThrottlingException(@NonNull String message) { + public RequestThrottlingException(@Nonnull String message) { this(message, null); } @@ -37,7 +37,7 @@ private RequestThrottlingException(String message, ExecutionInfo executionInfo) super(message, executionInfo, null, true); } - @NonNull + @Nonnull @Override public DriverException copy() { return new RequestThrottlingException(getMessage(), getExecutionInfo()); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/UnsupportedProtocolVersionException.java b/core/src/main/java/com/datastax/oss/driver/api/core/UnsupportedProtocolVersionException.java index 030984dc274..e735bfb2a09 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/UnsupportedProtocolVersionException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/UnsupportedProtocolVersionException.java @@ -20,10 +20,10 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.metadata.EndPoint; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Collections; import java.util.List; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Indicates that we've attempted to connect to a Cassandra node with a protocol version that it @@ -39,18 +39,18 @@ public class UnsupportedProtocolVersionException extends DriverException { private final EndPoint endPoint; private final List attemptedVersions; - @NonNull + @Nonnull public static UnsupportedProtocolVersionException forSingleAttempt( - @NonNull EndPoint endPoint, @NonNull ProtocolVersion attemptedVersion) { + @Nonnull EndPoint endPoint, @Nonnull ProtocolVersion attemptedVersion) { String message = String.format("[%s] Host does not support protocol version %s", endPoint, attemptedVersion); return new UnsupportedProtocolVersionException( endPoint, message, Collections.singletonList(attemptedVersion), null); } - @NonNull + @Nonnull public static UnsupportedProtocolVersionException forNegotiation( - @NonNull EndPoint endPoint, @NonNull List attemptedVersions) { + @Nonnull EndPoint endPoint, @Nonnull List attemptedVersions) { String message = String.format( "[%s] Protocol negotiation failed: could not find a common version (attempted: %s). " @@ -62,8 +62,8 @@ public static UnsupportedProtocolVersionException forNegotiation( public UnsupportedProtocolVersionException( @Nullable EndPoint endPoint, // technically nullable, but should never be in real life - @NonNull String message, - @NonNull List attemptedVersions) { + @Nonnull String message, + @Nonnull List attemptedVersions) { this(endPoint, message, attemptedVersions, null); } @@ -84,12 +84,12 @@ public EndPoint getEndPoint() { } /** The versions that were attempted. */ - @NonNull + @Nonnull public List getAttemptedVersions() { return attemptedVersions; } - @NonNull + @Nonnull @Override public DriverException copy() { return new UnsupportedProtocolVersionException( diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/Version.java b/core/src/main/java/com/datastax/oss/driver/api/core/Version.java index cc4931fe2fa..a6fbbccf471 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/Version.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/Version.java @@ -17,8 +17,6 @@ */ package com.datastax.oss.driver.api.core; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.Serializable; import java.util.Arrays; import java.util.Collections; @@ -26,6 +24,8 @@ import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; /** @@ -48,13 +48,13 @@ public class Version implements Comparable, Serializable { private static final Pattern pattern = Pattern.compile(VERSION_REGEXP); - @NonNull public static final Version V2_1_0 = Objects.requireNonNull(parse("2.1.0")); - @NonNull public static final Version V2_2_0 = Objects.requireNonNull(parse("2.2.0")); - @NonNull public static final Version V3_0_0 = Objects.requireNonNull(parse("3.0.0")); - @NonNull public static final Version V4_0_0 = Objects.requireNonNull(parse("4.0.0")); - @NonNull public static final Version V5_0_0 = Objects.requireNonNull(parse("5.0.0")); - @NonNull public static final Version V6_7_0 = Objects.requireNonNull(parse("6.7.0")); - @NonNull public static final Version V6_8_0 = Objects.requireNonNull(parse("6.8.0")); + @Nonnull public static final Version V2_1_0 = Objects.requireNonNull(parse("2.1.0")); + @Nonnull public static final Version V2_2_0 = Objects.requireNonNull(parse("2.2.0")); + @Nonnull public static final Version V3_0_0 = Objects.requireNonNull(parse("3.0.0")); + @Nonnull public static final Version V4_0_0 = Objects.requireNonNull(parse("4.0.0")); + @Nonnull public static final Version V5_0_0 = Objects.requireNonNull(parse("5.0.0")); + @Nonnull public static final Version V6_7_0 = Objects.requireNonNull(parse("6.7.0")); + @Nonnull public static final Version V6_8_0 = Objects.requireNonNull(parse("6.8.0")); private final int major; private final int minor; @@ -206,7 +206,7 @@ public Version nextStable() { } @Override - public int compareTo(@NonNull Version other) { + public int compareTo(@Nonnull Version other) { if (major < other.major) { return -1; } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/addresstranslation/AddressTranslator.java b/core/src/main/java/com/datastax/oss/driver/api/core/addresstranslation/AddressTranslator.java index 47ce62f1461..cbbe62b054b 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/addresstranslation/AddressTranslator.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/addresstranslation/AddressTranslator.java @@ -17,8 +17,8 @@ */ package com.datastax.oss.driver.api.core.addresstranslation; -import edu.umd.cs.findbugs.annotations.NonNull; import java.net.InetSocketAddress; +import javax.annotation.Nonnull; /** * Translates IP addresses received from Cassandra nodes into locally queriable addresses. @@ -43,8 +43,8 @@ public interface AddressTranslator extends AutoCloseable { * Translates an address reported by a Cassandra node into the address that the driver will use to * connect. */ - @NonNull - InetSocketAddress translate(@NonNull InetSocketAddress address); + @Nonnull + InetSocketAddress translate(@Nonnull InetSocketAddress address); /** Called when the cluster that this translator is associated with closes. */ @Override diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/auth/AuthProvider.java b/core/src/main/java/com/datastax/oss/driver/api/core/auth/AuthProvider.java index c73c3e4fb67..8ebf3484cf5 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/auth/AuthProvider.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/auth/AuthProvider.java @@ -20,7 +20,7 @@ import com.datastax.oss.driver.api.core.connection.ReconnectionPolicy; import com.datastax.oss.driver.api.core.metadata.EndPoint; import com.datastax.oss.driver.internal.core.auth.PlainTextAuthProvider; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * Provides {@link Authenticator} instances to use when connecting to Cassandra nodes. @@ -37,8 +37,8 @@ public interface AuthProvider extends AutoCloseable { * @param serverAuthenticator the configured authenticator on the host. * @return the authentication implementation to use. */ - @NonNull - Authenticator newAuthenticator(@NonNull EndPoint endPoint, @NonNull String serverAuthenticator) + @Nonnull + Authenticator newAuthenticator(@Nonnull EndPoint endPoint, @Nonnull String serverAuthenticator) throws AuthenticationException; /** @@ -57,5 +57,5 @@ Authenticator newAuthenticator(@NonNull EndPoint endPoint, @NonNull String serve * will be retried according to the {@link ReconnectionPolicy}). * */ - void onMissingChallenge(@NonNull EndPoint endPoint) throws AuthenticationException; + void onMissingChallenge(@Nonnull EndPoint endPoint) throws AuthenticationException; } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/auth/AuthenticationException.java b/core/src/main/java/com/datastax/oss/driver/api/core/auth/AuthenticationException.java index 28dde2123cb..d06cc55b626 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/auth/AuthenticationException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/auth/AuthenticationException.java @@ -19,8 +19,8 @@ import com.datastax.oss.driver.api.core.AllNodesFailedException; import com.datastax.oss.driver.api.core.metadata.EndPoint; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Indicates an error during the authentication phase while connecting to a node. @@ -34,18 +34,18 @@ public class AuthenticationException extends RuntimeException { private final EndPoint endPoint; - public AuthenticationException(@NonNull EndPoint endPoint, @NonNull String message) { + public AuthenticationException(@Nonnull EndPoint endPoint, @Nonnull String message) { this(endPoint, message, null); } public AuthenticationException( - @NonNull EndPoint endPoint, @NonNull String message, @Nullable Throwable cause) { + @Nonnull EndPoint endPoint, @Nonnull String message, @Nullable Throwable cause) { super(String.format("Authentication error on node %s: %s", endPoint, message), cause); this.endPoint = endPoint; } /** The address of the node that encountered the error. */ - @NonNull + @Nonnull public EndPoint getEndPoint() { return endPoint; } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/auth/Authenticator.java b/core/src/main/java/com/datastax/oss/driver/api/core/auth/Authenticator.java index 150a1dfb63f..5950328bebf 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/auth/Authenticator.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/auth/Authenticator.java @@ -17,10 +17,10 @@ */ package com.datastax.oss.driver.api.core.auth; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Handles SASL authentication with Cassandra servers. @@ -65,7 +65,7 @@ public interface Authenticator { * Alternatively, if the contents are not sensitive, you can make the buffer {@linkplain * ByteBuffer#asReadOnlyBuffer() read-only} and safely reuse it. */ - @NonNull + @Nonnull CompletionStage initialResponse(); /** @@ -80,7 +80,7 @@ public interface Authenticator { * Alternatively, if the contents are not sensitive, you can make the buffer {@linkplain * ByteBuffer#asReadOnlyBuffer() read-only} and safely reuse it. */ - @NonNull + @Nonnull CompletionStage evaluateChallenge(@Nullable ByteBuffer challenge); /** @@ -93,6 +93,6 @@ public interface Authenticator { * @return a completion stage that completes when the authenticator is done processing this * response. */ - @NonNull + @Nonnull CompletionStage onAuthenticationSuccess(@Nullable ByteBuffer token); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/auth/PlainTextAuthProviderBase.java b/core/src/main/java/com/datastax/oss/driver/api/core/auth/PlainTextAuthProviderBase.java index fb85797af9e..dad7405b7df 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/auth/PlainTextAuthProviderBase.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/auth/PlainTextAuthProviderBase.java @@ -21,8 +21,6 @@ import com.datastax.oss.driver.api.core.metadata.EndPoint; import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.shaded.guava.common.base.Charsets; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.net.InetSocketAddress; import java.net.SocketAddress; import java.nio.ByteBuffer; @@ -30,6 +28,8 @@ import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +53,7 @@ public abstract class PlainTextAuthProviderBase implements AuthProvider { * when you have multiple driver instances executing in the same JVM). Built-in * implementations fill this with {@link Session#getName()}. */ - protected PlainTextAuthProviderBase(@NonNull String logPrefix) { + protected PlainTextAuthProviderBase(@Nonnull String logPrefix) { this.logPrefix = Objects.requireNonNull(logPrefix); } @@ -65,21 +65,21 @@ protected PlainTextAuthProviderBase(@NonNull String logPrefix) { * @param endPoint The endpoint being contacted. * @param serverAuthenticator The authenticator class sent by the endpoint. */ - @NonNull + @Nonnull protected abstract Credentials getCredentials( - @NonNull EndPoint endPoint, @NonNull String serverAuthenticator); + @Nonnull EndPoint endPoint, @Nonnull String serverAuthenticator); - @NonNull + @Nonnull @Override public Authenticator newAuthenticator( - @NonNull EndPoint endPoint, @NonNull String serverAuthenticator) + @Nonnull EndPoint endPoint, @Nonnull String serverAuthenticator) throws AuthenticationException { return new PlainTextAuthenticator( getCredentials(endPoint, serverAuthenticator), endPoint, serverAuthenticator); } @Override - public void onMissingChallenge(@NonNull EndPoint endPoint) { + public void onMissingChallenge(@Nonnull EndPoint endPoint) { LOG.warn( "[{}] {} did not send an authentication challenge; " + "This is suspicious because the driver expects authentication", @@ -106,18 +106,18 @@ public static class Credentials { * Cassandra, the authorizationId will be ignored. */ public Credentials( - @NonNull char[] username, @NonNull char[] password, @NonNull char[] authorizationId) { + @Nonnull char[] username, @Nonnull char[] password, @Nonnull char[] authorizationId) { this.username = Objects.requireNonNull(username); this.password = Objects.requireNonNull(password); this.authorizationId = Objects.requireNonNull(authorizationId); } /** Builds an instance for simple username/password authentication. */ - public Credentials(@NonNull char[] username, @NonNull char[] password) { + public Credentials(@Nonnull char[] username, @Nonnull char[] password) { this(username, password, new char[0]); } - @NonNull + @Nonnull public char[] getUsername() { return username; } @@ -127,17 +127,17 @@ public char[] getUsername() { * #getUsername()}, which should be used instead. */ @Deprecated - @NonNull + @Nonnull public char[] getAuthenticationId() { return username; } - @NonNull + @Nonnull public char[] getPassword() { return password; } - @NonNull + @Nonnull public char[] getAuthorizationId() { return authorizationId; } @@ -165,13 +165,13 @@ protected static class PlainTextAuthenticator extends BaseDseAuthenticator { private static final EndPoint DUMMY_END_POINT = new EndPoint() { - @NonNull + @Nonnull @Override public SocketAddress resolve() { return new InetSocketAddress("127.0.0.1", 9042); } - @NonNull + @Nonnull @Override public String asMetricPrefix() { return ""; // will never be used @@ -182,9 +182,9 @@ public String asMetricPrefix() { private final EndPoint endPoint; protected PlainTextAuthenticator( - @NonNull Credentials credentials, - @NonNull EndPoint endPoint, - @NonNull String serverAuthenticator) { + @Nonnull Credentials credentials, + @Nonnull EndPoint endPoint, + @Nonnull String serverAuthenticator) { super(serverAuthenticator); Objects.requireNonNull(credentials); @@ -216,7 +216,7 @@ protected PlainTextAuthenticator( * constructor {@code PlainTextAuthenticator(Credentials, EndPoint, String)} instead. */ @Deprecated - protected PlainTextAuthenticator(@NonNull Credentials credentials) { + protected PlainTextAuthenticator(@Nonnull Credentials credentials) { this( credentials, // It's unlikely that this class was ever extended by third parties, but if it was, assume @@ -240,13 +240,13 @@ private static void clear(ByteBuffer buffer) { } } - @NonNull + @Nonnull @Override public ByteBuffer getMechanism() { return MECHANISM; } - @NonNull + @Nonnull @Override public ByteBuffer getInitialServerChallenge() { return SERVER_INITIAL_CHALLENGE; diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/auth/ProgrammaticPlainTextAuthProvider.java b/core/src/main/java/com/datastax/oss/driver/api/core/auth/ProgrammaticPlainTextAuthProvider.java index d991f5c5cb5..c471ff34192 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/auth/ProgrammaticPlainTextAuthProvider.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/auth/ProgrammaticPlainTextAuthProvider.java @@ -20,8 +20,8 @@ import com.datastax.oss.driver.api.core.metadata.EndPoint; import com.datastax.oss.driver.api.core.session.SessionBuilder; import com.datastax.oss.driver.internal.core.util.Strings; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; /** @@ -61,7 +61,7 @@ public class ProgrammaticPlainTextAuthProvider extends PlainTextAuthProviderBase private volatile char[] authorizationId; /** Builds an instance for simple username/password authentication. */ - public ProgrammaticPlainTextAuthProvider(@NonNull String username, @NonNull String password) { + public ProgrammaticPlainTextAuthProvider(@Nonnull String username, @Nonnull String password) { this(username, password, ""); } @@ -74,7 +74,7 @@ public ProgrammaticPlainTextAuthProvider(@NonNull String username, @NonNull Stri * authorizationId to an empty string. */ public ProgrammaticPlainTextAuthProvider( - @NonNull String username, @NonNull String password, @NonNull String authorizationId) { + @Nonnull String username, @Nonnull String password, @Nonnull String authorizationId) { // This will typically be built before the session so we don't know the log prefix yet. Pass an // empty string, it's only used in one log message. super(""); @@ -91,7 +91,7 @@ public ProgrammaticPlainTextAuthProvider( * * @param username the new name. */ - public void setUsername(@NonNull String username) { + public void setUsername(@Nonnull String username) { this.username = Strings.requireNotEmpty(username, "username").toCharArray(); } @@ -102,7 +102,7 @@ public void setUsername(@NonNull String username) { * * @param password the new password. */ - public void setPassword(@NonNull String password) { + public void setPassword(@Nonnull String password) { this.password = Strings.requireNotEmpty(password, "password").toCharArray(); } @@ -116,7 +116,7 @@ public void setPassword(@NonNull String password) { * * @param authorizationId the new authorization id. */ - public void setAuthorizationId(@NonNull String authorizationId) { + public void setAuthorizationId(@Nonnull String authorizationId) { this.authorizationId = Objects.requireNonNull(authorizationId, "authorizationId cannot be null").toCharArray(); } @@ -127,10 +127,10 @@ public void setAuthorizationId(@NonNull String authorizationId) { *

This implementation disregards the endpoint being connected to as well as the authenticator * class sent by the server, and always returns the same credentials. */ - @NonNull + @Nonnull @Override protected Credentials getCredentials( - @NonNull EndPoint endPoint, @NonNull String serverAuthenticator) { + @Nonnull EndPoint endPoint, @Nonnull String serverAuthenticator) { return new Credentials(username.clone(), password.clone(), authorizationId.clone()); } } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/auth/SyncAuthenticator.java b/core/src/main/java/com/datastax/oss/driver/api/core/auth/SyncAuthenticator.java index 016ac25680b..d8535601bc1 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/auth/SyncAuthenticator.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/auth/SyncAuthenticator.java @@ -18,10 +18,10 @@ package com.datastax.oss.driver.api.core.auth; import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * An authenticator that performs all of its operations synchronously, on the calling thread. @@ -76,19 +76,19 @@ public interface SyncAuthenticator extends Authenticator { */ void onAuthenticationSuccessSync(@Nullable ByteBuffer token); - @NonNull + @Nonnull @Override default CompletionStage initialResponse() { return CompletableFutures.wrap(this::initialResponseSync); } - @NonNull + @Nonnull @Override default CompletionStage evaluateChallenge(@Nullable ByteBuffer challenge) { return CompletableFutures.wrap(() -> evaluateChallengeSync(challenge)); } - @NonNull + @Nonnull @Override default CompletionStage onAuthenticationSuccess(@Nullable ByteBuffer token) { return CompletableFutures.wrap( diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/config/DefaultDriverOption.java b/core/src/main/java/com/datastax/oss/driver/api/core/config/DefaultDriverOption.java index 4c0668570b2..678afcdb168 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/config/DefaultDriverOption.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/config/DefaultDriverOption.java @@ -17,7 +17,7 @@ */ package com.datastax.oss.driver.api.core.config; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * Built-in driver options for the core driver. @@ -984,7 +984,7 @@ public enum DefaultDriverOption implements DriverOption { this.path = path; } - @NonNull + @Nonnull @Override public String getPath() { return path; diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverConfig.java b/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverConfig.java index 88519c82a22..b71733e9620 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverConfig.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverConfig.java @@ -17,8 +17,8 @@ */ package com.datastax.oss.driver.api.core.config; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.Nonnull; /** * The configuration of the driver. @@ -34,16 +34,16 @@ public interface DriverConfig { * Alias to get the default profile, which is stored under the name {@link * DriverExecutionProfile#DEFAULT_NAME} and always present. */ - @NonNull + @Nonnull default DriverExecutionProfile getDefaultProfile() { return getProfile(DriverExecutionProfile.DEFAULT_NAME); } /** @throws IllegalArgumentException if there is no profile with this name. */ - @NonNull - DriverExecutionProfile getProfile(@NonNull String profileName); + @Nonnull + DriverExecutionProfile getProfile(@Nonnull String profileName); /** Returns an immutable view of all named profiles (including the default profile). */ - @NonNull + @Nonnull Map getProfiles(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverConfigLoader.java b/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverConfigLoader.java index 15fae232d17..ede3934c435 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverConfigLoader.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverConfigLoader.java @@ -23,11 +23,11 @@ import com.datastax.oss.driver.internal.core.config.map.MapBasedDriverConfigLoader; import com.datastax.oss.driver.internal.core.config.typesafe.DefaultDriverConfigLoader; import com.datastax.oss.driver.internal.core.config.typesafe.DefaultProgrammaticDriverConfigLoaderBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.File; import java.net.URL; import java.nio.file.Path; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; /** * Manages the initialization, and optionally the periodic reloading, of the driver configuration. @@ -45,8 +45,8 @@ public interface DriverConfigLoader extends AutoCloseable { *

The returned loader will honor the reload interval defined by the option {@code * basic.config-reload-interval}. */ - @NonNull - static DriverConfigLoader fromDefaults(@NonNull ClassLoader appClassLoader) { + @Nonnull + static DriverConfigLoader fromDefaults(@Nonnull ClassLoader appClassLoader) { return new DefaultDriverConfigLoader(appClassLoader); } @@ -77,8 +77,8 @@ static DriverConfigLoader fromDefaults(@NonNull ClassLoader appClassLoader) { *

The returned loader will honor the reload interval defined by the option {@code * basic.config-reload-interval}. */ - @NonNull - static DriverConfigLoader fromClasspath(@NonNull String resourceBaseName) { + @Nonnull + static DriverConfigLoader fromClasspath(@Nonnull String resourceBaseName) { return fromClasspath(resourceBaseName, Thread.currentThread().getContextClassLoader()); } @@ -87,9 +87,9 @@ static DriverConfigLoader fromClasspath(@NonNull String resourceBaseName) { * resources will be located using the provided {@link ClassLoader} instead of {@linkplain * Thread#getContextClassLoader() the current thread's context class loader}. */ - @NonNull + @Nonnull static DriverConfigLoader fromClasspath( - @NonNull String resourceBaseName, @NonNull ClassLoader appClassLoader) { + @Nonnull String resourceBaseName, @Nonnull ClassLoader appClassLoader) { return DefaultDriverConfigLoader.fromClasspath(resourceBaseName, appClassLoader); } @@ -113,8 +113,8 @@ static DriverConfigLoader fromClasspath( *

The returned loader will honor the reload interval defined by the option {@code * basic.config-reload-interval}. */ - @NonNull - static DriverConfigLoader fromPath(@NonNull Path file) { + @Nonnull + static DriverConfigLoader fromPath(@Nonnull Path file) { return fromFile(file.toFile()); } @@ -138,8 +138,8 @@ static DriverConfigLoader fromPath(@NonNull Path file) { *

The returned loader will honor the reload interval defined by the option {@code * basic.config-reload-interval}. */ - @NonNull - static DriverConfigLoader fromFile(@NonNull File file) { + @Nonnull + static DriverConfigLoader fromFile(@Nonnull File file) { return DefaultDriverConfigLoader.fromFile(file); } @@ -163,8 +163,8 @@ static DriverConfigLoader fromFile(@NonNull File file) { *

The returned loader will honor the reload interval defined by the option {@code * basic.config-reload-interval}. */ - @NonNull - static DriverConfigLoader fromUrl(@NonNull URL url) { + @Nonnull + static DriverConfigLoader fromUrl(@Nonnull URL url) { return DefaultDriverConfigLoader.fromUrl(url); } @@ -193,8 +193,8 @@ static DriverConfigLoader fromUrl(@NonNull URL url) { * *

This loader does not support runtime reloading. */ - @NonNull - static DriverConfigLoader fromString(@NonNull String contents) { + @Nonnull + static DriverConfigLoader fromString(@Nonnull String contents) { return DefaultDriverConfigLoader.fromString(contents); } @@ -261,7 +261,7 @@ static DriverConfigLoader fromString(@NonNull String contents) { * * @see #fromMap(OptionsMap) */ - @NonNull + @Nonnull static ProgrammaticDriverConfigLoaderBuilder programmaticBuilder() { return new DefaultProgrammaticDriverConfigLoaderBuilder(); } @@ -271,9 +271,9 @@ static ProgrammaticDriverConfigLoaderBuilder programmaticBuilder() { * will be located using the provided {@link ClassLoader} instead of {@linkplain * Thread#getContextClassLoader() the current thread's context class loader}. */ - @NonNull + @Nonnull static ProgrammaticDriverConfigLoaderBuilder programmaticBuilder( - @NonNull ClassLoader appClassLoader) { + @Nonnull ClassLoader appClassLoader) { return new DefaultProgrammaticDriverConfigLoaderBuilder(appClassLoader); } @@ -310,8 +310,8 @@ static ProgrammaticDriverConfigLoaderBuilder programmaticBuilder( * * @since 4.6.0 */ - @NonNull - static DriverConfigLoader fromMap(@NonNull OptionsMap source) { + @Nonnull + static DriverConfigLoader fromMap(@Nonnull OptionsMap source) { return new MapBasedDriverConfigLoader(source, source.asRawMap()); } @@ -330,10 +330,10 @@ static DriverConfigLoader fromMap(@NonNull OptionsMap source) { * if nothing is. If the input loaders have periodic reloading built-in, each one will reload at * its own pace, and the changes will be reflected in the new config. */ - @NonNull + @Nonnull static DriverConfigLoader compose( - @NonNull DriverConfigLoader primaryConfigLoader, - @NonNull DriverConfigLoader fallbackConfigLoader) { + @Nonnull DriverConfigLoader primaryConfigLoader, + @Nonnull DriverConfigLoader fallbackConfigLoader) { return new CompositeDriverConfigLoader(primaryConfigLoader, fallbackConfigLoader); } @@ -343,14 +343,14 @@ static DriverConfigLoader compose( *

If this loader {@linkplain #supportsReloading() supports reloading}, this object should be * mutable and reflect later changes when the configuration gets reloaded. */ - @NonNull + @Nonnull DriverConfig getInitialConfig(); /** * Called when the driver initializes. For loaders that periodically check for configuration * updates, this is a good time to grab an internal executor and schedule a recurring task. */ - void onDriverInit(@NonNull DriverContext context); + void onDriverInit(@Nonnull DriverContext context); /** * Triggers an immediate reload attempt and returns a stage that completes once the attempt is @@ -366,7 +366,7 @@ static DriverConfigLoader compose( * immediately with an {@link UnsupportedOperationException}. The default implementation of this * interface does support programmatic reloading however, and never returns a failed stage. */ - @NonNull + @Nonnull CompletionStage reload(); /** diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverExecutionProfile.java b/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverExecutionProfile.java index 89c28f0f521..d153556d474 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverExecutionProfile.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverExecutionProfile.java @@ -19,12 +19,12 @@ import com.datastax.oss.driver.internal.core.config.DerivedExecutionProfile; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.time.Duration; import java.util.List; import java.util.Map; import java.util.SortedSet; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A profile in the driver's configuration. @@ -56,93 +56,93 @@ public interface DriverExecutionProfile extends OngoingConfigOptionsDerived profiles inherit the name of their parent. */ - @NonNull + @Nonnull String getName(); - boolean isDefined(@NonNull DriverOption option); + boolean isDefined(@Nonnull DriverOption option); - boolean getBoolean(@NonNull DriverOption option); + boolean getBoolean(@Nonnull DriverOption option); - default boolean getBoolean(@NonNull DriverOption option, boolean defaultValue) { + default boolean getBoolean(@Nonnull DriverOption option, boolean defaultValue) { return isDefined(option) ? getBoolean(option) : defaultValue; } - @NonNull - List getBooleanList(@NonNull DriverOption option); + @Nonnull + List getBooleanList(@Nonnull DriverOption option); @Nullable default List getBooleanList( - @NonNull DriverOption option, @Nullable List defaultValue) { + @Nonnull DriverOption option, @Nullable List defaultValue) { return isDefined(option) ? getBooleanList(option) : defaultValue; } - int getInt(@NonNull DriverOption option); + int getInt(@Nonnull DriverOption option); - default int getInt(@NonNull DriverOption option, int defaultValue) { + default int getInt(@Nonnull DriverOption option, int defaultValue) { return isDefined(option) ? getInt(option) : defaultValue; } - @NonNull - List getIntList(@NonNull DriverOption option); + @Nonnull + List getIntList(@Nonnull DriverOption option); @Nullable default List getIntList( - @NonNull DriverOption option, @Nullable List defaultValue) { + @Nonnull DriverOption option, @Nullable List defaultValue) { return isDefined(option) ? getIntList(option) : defaultValue; } - long getLong(@NonNull DriverOption option); + long getLong(@Nonnull DriverOption option); - default long getLong(@NonNull DriverOption option, long defaultValue) { + default long getLong(@Nonnull DriverOption option, long defaultValue) { return isDefined(option) ? getLong(option) : defaultValue; } - @NonNull - List getLongList(@NonNull DriverOption option); + @Nonnull + List getLongList(@Nonnull DriverOption option); @Nullable - default List getLongList(@NonNull DriverOption option, @Nullable List defaultValue) { + default List getLongList(@Nonnull DriverOption option, @Nullable List defaultValue) { return isDefined(option) ? getLongList(option) : defaultValue; } - double getDouble(@NonNull DriverOption option); + double getDouble(@Nonnull DriverOption option); - default double getDouble(@NonNull DriverOption option, double defaultValue) { + default double getDouble(@Nonnull DriverOption option, double defaultValue) { return isDefined(option) ? getDouble(option) : defaultValue; } - @NonNull - List getDoubleList(@NonNull DriverOption option); + @Nonnull + List getDoubleList(@Nonnull DriverOption option); @Nullable default List getDoubleList( - @NonNull DriverOption option, @Nullable List defaultValue) { + @Nonnull DriverOption option, @Nullable List defaultValue) { return isDefined(option) ? getDoubleList(option) : defaultValue; } - @NonNull - String getString(@NonNull DriverOption option); + @Nonnull + String getString(@Nonnull DriverOption option); @Nullable - default String getString(@NonNull DriverOption option, @Nullable String defaultValue) { + default String getString(@Nonnull DriverOption option, @Nullable String defaultValue) { return isDefined(option) ? getString(option) : defaultValue; } - @NonNull - List getStringList(@NonNull DriverOption option); + @Nonnull + List getStringList(@Nonnull DriverOption option); @Nullable default List getStringList( - @NonNull DriverOption option, @Nullable List defaultValue) { + @Nonnull DriverOption option, @Nullable List defaultValue) { return isDefined(option) ? getStringList(option) : defaultValue; } - @NonNull - Map getStringMap(@NonNull DriverOption option); + @Nonnull + Map getStringMap(@Nonnull DriverOption option); @Nullable default Map getStringMap( - @NonNull DriverOption option, @Nullable Map defaultValue) { + @Nonnull DriverOption option, @Nullable Map defaultValue) { return isDefined(option) ? getStringMap(option) : defaultValue; } @@ -151,14 +151,14 @@ default Map getStringMap( * implementations want to allow users to provide sizes in a more human-readable way, for * example "256 MB". */ - long getBytes(@NonNull DriverOption option); + long getBytes(@Nonnull DriverOption option); - default long getBytes(@NonNull DriverOption option, long defaultValue) { + default long getBytes(@Nonnull DriverOption option, long defaultValue) { return isDefined(option) ? getBytes(option) : defaultValue; } /** @see #getBytes(DriverOption) */ - @NonNull + @Nonnull List getBytesList(DriverOption option); @Nullable @@ -166,20 +166,20 @@ default List getBytesList(DriverOption option, @Nullable List defaul return isDefined(option) ? getBytesList(option) : defaultValue; } - @NonNull - Duration getDuration(@NonNull DriverOption option); + @Nonnull + Duration getDuration(@Nonnull DriverOption option); @Nullable - default Duration getDuration(@NonNull DriverOption option, @Nullable Duration defaultValue) { + default Duration getDuration(@Nonnull DriverOption option, @Nullable Duration defaultValue) { return isDefined(option) ? getDuration(option) : defaultValue; } - @NonNull - List getDurationList(@NonNull DriverOption option); + @Nonnull + List getDurationList(@Nonnull DriverOption option); @Nullable default List getDurationList( - @NonNull DriverOption option, @Nullable List defaultValue) { + @Nonnull DriverOption option, @Nullable List defaultValue) { return isDefined(option) ? getDurationList(option) : defaultValue; } @@ -196,8 +196,8 @@ default List getDurationList( * default implementation builds a map based on the entries from {@link #entrySet()}, it should be * good for most cases. */ - @NonNull - default Object getComparisonKey(@NonNull DriverOption option) { + @Nonnull + default Object getComparisonKey(@Nonnull DriverOption option) { // This method is only used during driver initialization, performance is not crucial String prefix = option.getPath(); ImmutableMap.Builder childOptions = ImmutableMap.builder(); @@ -219,111 +219,111 @@ default Object getComparisonKey(@NonNull DriverOption option) { * possible types are {@code String}, {@code Number}, {@code Boolean}, {@code Map}, * {@code List}, or {@code null}. */ - @NonNull + @Nonnull SortedSet> entrySet(); - @NonNull + @Nonnull @Override - default DriverExecutionProfile withBoolean(@NonNull DriverOption option, boolean value) { + default DriverExecutionProfile withBoolean(@Nonnull DriverOption option, boolean value) { return DerivedExecutionProfile.with(this, option, value); } - @NonNull + @Nonnull @Override default DriverExecutionProfile withBooleanList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return DerivedExecutionProfile.with(this, option, value); } - @NonNull + @Nonnull @Override - default DriverExecutionProfile withInt(@NonNull DriverOption option, int value) { + default DriverExecutionProfile withInt(@Nonnull DriverOption option, int value) { return DerivedExecutionProfile.with(this, option, value); } - @NonNull + @Nonnull @Override default DriverExecutionProfile withIntList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return DerivedExecutionProfile.with(this, option, value); } - @NonNull + @Nonnull @Override - default DriverExecutionProfile withLong(@NonNull DriverOption option, long value) { + default DriverExecutionProfile withLong(@Nonnull DriverOption option, long value) { return DerivedExecutionProfile.with(this, option, value); } - @NonNull + @Nonnull @Override default DriverExecutionProfile withLongList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return DerivedExecutionProfile.with(this, option, value); } - @NonNull + @Nonnull @Override - default DriverExecutionProfile withDouble(@NonNull DriverOption option, double value) { + default DriverExecutionProfile withDouble(@Nonnull DriverOption option, double value) { return DerivedExecutionProfile.with(this, option, value); } - @NonNull + @Nonnull @Override default DriverExecutionProfile withDoubleList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return DerivedExecutionProfile.with(this, option, value); } - @NonNull + @Nonnull @Override - default DriverExecutionProfile withString(@NonNull DriverOption option, @NonNull String value) { + default DriverExecutionProfile withString(@Nonnull DriverOption option, @Nonnull String value) { return DerivedExecutionProfile.with(this, option, value); } - @NonNull + @Nonnull @Override default DriverExecutionProfile withStringList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return DerivedExecutionProfile.with(this, option, value); } - @NonNull + @Nonnull @Override default DriverExecutionProfile withStringMap( - @NonNull DriverOption option, @NonNull Map value) { + @Nonnull DriverOption option, @Nonnull Map value) { return DerivedExecutionProfile.with(this, option, value); } - @NonNull + @Nonnull @Override - default DriverExecutionProfile withBytes(@NonNull DriverOption option, long value) { + default DriverExecutionProfile withBytes(@Nonnull DriverOption option, long value) { return DerivedExecutionProfile.with(this, option, value); } - @NonNull + @Nonnull @Override default DriverExecutionProfile withBytesList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return DerivedExecutionProfile.with(this, option, value); } - @NonNull + @Nonnull @Override default DriverExecutionProfile withDuration( - @NonNull DriverOption option, @NonNull Duration value) { + @Nonnull DriverOption option, @Nonnull Duration value) { return DerivedExecutionProfile.with(this, option, value); } - @NonNull + @Nonnull @Override default DriverExecutionProfile withDurationList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return DerivedExecutionProfile.with(this, option, value); } - @NonNull + @Nonnull @Override - default DriverExecutionProfile without(@NonNull DriverOption option) { + default DriverExecutionProfile without(@Nonnull DriverOption option) { return DerivedExecutionProfile.without(this, option); } } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverOption.java b/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverOption.java index 2f15b701f36..39854b8c7c4 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverOption.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/config/DriverOption.java @@ -17,7 +17,7 @@ */ package com.datastax.oss.driver.api.core.config; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * Describes an option in the driver's configuration. @@ -31,6 +31,6 @@ public interface DriverOption { * The option's path. Paths are hierarchical and each segment is separated by a dot, e.g. {@code * metadata.schema.enabled}. */ - @NonNull + @Nonnull String getPath(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/config/OngoingConfigOptions.java b/core/src/main/java/com/datastax/oss/driver/api/core/config/OngoingConfigOptions.java index 2c931bbfa91..e4a78bb4965 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/config/OngoingConfigOptions.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/config/OngoingConfigOptions.java @@ -17,48 +17,48 @@ */ package com.datastax.oss.driver.api.core.config; -import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import javax.annotation.Nonnull; /** An object where config options can be set programmatically. */ public interface OngoingConfigOptions> { - @NonNull - SelfT withBoolean(@NonNull DriverOption option, boolean value); + @Nonnull + SelfT withBoolean(@Nonnull DriverOption option, boolean value); - @NonNull - SelfT withBooleanList(@NonNull DriverOption option, @NonNull List value); + @Nonnull + SelfT withBooleanList(@Nonnull DriverOption option, @Nonnull List value); - @NonNull - SelfT withInt(@NonNull DriverOption option, int value); + @Nonnull + SelfT withInt(@Nonnull DriverOption option, int value); - @NonNull - SelfT withIntList(@NonNull DriverOption option, @NonNull List value); + @Nonnull + SelfT withIntList(@Nonnull DriverOption option, @Nonnull List value); - @NonNull - SelfT withLong(@NonNull DriverOption option, long value); + @Nonnull + SelfT withLong(@Nonnull DriverOption option, long value); - @NonNull - SelfT withLongList(@NonNull DriverOption option, @NonNull List value); + @Nonnull + SelfT withLongList(@Nonnull DriverOption option, @Nonnull List value); - @NonNull - SelfT withDouble(@NonNull DriverOption option, double value); + @Nonnull + SelfT withDouble(@Nonnull DriverOption option, double value); - @NonNull - SelfT withDoubleList(@NonNull DriverOption option, @NonNull List value); + @Nonnull + SelfT withDoubleList(@Nonnull DriverOption option, @Nonnull List value); - @NonNull - SelfT withString(@NonNull DriverOption option, @NonNull String value); + @Nonnull + SelfT withString(@Nonnull DriverOption option, @Nonnull String value); /** * Note that this is just a shortcut to call {@link #withString(DriverOption, String)} with {@code * value.getName()}. */ - @NonNull - default SelfT withClass(@NonNull DriverOption option, @NonNull Class value) { + @Nonnull + default SelfT withClass(@Nonnull DriverOption option, @Nonnull Class value) { return withString(option, value.getName()); } @@ -66,29 +66,29 @@ default SelfT withClass(@NonNull DriverOption option, @NonNull Class value) { * Note that this is just a shortcut to call {@link #withStringList(DriverOption, List)} with * class names obtained from {@link Class#getName()}. */ - @NonNull - default SelfT withClassList(@NonNull DriverOption option, @NonNull List> values) { + @Nonnull + default SelfT withClassList(@Nonnull DriverOption option, @Nonnull List> values) { return withStringList(option, values.stream().map(Class::getName).collect(Collectors.toList())); } - @NonNull - SelfT withStringList(@NonNull DriverOption option, @NonNull List value); + @Nonnull + SelfT withStringList(@Nonnull DriverOption option, @Nonnull List value); - @NonNull - SelfT withStringMap(@NonNull DriverOption option, @NonNull Map value); + @Nonnull + SelfT withStringMap(@Nonnull DriverOption option, @Nonnull Map value); - @NonNull - SelfT withBytes(@NonNull DriverOption option, long value); + @Nonnull + SelfT withBytes(@Nonnull DriverOption option, long value); - @NonNull - SelfT withBytesList(@NonNull DriverOption option, @NonNull List value); + @Nonnull + SelfT withBytesList(@Nonnull DriverOption option, @Nonnull List value); - @NonNull - SelfT withDuration(@NonNull DriverOption option, @NonNull Duration value); + @Nonnull + SelfT withDuration(@Nonnull DriverOption option, @Nonnull Duration value); - @NonNull - SelfT withDurationList(@NonNull DriverOption option, @NonNull List value); + @Nonnull + SelfT withDurationList(@Nonnull DriverOption option, @Nonnull List value); - @NonNull - SelfT without(@NonNull DriverOption option); + @Nonnull + SelfT without(@Nonnull DriverOption option); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/config/OptionsMap.java b/core/src/main/java/com/datastax/oss/driver/api/core/config/OptionsMap.java index 8906e1dd349..e8e536937ec 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/config/OptionsMap.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/config/OptionsMap.java @@ -18,8 +18,6 @@ package com.datastax.oss.driver.api.core.config; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.Serializable; @@ -32,6 +30,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Consumer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; import net.jcip.annotations.ThreadSafe; @@ -66,7 +66,7 @@ public class OptionsMap implements Serializable { * bundled with the driver (however, this method does not load any file, and doesn't require * Typesafe config in the classpath). */ - @NonNull + @Nonnull public static OptionsMap driverDefaults() { OptionsMap source = new OptionsMap(); fillWithDriverDefaults(source); @@ -93,7 +93,7 @@ private OptionsMap(ConcurrentHashMap> map) { */ @Nullable public ValueT put( - @NonNull String profile, @NonNull TypedDriverOption option, @NonNull ValueT value) { + @Nonnull String profile, @Nonnull TypedDriverOption option, @Nonnull ValueT value) { Objects.requireNonNull(option, "option"); Objects.requireNonNull(value, "value"); Object previous = getProfileMap(profile).put(option.getRawOption(), value); @@ -112,7 +112,7 @@ public ValueT put( * not defined. */ @Nullable - public ValueT put(@NonNull TypedDriverOption option, @NonNull ValueT value) { + public ValueT put(@Nonnull TypedDriverOption option, @Nonnull ValueT value) { return put(DriverExecutionProfile.DEFAULT_NAME, option, value); } @@ -121,7 +121,7 @@ public ValueT put(@NonNull TypedDriverOption option, @NonNull V * null} if the option is not defined. */ @Nullable - public ValueT get(@NonNull String profile, @NonNull TypedDriverOption option) { + public ValueT get(@Nonnull String profile, @Nonnull TypedDriverOption option) { Objects.requireNonNull(option, "option"); Object result = getProfileMap(profile).get(option.getRawOption()); return cast(result); @@ -132,7 +132,7 @@ public ValueT get(@NonNull String profile, @NonNull TypedDriverOption ValueT get(@NonNull TypedDriverOption option) { + public ValueT get(@Nonnull TypedDriverOption option) { return get(DriverExecutionProfile.DEFAULT_NAME, option); } @@ -144,7 +144,7 @@ public ValueT get(@NonNull TypedDriverOption option) { */ @Nullable public ValueT remove( - @NonNull String profile, @NonNull TypedDriverOption option) { + @Nonnull String profile, @Nonnull TypedDriverOption option) { Objects.requireNonNull(option, "option"); Object previous = getProfileMap(profile).remove(option.getRawOption()); if (previous != null) { @@ -162,7 +162,7 @@ public ValueT remove( * not defined. */ @Nullable - public ValueT remove(@NonNull TypedDriverOption option) { + public ValueT remove(@Nonnull TypedDriverOption option) { return remove(DriverExecutionProfile.DEFAULT_NAME, option); } @@ -172,7 +172,7 @@ public ValueT remove(@NonNull TypedDriverOption option) { *

This is mostly for internal use by the driver. Note that listeners are transient, and not * taken into account by {@link #equals(Object)} and {@link #hashCode()}. */ - public void addChangeListener(@NonNull Consumer listener) { + public void addChangeListener(@Nonnull Consumer listener) { changeListeners.add(Objects.requireNonNull(listener)); } @@ -182,7 +182,7 @@ public void addChangeListener(@NonNull Consumer listener) { * * @return {@code true} if the listener was indeed registered for this object. */ - public boolean removeChangeListener(@NonNull Consumer listener) { + public boolean removeChangeListener(@Nonnull Consumer listener) { return changeListeners.remove(Objects.requireNonNull(listener)); } @@ -209,13 +209,13 @@ public int hashCode() { *

This is intended for internal usage by the driver. Modifying the resulting map is strongly * discouraged, as it could break the type-safety guarantees provided by the public methods. */ - @NonNull + @Nonnull protected Map> asRawMap() { return map; } - @NonNull - private Map getProfileMap(@NonNull String profile) { + @Nonnull + private Map getProfileMap(@Nonnull String profile) { Objects.requireNonNull(profile, "profile"); return map.computeIfAbsent(profile, p -> new ConcurrentHashMap<>()); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/config/ProgrammaticDriverConfigLoaderBuilder.java b/core/src/main/java/com/datastax/oss/driver/api/core/config/ProgrammaticDriverConfigLoaderBuilder.java index c3ae1d1bf5b..73f864967ab 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/config/ProgrammaticDriverConfigLoaderBuilder.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/config/ProgrammaticDriverConfigLoaderBuilder.java @@ -17,7 +17,7 @@ */ package com.datastax.oss.driver.api.core.config; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * A builder that allows the creation of a config loader where options are overridden @@ -34,8 +34,8 @@ public interface ProgrammaticDriverConfigLoaderBuilder *

All options set after this call, and before the next call to this method or {@link * #endProfile()}, will apply to the given profile. */ - @NonNull - ProgrammaticDriverConfigLoaderBuilder startProfile(@NonNull String profileName); + @Nonnull + ProgrammaticDriverConfigLoaderBuilder startProfile(@Nonnull String profileName); /** * Ends the definition of a profile. @@ -43,9 +43,9 @@ public interface ProgrammaticDriverConfigLoaderBuilder *

All options set after this call, and before the next call to {@link #startProfile(String)}, * will apply to the default profile. */ - @NonNull + @Nonnull ProgrammaticDriverConfigLoaderBuilder endProfile(); - @NonNull + @Nonnull DriverConfigLoader build(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/config/TypedDriverOption.java b/core/src/main/java/com/datastax/oss/driver/api/core/config/TypedDriverOption.java index ec36079730f..b1fa595fdc1 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/config/TypedDriverOption.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/config/TypedDriverOption.java @@ -20,7 +20,6 @@ import com.datastax.dse.driver.api.core.config.DseDriverOption; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.time.Duration; @@ -28,6 +27,7 @@ import java.util.Map; import java.util.Objects; import java.util.StringJoiner; +import javax.annotation.Nonnull; /** * A type-safe wrapper around {@link DriverOption}, that encodes the intended value type of each @@ -65,17 +65,17 @@ public static Iterable> builtInValues() { private final GenericType expectedType; public TypedDriverOption( - @NonNull DriverOption rawOption, @NonNull GenericType expectedType) { + @Nonnull DriverOption rawOption, @Nonnull GenericType expectedType) { this.rawOption = Objects.requireNonNull(rawOption); this.expectedType = Objects.requireNonNull(expectedType); } - @NonNull + @Nonnull public DriverOption getRawOption() { return rawOption; } - @NonNull + @Nonnull public GenericType getExpectedType() { return expectedType; } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/connection/BusyConnectionException.java b/core/src/main/java/com/datastax/oss/driver/api/core/connection/BusyConnectionException.java index 8069474612a..3bc90a25fd1 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/connection/BusyConnectionException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/connection/BusyConnectionException.java @@ -20,7 +20,7 @@ import com.datastax.oss.driver.api.core.AllNodesFailedException; import com.datastax.oss.driver.api.core.DriverException; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * Indicates that a write was attempted on a connection that already handles too many simultaneous @@ -53,7 +53,7 @@ private BusyConnectionException( } @Override - @NonNull + @Nonnull public DriverException copy() { return new BusyConnectionException(getMessage(), getExecutionInfo(), true); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/connection/ClosedConnectionException.java b/core/src/main/java/com/datastax/oss/driver/api/core/connection/ClosedConnectionException.java index a192e2c5efc..4ac8c438f7b 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/connection/ClosedConnectionException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/connection/ClosedConnectionException.java @@ -19,8 +19,8 @@ import com.datastax.oss.driver.api.core.AllNodesFailedException; import com.datastax.oss.driver.api.core.DriverException; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Thrown when the connection on which a request was executing is closed due to an unrelated event. @@ -34,21 +34,21 @@ */ public class ClosedConnectionException extends DriverException { - public ClosedConnectionException(@NonNull String message) { + public ClosedConnectionException(@Nonnull String message) { this(message, null, false); } - public ClosedConnectionException(@NonNull String message, @Nullable Throwable cause) { + public ClosedConnectionException(@Nonnull String message, @Nullable Throwable cause) { this(message, cause, false); } private ClosedConnectionException( - @NonNull String message, @Nullable Throwable cause, boolean writableStackTrace) { + @Nonnull String message, @Nullable Throwable cause, boolean writableStackTrace) { super(message, null, cause, writableStackTrace); } @Override - @NonNull + @Nonnull public DriverException copy() { return new ClosedConnectionException(getMessage(), getCause(), true); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/connection/ConnectionInitException.java b/core/src/main/java/com/datastax/oss/driver/api/core/connection/ConnectionInitException.java index 519624e8d5d..1e2d09cf5e0 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/connection/ConnectionInitException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/connection/ConnectionInitException.java @@ -20,8 +20,8 @@ import com.datastax.oss.driver.api.core.AllNodesFailedException; import com.datastax.oss.driver.api.core.DriverException; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Indicates a generic error while initializing a connection. @@ -31,7 +31,7 @@ * connected, it is just logged and the connection is reattempted. */ public class ConnectionInitException extends DriverException { - public ConnectionInitException(@NonNull String message, @Nullable Throwable cause) { + public ConnectionInitException(@Nonnull String message, @Nullable Throwable cause) { super(message, null, cause, true); } @@ -39,7 +39,7 @@ private ConnectionInitException(String message, ExecutionInfo executionInfo, Thr super(message, executionInfo, cause, true); } - @NonNull + @Nonnull @Override public DriverException copy() { return new ConnectionInitException(getMessage(), getExecutionInfo(), getCause()); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/connection/CrcMismatchException.java b/core/src/main/java/com/datastax/oss/driver/api/core/connection/CrcMismatchException.java index d0fc8fc3b73..2de2953b31f 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/connection/CrcMismatchException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/connection/CrcMismatchException.java @@ -18,7 +18,7 @@ package com.datastax.oss.driver.api.core.connection; import com.datastax.oss.driver.api.core.DriverException; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * Thrown when the checksums in a server response don't match (protocol v5 or above). @@ -29,11 +29,11 @@ */ public class CrcMismatchException extends DriverException { - public CrcMismatchException(@NonNull String message) { + public CrcMismatchException(@Nonnull String message) { super(message, null, null, true); } - @NonNull + @Nonnull @Override public DriverException copy() { return new CrcMismatchException(getMessage()); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/connection/FrameTooLongException.java b/core/src/main/java/com/datastax/oss/driver/api/core/connection/FrameTooLongException.java index 9954aefb3d4..c8e2f40559e 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/connection/FrameTooLongException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/connection/FrameTooLongException.java @@ -19,8 +19,8 @@ import com.datastax.oss.driver.api.core.DriverException; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; -import edu.umd.cs.findbugs.annotations.NonNull; import java.net.SocketAddress; +import javax.annotation.Nonnull; /** * Thrown when an incoming or outgoing protocol frame exceeds the limit defined by {@code @@ -32,7 +32,7 @@ public class FrameTooLongException extends DriverException { private final SocketAddress address; - public FrameTooLongException(@NonNull SocketAddress address, @NonNull String message) { + public FrameTooLongException(@Nonnull SocketAddress address, @Nonnull String message) { this(address, message, null); } @@ -43,12 +43,12 @@ private FrameTooLongException( } /** The address of the node that encountered the error. */ - @NonNull + @Nonnull public SocketAddress getAddress() { return address; } - @NonNull + @Nonnull @Override public DriverException copy() { return new FrameTooLongException(address, getMessage(), getExecutionInfo()); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/connection/HeartbeatException.java b/core/src/main/java/com/datastax/oss/driver/api/core/connection/HeartbeatException.java index 60c3d60a69d..6cf1197b320 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/connection/HeartbeatException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/connection/HeartbeatException.java @@ -21,9 +21,9 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.retry.RetryPolicy; import com.datastax.oss.driver.api.core.session.Request; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.net.SocketAddress; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Thrown when a heartbeat query fails. @@ -38,7 +38,7 @@ public class HeartbeatException extends DriverException { private final SocketAddress address; public HeartbeatException( - @NonNull SocketAddress address, @Nullable String message, @Nullable Throwable cause) { + @Nonnull SocketAddress address, @Nullable String message, @Nullable Throwable cause) { this(address, message, null, cause); } @@ -49,12 +49,12 @@ public HeartbeatException( } /** The address of the node that encountered the error. */ - @NonNull + @Nonnull public SocketAddress getAddress() { return address; } - @NonNull + @Nonnull @Override public DriverException copy() { return new HeartbeatException(address, getMessage(), getExecutionInfo(), getCause()); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/connection/ReconnectionPolicy.java b/core/src/main/java/com/datastax/oss/driver/api/core/connection/ReconnectionPolicy.java index 9f81843c9c0..8b4be4dc644 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/connection/ReconnectionPolicy.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/connection/ReconnectionPolicy.java @@ -18,8 +18,8 @@ package com.datastax.oss.driver.api.core.connection; import com.datastax.oss.driver.api.core.metadata.Node; -import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; +import javax.annotation.Nonnull; /** * Decides how often the driver tries to re-establish lost connections. @@ -50,8 +50,8 @@ public interface ReconnectionPolicy extends AutoCloseable { /** Creates a new schedule for the given node. */ - @NonNull - ReconnectionSchedule newNodeSchedule(@NonNull Node node); + @Nonnull + ReconnectionSchedule newNodeSchedule(@Nonnull Node node); /** * Creates a new schedule for the control connection. @@ -66,7 +66,7 @@ public interface ReconnectionPolicy extends AutoCloseable { * control node, and is now scheduling attempts to connect to another node. * */ - @NonNull + @Nonnull ReconnectionSchedule newControlConnectionSchedule(boolean isInitialConnection); /** Called when the cluster that this policy is associated with closes. */ @@ -79,7 +79,7 @@ public interface ReconnectionPolicy extends AutoCloseable { */ interface ReconnectionSchedule { /** How long to wait before the next reconnection attempt. */ - @NonNull + @Nonnull Duration nextDelay(); } } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/context/DriverContext.java b/core/src/main/java/com/datastax/oss/driver/api/core/context/DriverContext.java index 5b32389e362..6bab62078dd 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/context/DriverContext.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/context/DriverContext.java @@ -34,9 +34,9 @@ import com.datastax.oss.driver.api.core.ssl.SslEngineFactory; import com.datastax.oss.driver.api.core.time.TimestampGenerator; import com.datastax.oss.driver.api.core.tracker.RequestTracker; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; import java.util.Optional; +import javax.annotation.Nonnull; /** Holds common components that are shared throughout a driver instance. */ public interface DriverContext extends AttachmentPoint { @@ -45,15 +45,15 @@ public interface DriverContext extends AttachmentPoint { * This is the same as {@link Session#getName()}, it's exposed here for components that only have * a reference to the context. */ - @NonNull + @Nonnull String getSessionName(); /** @return The driver's configuration; never {@code null}. */ - @NonNull + @Nonnull DriverConfig getConfig(); /** @return The driver's configuration loader; never {@code null}. */ - @NonNull + @Nonnull DriverConfigLoader getConfigLoader(); /** @@ -61,15 +61,15 @@ public interface DriverContext extends AttachmentPoint { * guaranteed to never be {@code null} and to always contain an entry for the {@value * DriverExecutionProfile#DEFAULT_NAME} profile. */ - @NonNull + @Nonnull Map getLoadBalancingPolicies(); /** * @param profileName the profile name; never {@code null}. * @return The driver's load balancing policy for the given profile; never {@code null}. */ - @NonNull - default LoadBalancingPolicy getLoadBalancingPolicy(@NonNull String profileName) { + @Nonnull + default LoadBalancingPolicy getLoadBalancingPolicy(@Nonnull String profileName) { LoadBalancingPolicy policy = getLoadBalancingPolicies().get(profileName); // Protect against a non-existent name return (policy != null) @@ -82,15 +82,15 @@ default LoadBalancingPolicy getLoadBalancingPolicy(@NonNull String profileName) * never be {@code null} and to always contain an entry for the {@value * DriverExecutionProfile#DEFAULT_NAME} profile. */ - @NonNull + @Nonnull Map getRetryPolicies(); /** * @param profileName the profile name; never {@code null}. * @return The driver's retry policy for the given profile; never {@code null}. */ - @NonNull - default RetryPolicy getRetryPolicy(@NonNull String profileName) { + @Nonnull + default RetryPolicy getRetryPolicy(@Nonnull String profileName) { RetryPolicy policy = getRetryPolicies().get(profileName); return (policy != null) ? policy : getRetryPolicies().get(DriverExecutionProfile.DEFAULT_NAME); } @@ -100,15 +100,15 @@ default RetryPolicy getRetryPolicy(@NonNull String profileName) { * guaranteed to never be {@code null} and to always contain an entry for the {@value * DriverExecutionProfile#DEFAULT_NAME} profile. */ - @NonNull + @Nonnull Map getSpeculativeExecutionPolicies(); /** * @param profileName the profile name; never {@code null}. * @return The driver's speculative execution policy for the given profile; never {@code null}. */ - @NonNull - default SpeculativeExecutionPolicy getSpeculativeExecutionPolicy(@NonNull String profileName) { + @Nonnull + default SpeculativeExecutionPolicy getSpeculativeExecutionPolicy(@Nonnull String profileName) { SpeculativeExecutionPolicy policy = getSpeculativeExecutionPolicies().get(profileName); return (policy != null) ? policy @@ -116,38 +116,38 @@ default SpeculativeExecutionPolicy getSpeculativeExecutionPolicy(@NonNull String } /** @return The driver's timestamp generator; never {@code null}. */ - @NonNull + @Nonnull TimestampGenerator getTimestampGenerator(); /** @return The driver's reconnection policy; never {@code null}. */ - @NonNull + @Nonnull ReconnectionPolicy getReconnectionPolicy(); /** @return The driver's address translator; never {@code null}. */ - @NonNull + @Nonnull AddressTranslator getAddressTranslator(); /** @return The authentication provider, if authentication was configured. */ - @NonNull + @Nonnull Optional getAuthProvider(); /** @return The SSL engine factory, if SSL was configured. */ - @NonNull + @Nonnull Optional getSslEngineFactory(); /** @return The driver's request tracker; never {@code null}. */ - @NonNull + @Nonnull RequestTracker getRequestTracker(); /** @return The driver's request throttler; never {@code null}. */ - @NonNull + @Nonnull RequestThrottler getRequestThrottler(); /** @return The driver's node state listener; never {@code null}. */ - @NonNull + @Nonnull NodeStateListener getNodeStateListener(); /** @return The driver's schema change listener; never {@code null}. */ - @NonNull + @Nonnull SchemaChangeListener getSchemaChangeListener(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/AsyncCqlSession.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/AsyncCqlSession.java index 7b56bd61a09..ce86e9fc1f1 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/AsyncCqlSession.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/AsyncCqlSession.java @@ -19,10 +19,10 @@ import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.internal.core.cql.DefaultPrepareRequest; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; import java.util.Objects; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; /** * A session that offers user-friendly methods to execute CQL requests asynchronously. @@ -38,8 +38,8 @@ public interface AsyncCqlSession extends Session { * @param statement the CQL query to execute (that can be any {@code Statement}). * @return a {@code CompletionStage} that, once complete, will produce the async result set. */ - @NonNull - default CompletionStage executeAsync(@NonNull Statement statement) { + @Nonnull + default CompletionStage executeAsync(@Nonnull Statement statement) { return Objects.requireNonNull( execute(statement, Statement.ASYNC), "The CQL processor should never return a null result"); } @@ -55,8 +55,8 @@ default CompletionStage executeAsync(@NonNull Statement state * @return a {@code CompletionStage} that, once complete, will produce the async result set. * @see SimpleStatement#newInstance(String) */ - @NonNull - default CompletionStage executeAsync(@NonNull String query) { + @Nonnull + default CompletionStage executeAsync(@Nonnull String query) { return executeAsync(SimpleStatement.newInstance(query)); } @@ -73,9 +73,9 @@ default CompletionStage executeAsync(@NonNull String query) { * @return a {@code CompletionStage} that, once complete, will produce the async result set. * @see SimpleStatement#newInstance(String, Object...) */ - @NonNull + @Nonnull default CompletionStage executeAsync( - @NonNull String query, @NonNull Object... values) { + @Nonnull String query, @Nonnull Object... values) { return executeAsync(SimpleStatement.newInstance(query, values)); } @@ -92,9 +92,9 @@ default CompletionStage executeAsync( * @return a {@code CompletionStage} that, once complete, will produce the async result set. * @see SimpleStatement#newInstance(String, Map) */ - @NonNull + @Nonnull default CompletionStage executeAsync( - @NonNull String query, @NonNull Map values) { + @Nonnull String query, @Nonnull Map values) { return executeAsync(SimpleStatement.newInstance(query, values)); } @@ -112,8 +112,8 @@ default CompletionStage executeAsync( * @param statement the CQL query to prepare (that can be any {@code SimpleStatement}). * @return a {@code CompletionStage} that, once complete, will produce the prepared statement. */ - @NonNull - default CompletionStage prepareAsync(@NonNull SimpleStatement statement) { + @Nonnull + default CompletionStage prepareAsync(@Nonnull SimpleStatement statement) { return Objects.requireNonNull( execute(new DefaultPrepareRequest(statement), PrepareRequest.ASYNC), "The CQL prepare processor should never return a null result"); @@ -129,8 +129,8 @@ default CompletionStage prepareAsync(@NonNull SimpleStatement * @param query the CQL query string to prepare. * @return a {@code CompletionStage} that, once complete, will produce the prepared statement. */ - @NonNull - default CompletionStage prepareAsync(@NonNull String query) { + @Nonnull + default CompletionStage prepareAsync(@Nonnull String query) { return Objects.requireNonNull( execute(new DefaultPrepareRequest(query), PrepareRequest.ASYNC), "The CQL prepare processor should never return a null result"); @@ -151,7 +151,7 @@ default CompletionStage prepareAsync(@NonNull String query) { * @param request the {@code PrepareRequest} to prepare. * @return a {@code CompletionStage} that, once complete, will produce the prepared statement. */ - @NonNull + @Nonnull default CompletionStage prepareAsync(PrepareRequest request) { return Objects.requireNonNull( execute(request, PrepareRequest.ASYNC), diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/BatchStatement.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/BatchStatement.java index 0f37ed71ce2..3980debf7a7 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/BatchStatement.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/BatchStatement.java @@ -26,11 +26,11 @@ import com.datastax.oss.driver.internal.core.util.Sizes; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; import com.datastax.oss.protocol.internal.PrimitiveSizes; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A statement that groups a number of other statements, so that they can be executed as a batch @@ -47,8 +47,8 @@ public interface BatchStatement extends Statement, IterableNote that the returned object is immutable. */ - @NonNull - static BatchStatement newInstance(@NonNull BatchType batchType) { + @Nonnull + static BatchStatement newInstance(@Nonnull BatchType batchType) { return new DefaultBatchStatement( batchType, new ArrayList<>(), @@ -77,9 +77,9 @@ static BatchStatement newInstance(@NonNull BatchType batchType) { * *

Note that the returned object is immutable. */ - @NonNull + @Nonnull static BatchStatement newInstance( - @NonNull BatchType batchType, @NonNull Iterable> statements) { + @Nonnull BatchType batchType, @Nonnull Iterable> statements) { return new DefaultBatchStatement( batchType, ImmutableList.copyOf(statements), @@ -108,9 +108,9 @@ static BatchStatement newInstance( * *

Note that the returned object is immutable. */ - @NonNull + @Nonnull static BatchStatement newInstance( - @NonNull BatchType batchType, @NonNull BatchableStatement... statements) { + @Nonnull BatchType batchType, @Nonnull BatchableStatement... statements) { return new DefaultBatchStatement( batchType, ImmutableList.copyOf(statements), @@ -138,8 +138,8 @@ static BatchStatement newInstance( * *

Note that this builder is mutable and not thread-safe. */ - @NonNull - static BatchStatementBuilder builder(@NonNull BatchType batchType) { + @Nonnull + static BatchStatementBuilder builder(@Nonnull BatchType batchType) { return new BatchStatementBuilder(batchType); } @@ -149,12 +149,12 @@ static BatchStatementBuilder builder(@NonNull BatchType batchType) { * *

Note that this builder is mutable and not thread-safe. */ - @NonNull - static BatchStatementBuilder builder(@NonNull BatchStatement template) { + @Nonnull + static BatchStatementBuilder builder(@Nonnull BatchStatement template) { return new BatchStatementBuilder(template); } - @NonNull + @Nonnull BatchType getBatchType(); /** @@ -163,8 +163,8 @@ static BatchStatementBuilder builder(@NonNull BatchStatement template) { *

The driver's built-in implementation is immutable, and returns a new instance from this * method. However custom implementations may choose to be mutable and return the same instance. */ - @NonNull - BatchStatement setBatchType(@NonNull BatchType newBatchType); + @Nonnull + BatchStatement setBatchType(@Nonnull BatchType newBatchType); /** * Sets the CQL keyspace to associate with this batch. @@ -179,15 +179,15 @@ static BatchStatementBuilder builder(@NonNull BatchStatement template) { * * @see Request#getKeyspace() */ - @NonNull + @Nonnull BatchStatement setKeyspace(@Nullable CqlIdentifier newKeyspace); /** * Shortcut for {@link #setKeyspace(CqlIdentifier) * setKeyspace(CqlIdentifier.fromCql(newKeyspaceName))}. */ - @NonNull - default BatchStatement setKeyspace(@NonNull String newKeyspaceName) { + @Nonnull + default BatchStatement setKeyspace(@Nonnull String newKeyspaceName) { return setKeyspace(CqlIdentifier.fromCql(newKeyspaceName)); } @@ -200,8 +200,8 @@ default BatchStatement setKeyspace(@NonNull String newKeyspaceName) { *

The driver's built-in implementation is immutable, and returns a new instance from this * method. However custom implementations may choose to be mutable and return the same instance. */ - @NonNull - BatchStatement add(@NonNull BatchableStatement statement); + @Nonnull + BatchStatement add(@Nonnull BatchableStatement statement); /** * Adds new statements to the batch. @@ -212,12 +212,12 @@ default BatchStatement setKeyspace(@NonNull String newKeyspaceName) { *

The driver's built-in implementation is immutable, and returns a new instance from this * method. However custom implementations may choose to be mutable and return the same instance. */ - @NonNull - BatchStatement addAll(@NonNull Iterable> statements); + @Nonnull + BatchStatement addAll(@Nonnull Iterable> statements); /** @see #addAll(Iterable) */ - @NonNull - default BatchStatement addAll(@NonNull BatchableStatement... statements) { + @Nonnull + default BatchStatement addAll(@Nonnull BatchableStatement... statements) { return addAll(Arrays.asList(statements)); } @@ -230,11 +230,11 @@ default BatchStatement addAll(@NonNull BatchableStatement... statements) { *

The driver's built-in implementation is immutable, and returns a new instance from this * method. However custom implementations may choose to be mutable and return the same instance. */ - @NonNull + @Nonnull BatchStatement clear(); @Override - default int computeSizeInBytes(@NonNull DriverContext context) { + default int computeSizeInBytes(@Nonnull DriverContext context) { int size = Sizes.minimumStatementSize(this, context); // BatchStatement's additional elements to take into account are: diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/BatchStatementBuilder.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/BatchStatementBuilder.java index a8e2b8ab659..b5dc87f9fcf 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/BatchStatementBuilder.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/BatchStatementBuilder.java @@ -21,9 +21,9 @@ import com.datastax.oss.driver.internal.core.cql.DefaultBatchStatement; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; import com.datastax.oss.driver.shaded.guava.common.collect.Iterables; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Arrays; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.NotThreadSafe; /** @@ -34,17 +34,17 @@ @NotThreadSafe public class BatchStatementBuilder extends StatementBuilder { - @NonNull private BatchType batchType; + @Nonnull private BatchType batchType; @Nullable private CqlIdentifier keyspace; - @NonNull private ImmutableList.Builder> statementsBuilder; + @Nonnull private ImmutableList.Builder> statementsBuilder; private int statementsCount; - public BatchStatementBuilder(@NonNull BatchType batchType) { + public BatchStatementBuilder(@Nonnull BatchType batchType) { this.batchType = batchType; this.statementsBuilder = ImmutableList.builder(); } - public BatchStatementBuilder(@NonNull BatchStatement template) { + public BatchStatementBuilder(@Nonnull BatchStatement template) { super(template); this.batchType = template.getBatchType(); this.statementsBuilder = ImmutableList.>builder().addAll(template); @@ -57,8 +57,8 @@ public BatchStatementBuilder(@NonNull BatchStatement template) { * @return this builder; never {@code null}. * @see BatchStatement#getKeyspace() */ - @NonNull - public BatchStatementBuilder setKeyspace(@NonNull CqlIdentifier keyspace) { + @Nonnull + public BatchStatementBuilder setKeyspace(@Nonnull CqlIdentifier keyspace) { this.keyspace = keyspace; return this; } @@ -69,8 +69,8 @@ public BatchStatementBuilder setKeyspace(@NonNull CqlIdentifier keyspace) { * * @return this builder; never {@code null}. */ - @NonNull - public BatchStatementBuilder setKeyspace(@NonNull String keyspaceName) { + @Nonnull + public BatchStatementBuilder setKeyspace(@Nonnull String keyspaceName) { return setKeyspace(CqlIdentifier.fromCql(keyspaceName)); } @@ -80,8 +80,8 @@ public BatchStatementBuilder setKeyspace(@NonNull String keyspaceName) { * @return this builder; never {@code null}. * @see BatchStatement#add(BatchableStatement) */ - @NonNull - public BatchStatementBuilder addStatement(@NonNull BatchableStatement statement) { + @Nonnull + public BatchStatementBuilder addStatement(@Nonnull BatchableStatement statement) { if (statementsCount >= 0xFFFF) { throw new IllegalStateException( "Batch statement cannot contain more than " + 0xFFFF + " statements."); @@ -97,8 +97,8 @@ public BatchStatementBuilder addStatement(@NonNull BatchableStatement stateme * @return this builder; never {@code null}. * @see BatchStatement#addAll(Iterable) */ - @NonNull - public BatchStatementBuilder addStatements(@NonNull Iterable> statements) { + @Nonnull + public BatchStatementBuilder addStatements(@Nonnull Iterable> statements) { int delta = Iterables.size(statements); if (statementsCount + delta > 0xFFFF) { throw new IllegalStateException( @@ -115,8 +115,8 @@ public BatchStatementBuilder addStatements(@NonNull Iterable... statements) { + @Nonnull + public BatchStatementBuilder addStatements(@Nonnull BatchableStatement... statements) { return addStatements(Arrays.asList(statements)); } @@ -125,7 +125,7 @@ public BatchStatementBuilder addStatements(@NonNull BatchableStatement... sta * * @return this builder; never {@code null}. */ - @NonNull + @Nonnull public BatchStatementBuilder clearStatements() { statementsBuilder = ImmutableList.builder(); statementsCount = 0; @@ -134,7 +134,7 @@ public BatchStatementBuilder clearStatements() { /** @return a newly-allocated {@linkplain BatchStatement batch}; never {@code null}.. */ @Override - @NonNull + @Nonnull public BatchStatement build() { return new DefaultBatchStatement( batchType, diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/Bindable.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/Bindable.java index 64f0f22a051..15a4cb7f02f 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/Bindable.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/Bindable.java @@ -24,8 +24,8 @@ import com.datastax.oss.driver.api.core.data.SettableById; import com.datastax.oss.driver.api.core.data.SettableByName; import com.datastax.oss.protocol.internal.ProtocolConstants; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.CheckReturnValue; +import javax.annotation.Nonnull; /** A data container with the ability to unset values. */ public interface Bindable> @@ -49,7 +49,7 @@ default boolean isSet(int i) { * @throws IndexOutOfBoundsException if the id is invalid. */ @SuppressWarnings("ReferenceEquality") - default boolean isSet(@NonNull CqlIdentifier id) { + default boolean isSet(@Nonnull CqlIdentifier id) { return getBytesUnsafe(id) != ProtocolConstants.UNSET_VALUE; } @@ -62,7 +62,7 @@ default boolean isSet(@NonNull CqlIdentifier id) { * @throws IndexOutOfBoundsException if the name is invalid. */ @SuppressWarnings("ReferenceEquality") - default boolean isSet(@NonNull String name) { + default boolean isSet(@Nonnull String name) { return getBytesUnsafe(name) != ProtocolConstants.UNSET_VALUE; } @@ -72,7 +72,7 @@ default boolean isSet(@NonNull String name) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT unset(int i) { return setBytesUnsafe(i, ProtocolConstants.UNSET_VALUE); @@ -84,9 +84,9 @@ default SelfT unset(int i) { * * @throws IndexOutOfBoundsException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT unset(@NonNull CqlIdentifier id) { + default SelfT unset(@Nonnull CqlIdentifier id) { return setBytesUnsafe(id, ProtocolConstants.UNSET_VALUE); } @@ -96,9 +96,9 @@ default SelfT unset(@NonNull CqlIdentifier id) { * * @throws IndexOutOfBoundsException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT unset(@NonNull String name) { + default SelfT unset(@Nonnull String name) { return setBytesUnsafe(name, ProtocolConstants.UNSET_VALUE); } } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/BoundStatement.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/BoundStatement.java index bd7c142907f..b7dfcb01f24 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/BoundStatement.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/BoundStatement.java @@ -23,10 +23,10 @@ import com.datastax.oss.driver.internal.core.util.Sizes; import com.datastax.oss.protocol.internal.PrimitiveSizes; import com.datastax.oss.protocol.internal.request.query.Values; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.util.List; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A prepared statement in its executable form, with values bound to the variables. @@ -38,11 +38,11 @@ public interface BoundStatement extends BatchableStatement, Bindable { /** The prepared statement that was used to create this statement. */ - @NonNull + @Nonnull PreparedStatement getPreparedStatement(); /** The values to bind, in their serialized form. */ - @NonNull + @Nonnull List getValues(); /** @@ -56,7 +56,7 @@ default CqlIdentifier getKeyspace() { } @Override - default int computeSizeInBytes(@NonNull DriverContext context) { + default int computeSizeInBytes(@Nonnull DriverContext context) { int size = Sizes.minimumStatementSize(this, context); // BoundStatement's additional elements to take into account are: diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/BoundStatementBuilder.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/BoundStatementBuilder.java index 7e8f8723e1b..5657db31189 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/BoundStatementBuilder.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/BoundStatementBuilder.java @@ -25,12 +25,12 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry; import com.datastax.oss.driver.internal.core.cql.DefaultBoundStatement; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.time.Duration; import java.util.List; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.NotThreadSafe; /** @@ -42,22 +42,22 @@ public class BoundStatementBuilder extends StatementBuilder implements Bindable { - @NonNull private final PreparedStatement preparedStatement; - @NonNull private final ColumnDefinitions variableDefinitions; - @NonNull private final ByteBuffer[] values; - @NonNull private final CodecRegistry codecRegistry; - @NonNull private final ProtocolVersion protocolVersion; + @Nonnull private final PreparedStatement preparedStatement; + @Nonnull private final ColumnDefinitions variableDefinitions; + @Nonnull private final ByteBuffer[] values; + @Nonnull private final CodecRegistry codecRegistry; + @Nonnull private final ProtocolVersion protocolVersion; public BoundStatementBuilder( - @NonNull PreparedStatement preparedStatement, - @NonNull ColumnDefinitions variableDefinitions, - @NonNull ByteBuffer[] values, + @Nonnull PreparedStatement preparedStatement, + @Nonnull ColumnDefinitions variableDefinitions, + @Nonnull ByteBuffer[] values, @Nullable String executionProfileName, @Nullable DriverExecutionProfile executionProfile, @Nullable CqlIdentifier routingKeyspace, @Nullable ByteBuffer routingKey, @Nullable Token routingToken, - @NonNull Map customPayload, + @Nonnull Map customPayload, @Nullable Boolean idempotent, boolean tracing, long timestamp, @@ -66,8 +66,8 @@ public BoundStatementBuilder( @Nullable ConsistencyLevel consistencyLevel, @Nullable ConsistencyLevel serialConsistencyLevel, @Nullable Duration timeout, - @NonNull CodecRegistry codecRegistry, - @NonNull ProtocolVersion protocolVersion) { + @Nonnull CodecRegistry codecRegistry, + @Nonnull ProtocolVersion protocolVersion) { this.preparedStatement = preparedStatement; this.variableDefinitions = variableDefinitions; this.values = values; @@ -91,7 +91,7 @@ public BoundStatementBuilder( this.protocolVersion = protocolVersion; } - public BoundStatementBuilder(@NonNull BoundStatement template) { + public BoundStatementBuilder(@Nonnull BoundStatement template) { super(template); this.preparedStatement = template.getPreparedStatement(); this.variableDefinitions = template.getPreparedStatement().getVariableDefinitions(); @@ -102,14 +102,14 @@ public BoundStatementBuilder(@NonNull BoundStatement template) { } /** The prepared statement that was used to create this statement. */ - @NonNull + @Nonnull public PreparedStatement getPreparedStatement() { return preparedStatement; } - @NonNull + @Nonnull @Override - public List allIndicesOf(@NonNull CqlIdentifier id) { + public List allIndicesOf(@Nonnull CqlIdentifier id) { List indices = variableDefinitions.allIndicesOf(id); if (indices.isEmpty()) { throw new IllegalArgumentException(id + " is not a variable in this bound statement"); @@ -118,7 +118,7 @@ public List allIndicesOf(@NonNull CqlIdentifier id) { } @Override - public int firstIndexOf(@NonNull CqlIdentifier id) { + public int firstIndexOf(@Nonnull CqlIdentifier id) { int indexOf = variableDefinitions.firstIndexOf(id); if (indexOf == -1) { throw new IllegalArgumentException(id + " is not a variable in this bound statement"); @@ -126,9 +126,9 @@ public int firstIndexOf(@NonNull CqlIdentifier id) { return indexOf; } - @NonNull + @Nonnull @Override - public List allIndicesOf(@NonNull String name) { + public List allIndicesOf(@Nonnull String name) { List indices = variableDefinitions.allIndicesOf(name); if (indices.isEmpty()) { throw new IllegalArgumentException(name + " is not a variable in this bound statement"); @@ -137,7 +137,7 @@ public List allIndicesOf(@NonNull String name) { } @Override - public int firstIndexOf(@NonNull String name) { + public int firstIndexOf(@Nonnull String name) { int indexOf = variableDefinitions.firstIndexOf(name); if (indexOf == -1) { throw new IllegalArgumentException(name + " is not a variable in this bound statement"); @@ -145,7 +145,7 @@ public int firstIndexOf(@NonNull String name) { return indexOf; } - @NonNull + @Nonnull @Override public BoundStatementBuilder setBytesUnsafe(int i, ByteBuffer v) { values[i] = v; @@ -162,25 +162,25 @@ public int size() { return values.length; } - @NonNull + @Nonnull @Override public DataType getType(int i) { return variableDefinitions.get(i).getType(); } - @NonNull + @Nonnull @Override public CodecRegistry codecRegistry() { return codecRegistry; } - @NonNull + @Nonnull @Override public ProtocolVersion protocolVersion() { return protocolVersion; } - @NonNull + @Nonnull @Override public BoundStatement build() { return new DefaultBoundStatement( diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/ColumnDefinition.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/ColumnDefinition.java index cb48f058be4..1fdc7b4a055 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/ColumnDefinition.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/ColumnDefinition.java @@ -20,7 +20,7 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.core.detach.Detachable; import com.datastax.oss.driver.api.core.type.DataType; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * Metadata about a CQL column. @@ -31,15 +31,15 @@ */ public interface ColumnDefinition extends Detachable { - @NonNull + @Nonnull CqlIdentifier getKeyspace(); - @NonNull + @Nonnull CqlIdentifier getTable(); - @NonNull + @Nonnull CqlIdentifier getName(); - @NonNull + @Nonnull DataType getType(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/ColumnDefinitions.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/ColumnDefinitions.java index 7a775064317..1674d775e5c 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/ColumnDefinitions.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/ColumnDefinitions.java @@ -21,9 +21,9 @@ import com.datastax.oss.driver.api.core.data.AccessibleByName; import com.datastax.oss.driver.api.core.detach.Detachable; import com.datastax.oss.driver.internal.core.util.Loggers; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collections; import java.util.List; +import javax.annotation.Nonnull; /** * Metadata about a set of CQL columns. @@ -42,7 +42,7 @@ public interface ColumnDefinitions extends Iterable, Detachabl * @throws IndexOutOfBoundsException if the index is invalid. * @return the {@code i}th {@link ColumnDefinition} in this metadata. */ - @NonNull + @Nonnull ColumnDefinition get(int i); /** @@ -59,8 +59,8 @@ public interface ColumnDefinitions extends Iterable, Detachabl * @see #contains(String) * @see #firstIndexOf(String) */ - @NonNull - default ColumnDefinition get(@NonNull String name) { + @Nonnull + default ColumnDefinition get(@Nonnull String name) { if (!contains(name)) { throw new IllegalArgumentException("No definition named " + name); } else { @@ -82,8 +82,8 @@ default ColumnDefinition get(@NonNull String name) { * @see #contains(CqlIdentifier) * @see #firstIndexOf(CqlIdentifier) */ - @NonNull - default ColumnDefinition get(@NonNull CqlIdentifier name) { + @Nonnull + default ColumnDefinition get(@Nonnull CqlIdentifier name) { if (!contains(name)) { throw new IllegalArgumentException("No definition named " + name); } else { @@ -97,10 +97,10 @@ default ColumnDefinition get(@NonNull CqlIdentifier name) { *

Because raw strings are ambiguous with regard to case-sensitivity, the argument will be * interpreted according to the rules described in {@link AccessibleByName}. */ - boolean contains(@NonNull String name); + boolean contains(@Nonnull String name); /** Whether there is a definition using the given CQL identifier. */ - boolean contains(@NonNull CqlIdentifier id); + boolean contains(@Nonnull CqlIdentifier id); /** * Returns the indices of all columns that use the given name. @@ -115,8 +115,8 @@ default ColumnDefinition get(@NonNull CqlIdentifier name) { *

Implementors should always override this method (all built-in driver implementations * do). */ - @NonNull - default List allIndicesOf(@NonNull String name) { + @Nonnull + default List allIndicesOf(@Nonnull String name) { Loggers.COLUMN_DEFINITIONS.warn( "{} should override allIndicesOf(String), the default implementation is a " + "workaround for backward compatibility, it only returns the first occurrence", @@ -132,7 +132,7 @@ default List allIndicesOf(@NonNull String name) { * * @return the index, or -1 if no column uses this name. */ - int firstIndexOf(@NonNull String name); + int firstIndexOf(@Nonnull String name); /** * Returns the indices of all columns that use the given identifier. @@ -144,8 +144,8 @@ default List allIndicesOf(@NonNull String name) { *

Implementors should always override this method (all built-in driver implementations * do). */ - @NonNull - default List allIndicesOf(@NonNull CqlIdentifier id) { + @Nonnull + default List allIndicesOf(@Nonnull CqlIdentifier id) { Loggers.COLUMN_DEFINITIONS.warn( "{} should override allIndicesOf(CqlIdentifier), the default implementation is a " + "workaround for backward compatibility, it only returns the first occurrence", @@ -158,5 +158,5 @@ default List allIndicesOf(@NonNull CqlIdentifier id) { * * @return the index, or -1 if no column uses this identifier. */ - int firstIndexOf(@NonNull CqlIdentifier id); + int firstIndexOf(@Nonnull CqlIdentifier id); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/ExecutionInfo.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/ExecutionInfo.java index 40cfca827d1..8c41971bf52 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/ExecutionInfo.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/ExecutionInfo.java @@ -31,13 +31,13 @@ import com.datastax.oss.driver.internal.core.cql.DefaultPagingState; import com.datastax.oss.driver.internal.core.util.concurrent.BlockingOperation; import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.util.List; import java.util.Map; import java.util.UUID; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Information about the execution of a query. @@ -51,7 +51,7 @@ public interface ExecutionInfo { /** @return The {@link Request} that was executed. */ - @NonNull + @Nonnull default Request getRequest() { return getStatement(); } @@ -62,7 +62,7 @@ default Request getRequest() { * @throws ClassCastException If the request that was executed cannot be cast to {@link * Statement}. */ - @NonNull + @Nonnull @Deprecated Statement getStatement(); @@ -110,7 +110,7 @@ default Request getRequest() { * interleaved. A node can appear multiple times (if the retry policy decided to retry on the same * node). */ - @NonNull + @Nonnull List> getErrors(); /** @@ -159,7 +159,7 @@ default PagingState getSafePagingState() { *

This feature is only available with {@link DefaultProtocolVersion#V4} or above; with lower * versions, this list will always be empty. */ - @NonNull + @Nonnull List getWarnings(); /** @@ -173,7 +173,7 @@ default PagingState getSafePagingState() { *

This feature is only available with {@link DefaultProtocolVersion#V4} or above; with lower * versions, this map will always be empty. */ - @NonNull + @Nonnull Map getIncomingPayload(); /** @@ -211,7 +211,7 @@ default PagingState getSafePagingState() { *

This method will return a failed future if tracing was disabled for the query (that is, if * {@link #getTracingId()} is null). */ - @NonNull + @Nonnull CompletionStage getQueryTraceAsync(); /** @@ -221,7 +221,7 @@ default PagingState getSafePagingState() { * * @throws IllegalStateException if {@link #getTracingId()} is null. */ - @NonNull + @Nonnull default QueryTrace getQueryTrace() { BlockingOperation.checkNotDriverThread(); return CompletableFutures.getUninterruptibly(getQueryTraceAsync()); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/PagingState.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/PagingState.java index b9042f99841..3ffb5fe9036 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/PagingState.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/PagingState.java @@ -19,9 +19,9 @@ import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.internal.core.cql.DefaultPagingState; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A safe wrapper around the paging state of a query. @@ -37,13 +37,13 @@ public interface PagingState { /** Parses an instance from a string previously generated with {@code toString()}. */ - @NonNull - static PagingState fromString(@NonNull String string) { + @Nonnull + static PagingState fromString(@Nonnull String string) { return DefaultPagingState.fromString(string); } /** Parses an instance from a byte array previously generated with {@link #toBytes()}. */ - @NonNull + @Nonnull static PagingState fromBytes(byte[] bytes) { return DefaultPagingState.fromBytes(bytes); } @@ -62,7 +62,7 @@ static PagingState fromBytes(byte[] bytes) { * *

If {@code statement} is a {@link BoundStatement}, it is always safe to call this method. */ - default boolean matches(@NonNull Statement statement) { + default boolean matches(@Nonnull Statement statement) { return matches(statement, null); } @@ -71,12 +71,12 @@ default boolean matches(@NonNull Statement statement) { * executed with. You only need this for simple statements, and if you use custom codecs. * Bound statements already know which session they are attached to. */ - boolean matches(@NonNull Statement statement, @Nullable Session session); + boolean matches(@Nonnull Statement statement, @Nullable Session session); /** * Returns the underlying "unsafe" paging state (the equivalent of {@link * ExecutionInfo#getPagingState()}). */ - @NonNull + @Nonnull ByteBuffer getRawPagingState(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/PrepareRequest.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/PrepareRequest.java index eb04f26c046..c6026a0e089 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/PrepareRequest.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/PrepareRequest.java @@ -26,12 +26,12 @@ import com.datastax.oss.driver.api.core.session.Request; import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.time.Duration; import java.util.Map; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A request to prepare a CQL query. @@ -67,7 +67,7 @@ public interface PrepareRequest extends Request { new GenericType>() {}; /** The CQL query to prepare. */ - @NonNull + @Nonnull String getQuery(); /** @@ -76,7 +76,7 @@ public interface PrepareRequest extends Request { *

Note that this refers to the prepare query itself, not to the bound statements that will be * created from the prepared statement (see {@link #areBoundStatementsIdempotent()}). */ - @NonNull + @Nonnull @Override default Boolean isIdempotent() { // Retrying to prepare is always safe @@ -124,7 +124,7 @@ default Boolean isIdempotent() { * Returns the custom payload to send alongside the bound statements that will be created from the * prepared statement. */ - @NonNull + @Nonnull Map getCustomPayloadForBoundStatements(); /** diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/PreparedStatement.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/PreparedStatement.java index 7828f9f809c..145ce77bff6 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/PreparedStatement.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/PreparedStatement.java @@ -19,10 +19,10 @@ import com.datastax.oss.driver.api.core.CqlSession; import com.datastax.oss.driver.api.core.DefaultProtocolVersion; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.util.List; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A query with bind variables that has been pre-parsed by the database. @@ -43,14 +43,14 @@ public interface PreparedStatement { * *

Note: the returned buffer is read-only. */ - @NonNull + @Nonnull ByteBuffer getId(); - @NonNull + @Nonnull String getQuery(); /** A description of the bind variables of this prepared statement. */ - @NonNull + @Nonnull ColumnDefinitions getVariableDefinitions(); /** @@ -75,7 +75,7 @@ public interface PreparedStatement { * ps2.getPartitionKeyIndices()} is empty (because one of the partition key components is * hard-coded in the query string). */ - @NonNull + @Nonnull List getPartitionKeyIndices(); /** @@ -103,7 +103,7 @@ public interface PreparedStatement { * EXISTS}), which do return columns; for those cases, use {@link * ResultSet#getColumnDefinitions()} on the result, not this method. */ - @NonNull + @Nonnull ColumnDefinitions getResultSetDefinitions(); /** @@ -113,7 +113,7 @@ public interface PreparedStatement { * cause existing queries to fail. */ void setResultMetadata( - @NonNull ByteBuffer newResultMetadataId, @NonNull ColumnDefinitions newResultSetDefinitions); + @Nonnull ByteBuffer newResultMetadataId, @Nonnull ColumnDefinitions newResultSetDefinitions); /** * Builds an executable statement that associates a set of values with the bind variables. @@ -130,8 +130,8 @@ void setResultMetadata( * IllegalArgumentException} if there are more values than variables. Individual values can be * {@code null}, but the vararg array itself can't. */ - @NonNull - BoundStatement bind(@NonNull Object... values); + @Nonnull + BoundStatement bind(@Nonnull Object... values); /** * Returns a builder to construct an executable statement. @@ -140,6 +140,6 @@ void setResultMetadata( * * @see #bind(Object...) */ - @NonNull - BoundStatementBuilder boundStatementBuilder(@NonNull Object... values); + @Nonnull + BoundStatementBuilder boundStatementBuilder(@Nonnull Object... values); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/QueryTrace.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/QueryTrace.java index 37ebb85c0db..3a3aba293ef 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/QueryTrace.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/QueryTrace.java @@ -17,12 +17,12 @@ */ package com.datastax.oss.driver.api.core.cql; -import edu.umd.cs.findbugs.annotations.NonNull; import java.net.InetAddress; import java.net.InetSocketAddress; import java.util.List; import java.util.Map; import java.util.UUID; +import javax.annotation.Nonnull; /** * Tracing information for a query. @@ -33,10 +33,10 @@ */ public interface QueryTrace { - @NonNull + @Nonnull UUID getTracingId(); - @NonNull + @Nonnull String getRequestType(); /** The server-side duration of the query in microseconds. */ @@ -46,7 +46,7 @@ public interface QueryTrace { * @deprecated returns the coordinator IP, but {@link #getCoordinatorAddress()} should be * preferred, since C* 4.0 and above now returns the port was well. */ - @NonNull + @Nonnull @Deprecated InetAddress getCoordinator(); @@ -60,13 +60,13 @@ public interface QueryTrace { * * @since 4.6.0 */ - @NonNull + @Nonnull default InetSocketAddress getCoordinatorAddress() { return new InetSocketAddress(getCoordinator(), 0); } /** The parameters attached to this trace. */ - @NonNull + @Nonnull Map getParameters(); /** The server-side timestamp of the start of this query. */ @@ -80,6 +80,6 @@ default InetSocketAddress getCoordinatorAddress() { * requested just after the return of the query (the only guarantee being that the list will * contain the events pertaining to the coordinator). */ - @NonNull + @Nonnull List getEvents(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/Row.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/Row.java index 5eab449b057..eede80c0dde 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/Row.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/Row.java @@ -22,7 +22,7 @@ import com.datastax.oss.driver.api.core.data.GettableByName; import com.datastax.oss.driver.api.core.detach.Detachable; import com.datastax.oss.driver.api.core.type.codec.TypeCodec; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * A row from a CQL table. @@ -34,7 +34,7 @@ public interface Row extends GettableByIndex, GettableByName, GettableById, Detachable { /** @return the column definitions contained in this result set. */ - @NonNull + @Nonnull ColumnDefinitions getColumnDefinitions(); /** @@ -57,7 +57,7 @@ public interface Row extends GettableByIndex, GettableByName, GettableById, Deta * might be undesirable to leak data in application logs. * */ - @NonNull + @Nonnull default String getFormattedContents() { StringBuilder result = new StringBuilder("["); ColumnDefinitions definitions = getColumnDefinitions(); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/SimpleStatement.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/SimpleStatement.java index fd5f456f11c..25ee89ab6b9 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/SimpleStatement.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/SimpleStatement.java @@ -28,10 +28,10 @@ import com.datastax.oss.protocol.internal.PrimitiveSizes; import com.datastax.oss.protocol.internal.util.collection.NullAllowingImmutableList; import com.datastax.oss.protocol.internal.util.collection.NullAllowingImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.List; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A one-off CQL statement consisting of a query string with optional placeholders, and a set of @@ -62,7 +62,7 @@ public interface SimpleStatement extends BatchableStatement { * *

Note that the returned object is immutable. */ - static SimpleStatement newInstance(@NonNull String cqlQuery) { + static SimpleStatement newInstance(@Nonnull String cqlQuery) { return new DefaultSimpleStatement( cqlQuery, NullAllowingImmutableList.of(), @@ -96,7 +96,7 @@ static SimpleStatement newInstance(@NonNull String cqlQuery) { * be {@code null}, but the vararg array itself can't. */ static SimpleStatement newInstance( - @NonNull String cqlQuery, @NonNull Object... positionalValues) { + @Nonnull String cqlQuery, @Nonnull Object... positionalValues) { return new DefaultSimpleStatement( cqlQuery, NullAllowingImmutableList.of(positionalValues), @@ -127,7 +127,7 @@ static SimpleStatement newInstance( *

Note that the returned object is immutable. */ static SimpleStatement newInstance( - @NonNull String cqlQuery, @NonNull Map namedValues) { + @Nonnull String cqlQuery, @Nonnull Map namedValues) { return new DefaultSimpleStatement( cqlQuery, NullAllowingImmutableList.of(), @@ -156,8 +156,8 @@ static SimpleStatement newInstance( * *

Note that this builder is mutable and not thread-safe. */ - @NonNull - static SimpleStatementBuilder builder(@NonNull String query) { + @Nonnull + static SimpleStatementBuilder builder(@Nonnull String query) { return new SimpleStatementBuilder(query); } @@ -167,12 +167,12 @@ static SimpleStatementBuilder builder(@NonNull String query) { * *

Note that this builder is mutable and not thread-safe. */ - @NonNull - static SimpleStatementBuilder builder(@NonNull SimpleStatement template) { + @Nonnull + static SimpleStatementBuilder builder(@Nonnull SimpleStatement template) { return new SimpleStatementBuilder(template); } - @NonNull + @Nonnull String getQuery(); /** @@ -196,8 +196,8 @@ static SimpleStatementBuilder builder(@NonNull SimpleStatement template) { * @see #setPositionalValues(List) * @see #setNamedValuesWithIds(Map) */ - @NonNull - SimpleStatement setQuery(@NonNull String newQuery); + @Nonnull + SimpleStatement setQuery(@Nonnull String newQuery); /** * Sets the CQL keyspace to associate with the query. @@ -208,19 +208,19 @@ static SimpleStatementBuilder builder(@NonNull SimpleStatement template) { * * @see Request#getKeyspace() */ - @NonNull + @Nonnull SimpleStatement setKeyspace(@Nullable CqlIdentifier newKeyspace); /** * Shortcut for {@link #setKeyspace(CqlIdentifier) * setKeyspace(CqlIdentifier.fromCql(newKeyspaceName))}. */ - @NonNull - default SimpleStatement setKeyspace(@NonNull String newKeyspaceName) { + @Nonnull + default SimpleStatement setKeyspace(@Nonnull String newKeyspaceName) { return setKeyspace(CqlIdentifier.fromCql(newKeyspaceName)); } - @NonNull + @Nonnull List getPositionalValues(); /** @@ -235,10 +235,10 @@ default SimpleStatement setKeyspace(@NonNull String newKeyspaceName) { * * @see #setQuery(String) */ - @NonNull - SimpleStatement setPositionalValues(@NonNull List newPositionalValues); + @Nonnull + SimpleStatement setPositionalValues(@Nonnull List newPositionalValues); - @NonNull + @Nonnull Map getNamedValues(); /** @@ -255,20 +255,20 @@ default SimpleStatement setKeyspace(@NonNull String newKeyspaceName) { * * @see #setQuery(String) */ - @NonNull - SimpleStatement setNamedValuesWithIds(@NonNull Map newNamedValues); + @Nonnull + SimpleStatement setNamedValuesWithIds(@Nonnull Map newNamedValues); /** * Shortcut for {@link #setNamedValuesWithIds(Map)} with raw strings as value names. The keys are * converted on the fly with {@link CqlIdentifier#fromCql(String)}. */ - @NonNull - default SimpleStatement setNamedValues(@NonNull Map newNamedValues) { + @Nonnull + default SimpleStatement setNamedValues(@Nonnull Map newNamedValues) { return setNamedValuesWithIds(DefaultSimpleStatement.wrapKeys(newNamedValues)); } @Override - default int computeSizeInBytes(@NonNull DriverContext context) { + default int computeSizeInBytes(@Nonnull DriverContext context) { int size = Sizes.minimumStatementSize(this, context); // SimpleStatement's additional elements to take into account are: diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/SimpleStatementBuilder.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/SimpleStatementBuilder.java index 1ac910ff6a7..52332106df8 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/SimpleStatementBuilder.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/SimpleStatementBuilder.java @@ -21,11 +21,11 @@ import com.datastax.oss.driver.internal.core.cql.DefaultSimpleStatement; import com.datastax.oss.protocol.internal.util.collection.NullAllowingImmutableList; import com.datastax.oss.protocol.internal.util.collection.NullAllowingImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Arrays; import java.util.List; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.NotThreadSafe; /** @@ -37,16 +37,16 @@ public class SimpleStatementBuilder extends StatementBuilder { - @NonNull private String query; + @Nonnull private String query; @Nullable private CqlIdentifier keyspace; @Nullable private NullAllowingImmutableList.Builder positionalValuesBuilder; @Nullable private NullAllowingImmutableMap.Builder namedValuesBuilder; - public SimpleStatementBuilder(@NonNull String query) { + public SimpleStatementBuilder(@Nonnull String query) { this.query = query; } - public SimpleStatementBuilder(@NonNull SimpleStatement template) { + public SimpleStatementBuilder(@Nonnull SimpleStatement template) { super(template); if (!template.getPositionalValues().isEmpty() && !template.getNamedValues().isEmpty()) { throw new IllegalArgumentException( @@ -67,14 +67,14 @@ public SimpleStatementBuilder(@NonNull SimpleStatement template) { } /** @see SimpleStatement#getQuery() */ - @NonNull - public SimpleStatementBuilder setQuery(@NonNull String query) { + @Nonnull + public SimpleStatementBuilder setQuery(@Nonnull String query) { this.query = query; return this; } /** @see SimpleStatement#getKeyspace() */ - @NonNull + @Nonnull public SimpleStatementBuilder setKeyspace(@Nullable CqlIdentifier keyspace) { this.keyspace = keyspace; return this; @@ -84,13 +84,13 @@ public SimpleStatementBuilder setKeyspace(@Nullable CqlIdentifier keyspace) { * Shortcut for {@link #setKeyspace(CqlIdentifier) * setKeyspace(CqlIdentifier.fromCql(keyspaceName))}. */ - @NonNull + @Nonnull public SimpleStatementBuilder setKeyspace(@Nullable String keyspaceName) { return setKeyspace(keyspaceName == null ? null : CqlIdentifier.fromCql(keyspaceName)); } /** @see SimpleStatement#setPositionalValues(List) */ - @NonNull + @Nonnull public SimpleStatementBuilder addPositionalValue(@Nullable Object value) { if (namedValuesBuilder != null) { throw new IllegalArgumentException( @@ -104,8 +104,8 @@ public SimpleStatementBuilder addPositionalValue(@Nullable Object value) { } /** @see SimpleStatement#setPositionalValues(List) */ - @NonNull - public SimpleStatementBuilder addPositionalValues(@NonNull Iterable values) { + @Nonnull + public SimpleStatementBuilder addPositionalValues(@Nonnull Iterable values) { if (namedValuesBuilder != null) { throw new IllegalArgumentException( "Can't have both positional and named values in a statement."); @@ -118,21 +118,21 @@ public SimpleStatementBuilder addPositionalValues(@NonNull Iterable valu } /** @see SimpleStatement#setPositionalValues(List) */ - @NonNull - public SimpleStatementBuilder addPositionalValues(@NonNull Object... values) { + @Nonnull + public SimpleStatementBuilder addPositionalValues(@Nonnull Object... values) { return addPositionalValues(Arrays.asList(values)); } /** @see SimpleStatement#setPositionalValues(List) */ - @NonNull + @Nonnull public SimpleStatementBuilder clearPositionalValues() { positionalValuesBuilder = NullAllowingImmutableList.builder(); return this; } /** @see SimpleStatement#setNamedValuesWithIds(Map) */ - @NonNull - public SimpleStatementBuilder addNamedValue(@NonNull CqlIdentifier name, @Nullable Object value) { + @Nonnull + public SimpleStatementBuilder addNamedValue(@Nonnull CqlIdentifier name, @Nullable Object value) { if (positionalValuesBuilder != null) { throw new IllegalArgumentException( "Can't have both positional and named values in a statement."); @@ -148,19 +148,19 @@ public SimpleStatementBuilder addNamedValue(@NonNull CqlIdentifier name, @Nullab * Shortcut for {@link #addNamedValue(CqlIdentifier, Object) * addNamedValue(CqlIdentifier.fromCql(name), value)}. */ - @NonNull - public SimpleStatementBuilder addNamedValue(@NonNull String name, @Nullable Object value) { + @Nonnull + public SimpleStatementBuilder addNamedValue(@Nonnull String name, @Nullable Object value) { return addNamedValue(CqlIdentifier.fromCql(name), value); } /** @see SimpleStatement#setNamedValuesWithIds(Map) */ - @NonNull + @Nonnull public SimpleStatementBuilder clearNamedValues() { namedValuesBuilder = NullAllowingImmutableMap.builder(); return this; } - @NonNull + @Nonnull @Override public SimpleStatement build() { return new DefaultSimpleStatement( diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/Statement.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/Statement.java index 594c627e324..d565334ade1 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/Statement.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/Statement.java @@ -34,13 +34,13 @@ import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.internal.core.util.RoutingKey; import com.datastax.oss.protocol.internal.request.query.QueryOptions; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.time.Duration; import java.util.Map; import java.util.concurrent.CompletionStage; +import javax.annotation.CheckReturnValue; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A request to execute a CQL query. @@ -93,7 +93,7 @@ public interface Statement> extends Request { *

All the driver's built-in implementations are immutable, and return a new instance from this * method. However custom implementations may choose to be mutable and return the same instance. */ - @NonNull + @Nonnull @CheckReturnValue SelfT setExecutionProfileName(@Nullable String newConfigProfileName); @@ -106,7 +106,7 @@ public interface Statement> extends Request { *

All the driver's built-in implementations are immutable, and return a new instance from this * method. However custom implementations may choose to be mutable and return the same instance. */ - @NonNull + @Nonnull @CheckReturnValue SelfT setExecutionProfile(@Nullable DriverExecutionProfile newProfile); @@ -117,7 +117,7 @@ public interface Statement> extends Request { * * @param newRoutingKeyspace The keyspace to use, or {@code null} to disable token-aware routing. */ - @NonNull + @Nonnull @CheckReturnValue SelfT setRoutingKeyspace(@Nullable CqlIdentifier newRoutingKeyspace); @@ -142,7 +142,7 @@ public interface Statement> extends Request { * @param node The node that should be used to handle executions of this statement or null to * delegate to the configured load balancing policy. */ - @NonNull + @Nonnull @CheckReturnValue SelfT setNode(@Nullable Node node); @@ -153,7 +153,7 @@ public interface Statement> extends Request { * @param newRoutingKeyspaceName The keyspace to use, or {@code null} to disable token-aware * routing. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setRoutingKeyspace(@Nullable String newRoutingKeyspaceName) { return setRoutingKeyspace( @@ -167,7 +167,7 @@ default SelfT setRoutingKeyspace(@Nullable String newRoutingKeyspaceName) { * * @param newRoutingKey The routing key to use, or {@code null} to disable token-aware routing. */ - @NonNull + @Nonnull @CheckReturnValue SelfT setRoutingKey(@Nullable ByteBuffer newRoutingKey); @@ -178,9 +178,9 @@ default SelfT setRoutingKeyspace(@Nullable String newRoutingKeyspaceName) { * #setRoutingKey(ByteBuffer)}. Neither the individual components, nor the vararg array itself, * can be {@code null}. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setRoutingKey(@NonNull ByteBuffer... newRoutingKeyComponents) { + default SelfT setRoutingKey(@Nonnull ByteBuffer... newRoutingKeyComponents) { return setRoutingKey(RoutingKey.compose(newRoutingKeyComponents)); } @@ -192,7 +192,7 @@ default SelfT setRoutingKey(@NonNull ByteBuffer... newRoutingKeyComponents) { * @param newRoutingToken The routing token to use, or {@code null} to disable token-aware * routing. */ - @NonNull + @Nonnull @CheckReturnValue SelfT setRoutingToken(@Nullable Token newRoutingToken); @@ -207,9 +207,9 @@ default SelfT setRoutingKey(@NonNull ByteBuffer... newRoutingKeyComponents) { * concurrent or immutable implementation, or by making it effectively immutable (meaning that * it's never modified after being set on the statement). */ - @NonNull + @Nonnull @CheckReturnValue - SelfT setCustomPayload(@NonNull Map newCustomPayload); + SelfT setCustomPayload(@Nonnull Map newCustomPayload); /** * Sets the idempotence to use for execution. @@ -220,7 +220,7 @@ default SelfT setRoutingKey(@NonNull ByteBuffer... newRoutingKeyComponents) { * @param newIdempotence a boolean instance to set a statement-specific value, or {@code null} to * use the default idempotence defined in the configuration. */ - @NonNull + @Nonnull @CheckReturnValue SelfT setIdempotent(@Nullable Boolean newIdempotence); @@ -230,7 +230,7 @@ default SelfT setRoutingKey(@NonNull ByteBuffer... newRoutingKeyComponents) { *

All the driver's built-in implementations are immutable, and return a new instance from this * method. However custom implementations may choose to be mutable and return the same instance. */ - @NonNull + @Nonnull @CheckReturnValue SelfT setTracing(boolean newTracing); @@ -239,7 +239,7 @@ default SelfT setRoutingKey(@NonNull ByteBuffer... newRoutingKeyComponents) { * {@link #setTracing(boolean) setTracing(true)}. */ @Deprecated - @NonNull + @Nonnull @CheckReturnValue default SelfT enableTracing() { return setTracing(true); @@ -250,7 +250,7 @@ default SelfT enableTracing() { * {@link #setTracing(boolean) setTracing(false)}. */ @Deprecated - @NonNull + @Nonnull @CheckReturnValue default SelfT disableTracing() { return setTracing(false); @@ -302,7 +302,7 @@ default long getDefaultTimestamp() { * @see #NO_DEFAULT_TIMESTAMP * @see TimestampGenerator */ - @NonNull + @Nonnull @CheckReturnValue SelfT setQueryTimestamp(long newTimestamp); @@ -311,7 +311,7 @@ default long getDefaultTimestamp() { * {@link #setQueryTimestamp(long)}. */ @Deprecated - @NonNull + @Nonnull @CheckReturnValue default SelfT setDefaultTimestamp(long newTimestamp) { return setQueryTimestamp(newTimestamp); @@ -325,7 +325,7 @@ default SelfT setDefaultTimestamp(long newTimestamp) { * configuration. * @see DefaultDriverOption#REQUEST_TIMEOUT */ - @NonNull + @Nonnull @CheckReturnValue SelfT setTimeout(@Nullable Duration newTimeout); @@ -356,7 +356,7 @@ default SelfT setDefaultTimestamp(long newTimestamp) { * method. However custom implementations may choose to be mutable and return the same instance; * if you do so, you must override {@link #copy(ByteBuffer)}. */ - @NonNull + @Nonnull @CheckReturnValue SelfT setPagingState(@Nullable ByteBuffer newPagingState); @@ -378,7 +378,7 @@ default SelfT setDefaultTimestamp(long newTimestamp) { * @see #setPagingState(ByteBuffer) * @see ExecutionInfo#getSafePagingState() */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setPagingState(@Nullable PagingState newPagingState) { return setPagingState(newPagingState, null); @@ -389,7 +389,7 @@ default SelfT setPagingState(@Nullable PagingState newPagingState) { * will be executed with. You only need this for simple statements, and if you use custom * codecs. Bound statements already know which session they are attached to. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setPagingState(@Nullable PagingState newPagingState, @Nullable Session session) { if (newPagingState == null) { @@ -430,7 +430,7 @@ default int getFetchSize() { * defined in the configuration. * @see DefaultDriverOption#REQUEST_PAGE_SIZE */ - @NonNull + @Nonnull @CheckReturnValue SelfT setPageSize(int newPageSize); @@ -439,7 +439,7 @@ default int getFetchSize() { * {@link #setPageSize(int)}. */ @Deprecated - @NonNull + @Nonnull @CheckReturnValue default SelfT setFetchSize(int newPageSize) { return setPageSize(newPageSize); @@ -462,7 +462,7 @@ default SelfT setFetchSize(int newPageSize) { * defined in the configuration. * @see DefaultDriverOption#REQUEST_CONSISTENCY */ - @NonNull + @Nonnull @CheckReturnValue SelfT setConsistencyLevel(@Nullable ConsistencyLevel newConsistencyLevel); @@ -483,7 +483,7 @@ default SelfT setFetchSize(int newPageSize) { * default value defined in the configuration. * @see DefaultDriverOption#REQUEST_SERIAL_CONSISTENCY */ - @NonNull + @Nonnull @CheckReturnValue SelfT setSerialConsistencyLevel(@Nullable ConsistencyLevel newSerialConsistencyLevel); @@ -512,7 +512,7 @@ default int getNowInSeconds() { * * @see #NO_NOW_IN_SECONDS */ - @NonNull + @Nonnull @SuppressWarnings("unchecked") default SelfT setNowInSeconds(int nowInSeconds) { return (SelfT) this; @@ -530,7 +530,7 @@ default SelfT setNowInSeconds(int nowInSeconds) { * * @return the approximate number of bytes this statement will take when encoded. */ - int computeSizeInBytes(@NonNull DriverContext context); + int computeSizeInBytes(@Nonnull DriverContext context); /** * Creates a new instance with a different paging state. @@ -539,7 +539,7 @@ default SelfT setNowInSeconds(int nowInSeconds) { * default implementation delegates to {@link #setPagingState(ByteBuffer)}. However, if you write * your own mutable implementation, make sure it returns a different instance. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT copy(@Nullable ByteBuffer newPagingState) { return setPagingState(newPagingState); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/StatementBuilder.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/StatementBuilder.java index 531070b854c..73938098f77 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/StatementBuilder.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/StatementBuilder.java @@ -24,11 +24,11 @@ import com.datastax.oss.driver.api.core.metadata.token.Token; import com.datastax.oss.driver.internal.core.util.RoutingKey; import com.datastax.oss.protocol.internal.util.collection.NullAllowingImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.time.Duration; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.NotThreadSafe; /** @@ -90,7 +90,7 @@ protected StatementBuilder(StatementT template) { } /** @see Statement#setExecutionProfileName(String) */ - @NonNull + @Nonnull public SelfT setExecutionProfileName(@Nullable String executionProfileName) { this.executionProfileName = executionProfileName; if (executionProfileName != null) { @@ -100,7 +100,7 @@ public SelfT setExecutionProfileName(@Nullable String executionProfileName) { } /** @see Statement#setExecutionProfile(DriverExecutionProfile) */ - @NonNull + @Nonnull public SelfT setExecutionProfile(@Nullable DriverExecutionProfile executionProfile) { this.executionProfile = executionProfile; if (executionProfile != null) { @@ -110,7 +110,7 @@ public SelfT setExecutionProfile(@Nullable DriverExecutionProfile executionProfi } /** @see Statement#setRoutingKeyspace(CqlIdentifier) */ - @NonNull + @Nonnull public SelfT setRoutingKeyspace(@Nullable CqlIdentifier routingKeyspace) { this.routingKeyspace = routingKeyspace; return self; @@ -120,35 +120,35 @@ public SelfT setRoutingKeyspace(@Nullable CqlIdentifier routingKeyspace) { * Shortcut for {@link #setRoutingKeyspace(CqlIdentifier) * setRoutingKeyspace(CqlIdentifier.fromCql(routingKeyspaceName))}. */ - @NonNull + @Nonnull public SelfT setRoutingKeyspace(@Nullable String routingKeyspaceName) { return setRoutingKeyspace( routingKeyspaceName == null ? null : CqlIdentifier.fromCql(routingKeyspaceName)); } /** @see Statement#setRoutingKey(ByteBuffer) */ - @NonNull + @Nonnull public SelfT setRoutingKey(@Nullable ByteBuffer routingKey) { this.routingKey = routingKey; return self; } /** @see Statement#setRoutingKey(ByteBuffer...) */ - @NonNull - public SelfT setRoutingKey(@NonNull ByteBuffer... newRoutingKeyComponents) { + @Nonnull + public SelfT setRoutingKey(@Nonnull ByteBuffer... newRoutingKeyComponents) { return setRoutingKey(RoutingKey.compose(newRoutingKeyComponents)); } /** @see Statement#setRoutingToken(Token) */ - @NonNull + @Nonnull public SelfT setRoutingToken(@Nullable Token routingToken) { this.routingToken = routingToken; return self; } /** @see Statement#setCustomPayload(Map) */ - @NonNull - public SelfT addCustomPayload(@NonNull String key, @Nullable ByteBuffer value) { + @Nonnull + public SelfT addCustomPayload(@Nonnull String key, @Nullable ByteBuffer value) { if (customPayloadBuilder == null) { customPayloadBuilder = NullAllowingImmutableMap.builder(); } @@ -157,14 +157,14 @@ public SelfT addCustomPayload(@NonNull String key, @Nullable ByteBuffer value) { } /** @see Statement#setCustomPayload(Map) */ - @NonNull + @Nonnull public SelfT clearCustomPayload() { customPayloadBuilder = null; return self; } /** @see Statement#setIdempotent(Boolean) */ - @NonNull + @Nonnull public SelfT setIdempotence(@Nullable Boolean idempotent) { this.idempotent = idempotent; return self; @@ -176,13 +176,13 @@ public SelfT setIdempotence(@Nullable Boolean idempotent) { * * @see Statement#setTracing(boolean) */ - @NonNull + @Nonnull public SelfT setTracing() { return setTracing(true); } /** @see Statement#setTracing(boolean) */ - @NonNull + @Nonnull public SelfT setTracing(boolean tracing) { this.tracing = tracing; return self; @@ -193,7 +193,7 @@ public SelfT setTracing(boolean tracing) { * {@link #setTracing(boolean) setTracing(true)}. */ @Deprecated - @NonNull + @Nonnull public SelfT enableTracing() { return setTracing(true); } @@ -203,13 +203,13 @@ public SelfT enableTracing() { * {@link #setTracing(boolean) setTracing(false)}. */ @Deprecated - @NonNull + @Nonnull public SelfT disableTracing() { return setTracing(false); } /** @see Statement#setQueryTimestamp(long) */ - @NonNull + @Nonnull public SelfT setQueryTimestamp(long timestamp) { this.timestamp = timestamp; return self; @@ -220,20 +220,20 @@ public SelfT setQueryTimestamp(long timestamp) { * {@link #setQueryTimestamp(long)}. */ @Deprecated - @NonNull + @Nonnull public SelfT setDefaultTimestamp(long timestamp) { return setQueryTimestamp(timestamp); } /** @see Statement#setPagingState(ByteBuffer) */ - @NonNull + @Nonnull public SelfT setPagingState(@Nullable ByteBuffer pagingState) { this.pagingState = pagingState; return self; } /** @see Statement#setPageSize(int) */ - @NonNull + @Nonnull public SelfT setPageSize(int pageSize) { this.pageSize = pageSize; return self; @@ -244,27 +244,27 @@ public SelfT setPageSize(int pageSize) { * {@link #setPageSize(int)}. */ @Deprecated - @NonNull + @Nonnull public SelfT setFetchSize(int pageSize) { return this.setPageSize(pageSize); } /** @see Statement#setConsistencyLevel(ConsistencyLevel) */ - @NonNull + @Nonnull public SelfT setConsistencyLevel(@Nullable ConsistencyLevel consistencyLevel) { this.consistencyLevel = consistencyLevel; return self; } /** @see Statement#setSerialConsistencyLevel(ConsistencyLevel) */ - @NonNull + @Nonnull public SelfT setSerialConsistencyLevel(@Nullable ConsistencyLevel serialConsistencyLevel) { this.serialConsistencyLevel = serialConsistencyLevel; return self; } /** @see Statement#setTimeout(Duration) */ - @NonNull + @Nonnull public SelfT setTimeout(@Nullable Duration timeout) { this.timeout = timeout; return self; @@ -282,13 +282,13 @@ public SelfT setNowInSeconds(int nowInSeconds) { return self; } - @NonNull + @Nonnull protected Map buildCustomPayload() { return (customPayloadBuilder == null) ? NullAllowingImmutableMap.of() : customPayloadBuilder.build(); } - @NonNull + @Nonnull public abstract StatementT build(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/SyncCqlSession.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/SyncCqlSession.java index a0f752db407..809a3ea5b72 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/SyncCqlSession.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/SyncCqlSession.java @@ -24,9 +24,9 @@ import com.datastax.oss.driver.api.core.session.Request; import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.internal.core.cql.DefaultPrepareRequest; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; import java.util.Objects; +import javax.annotation.Nonnull; /** * A session that offers user-friendly methods to execute CQL requests synchronously. @@ -50,8 +50,8 @@ public interface SyncCqlSession extends Session { * @throws QueryValidationException if the query is invalid (syntax error, unauthorized or any * other validation problem). */ - @NonNull - default ResultSet execute(@NonNull Statement statement) { + @Nonnull + default ResultSet execute(@Nonnull Statement statement) { return Objects.requireNonNull( execute(statement, Statement.SYNC), "The CQL processor should never return a null result"); } @@ -75,8 +75,8 @@ default ResultSet execute(@NonNull Statement statement) { * other validation problem). * @see SimpleStatement#newInstance(String) */ - @NonNull - default ResultSet execute(@NonNull String query) { + @Nonnull + default ResultSet execute(@Nonnull String query) { return execute(SimpleStatement.newInstance(query)); } @@ -101,8 +101,8 @@ default ResultSet execute(@NonNull String query) { * other validation problem). * @see SimpleStatement#newInstance(String, Object...) */ - @NonNull - default ResultSet execute(@NonNull String query, @NonNull Object... values) { + @Nonnull + default ResultSet execute(@Nonnull String query, @Nonnull Object... values) { return execute(SimpleStatement.newInstance(query, values)); } @@ -127,8 +127,8 @@ default ResultSet execute(@NonNull String query, @NonNull Object... values) { * other validation problem). * @see SimpleStatement#newInstance(String, Map) */ - @NonNull - default ResultSet execute(@NonNull String query, @NonNull Map values) { + @Nonnull + default ResultSet execute(@Nonnull String query, @Nonnull Map values) { return execute(SimpleStatement.newInstance(query, values)); } @@ -202,8 +202,8 @@ default ResultSet execute(@NonNull String query, @NonNull Map va * @return the prepared statement corresponding to {@code statement}. * @throws SyntaxError if the syntax of the query to prepare is not correct. */ - @NonNull - default PreparedStatement prepare(@NonNull SimpleStatement statement) { + @Nonnull + default PreparedStatement prepare(@Nonnull SimpleStatement statement) { return Objects.requireNonNull( execute(new DefaultPrepareRequest(statement), PrepareRequest.SYNC), "The CQL prepare processor should never return a null result"); @@ -220,8 +220,8 @@ default PreparedStatement prepare(@NonNull SimpleStatement statement) { * @return the prepared statement corresponding to {@code query}. * @throws SyntaxError if the syntax of the query to prepare is not correct. */ - @NonNull - default PreparedStatement prepare(@NonNull String query) { + @Nonnull + default PreparedStatement prepare(@Nonnull String query) { return Objects.requireNonNull( execute(new DefaultPrepareRequest(query), PrepareRequest.SYNC), "The CQL prepare processor should never return a null result"); @@ -243,8 +243,8 @@ default PreparedStatement prepare(@NonNull String query) { * @return the prepared statement corresponding to {@code request}. * @throws SyntaxError if the syntax of the query to prepare is not correct. */ - @NonNull - default PreparedStatement prepare(@NonNull PrepareRequest request) { + @Nonnull + default PreparedStatement prepare(@Nonnull PrepareRequest request) { return Objects.requireNonNull( execute(request, PrepareRequest.SYNC), "The CQL prepare processor should never return a null result"); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/cql/TraceEvent.java b/core/src/main/java/com/datastax/oss/driver/api/core/cql/TraceEvent.java index 3043d94057f..6741358bd43 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/cql/TraceEvent.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/cql/TraceEvent.java @@ -17,9 +17,9 @@ */ package com.datastax.oss.driver.api.core.cql; -import edu.umd.cs.findbugs.annotations.Nullable; import java.net.InetAddress; import java.net.InetSocketAddress; +import javax.annotation.Nullable; /** An event in a {@link QueryTrace}. */ public interface TraceEvent { diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/data/AccessibleById.java b/core/src/main/java/com/datastax/oss/driver/api/core/data/AccessibleById.java index 2ca2222424c..42ee2b14f10 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/data/AccessibleById.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/data/AccessibleById.java @@ -20,9 +20,9 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.internal.core.util.Loggers; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collections; import java.util.List; +import javax.annotation.Nonnull; /** * A data structure where the values are accessible via a CQL identifier. @@ -41,8 +41,8 @@ public interface AccessibleById extends AccessibleByIndex { *

Implementors should always override this method (all built-in driver implementations * do). */ - @NonNull - default List allIndicesOf(@NonNull CqlIdentifier id) { + @Nonnull + default List allIndicesOf(@Nonnull CqlIdentifier id) { Loggers.ACCESSIBLE_BY_ID.warn( "{} should override allIndicesOf(CqlIdentifier), the default implementation is a " + "workaround for backward compatibility, it only returns the first occurrence", @@ -56,7 +56,7 @@ default List allIndicesOf(@NonNull CqlIdentifier id) { * * @throws IllegalArgumentException if the id is invalid. */ - int firstIndexOf(@NonNull CqlIdentifier id); + int firstIndexOf(@Nonnull CqlIdentifier id); /** * Returns the CQL type of the value for the first occurrence of {@code id}. @@ -66,6 +66,6 @@ default List allIndicesOf(@NonNull CqlIdentifier id) { * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull - DataType getType(@NonNull CqlIdentifier id); + @Nonnull + DataType getType(@Nonnull CqlIdentifier id); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/data/AccessibleByIndex.java b/core/src/main/java/com/datastax/oss/driver/api/core/data/AccessibleByIndex.java index 3007ed1fb68..7dd8553e13b 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/data/AccessibleByIndex.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/data/AccessibleByIndex.java @@ -18,7 +18,7 @@ package com.datastax.oss.driver.api.core.data; import com.datastax.oss.driver.api.core.type.DataType; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** A data structure where the values are accessible via an integer index. */ public interface AccessibleByIndex extends Data { @@ -31,6 +31,6 @@ public interface AccessibleByIndex extends Data { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull DataType getType(int i); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/data/AccessibleByName.java b/core/src/main/java/com/datastax/oss/driver/api/core/data/AccessibleByName.java index 74574a82f38..6b0762cbfc2 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/data/AccessibleByName.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/data/AccessibleByName.java @@ -20,9 +20,9 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.internal.core.util.Loggers; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collections; import java.util.List; +import javax.annotation.Nonnull; /** * A data structure where the values are accessible via a name string. @@ -57,8 +57,8 @@ public interface AccessibleByName extends AccessibleByIndex { *

Implementors should always override this method (all built-in driver implementations * do). */ - @NonNull - default List allIndicesOf(@NonNull String name) { + @Nonnull + default List allIndicesOf(@Nonnull String name) { Loggers.ACCESSIBLE_BY_NAME.warn( "{} should override allIndicesOf(String), the default implementation is a " + "workaround for backward compatibility, it only returns the first occurrence", @@ -72,7 +72,7 @@ default List allIndicesOf(@NonNull String name) { * * @throws IllegalArgumentException if the name is invalid. */ - int firstIndexOf(@NonNull String name); + int firstIndexOf(@Nonnull String name); /** * Returns the CQL type of the value for the first occurrence of {@code name}. @@ -82,6 +82,6 @@ default List allIndicesOf(@NonNull String name) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull - DataType getType(@NonNull String name); + @Nonnull + DataType getType(@Nonnull String name); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/data/CqlDuration.java b/core/src/main/java/com/datastax/oss/driver/api/core/data/CqlDuration.java index bfa9df20bbb..3a50025dd7f 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/data/CqlDuration.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/data/CqlDuration.java @@ -21,7 +21,6 @@ import com.datastax.oss.driver.shaded.guava.common.base.Objects; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.Serializable; import java.time.Duration; import java.time.Period; @@ -34,6 +33,7 @@ import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; /** @@ -140,7 +140,7 @@ public static CqlDuration newInstance(int months, int days, long nanoseconds) { * * @param input the String to convert */ - public static CqlDuration from(@NonNull String input) { + public static CqlDuration from(@Nonnull String input) { boolean isNegative = input.startsWith("-"); String source = isNegative ? input.substring(1) : input; @@ -156,7 +156,7 @@ public static CqlDuration from(@NonNull String input) { return parseStandardFormat(isNegative, source); } - private static CqlDuration parseIso8601Format(boolean isNegative, @NonNull String source) { + private static CqlDuration parseIso8601Format(boolean isNegative, @Nonnull String source) { Matcher matcher = ISO8601_PATTERN.matcher(source); if (!matcher.matches()) throw new IllegalArgumentException( @@ -188,7 +188,7 @@ private static CqlDuration parseIso8601Format(boolean isNegative, @NonNull Strin } private static CqlDuration parseIso8601AlternativeFormat( - boolean isNegative, @NonNull String source) { + boolean isNegative, @Nonnull String source) { Matcher matcher = ISO8601_ALTERNATIVE_PATTERN.matcher(source); if (!matcher.matches()) { throw new IllegalArgumentException( @@ -204,7 +204,7 @@ private static CqlDuration parseIso8601AlternativeFormat( .build(); } - private static CqlDuration parseIso8601WeekFormat(boolean isNegative, @NonNull String source) { + private static CqlDuration parseIso8601WeekFormat(boolean isNegative, @Nonnull String source) { Matcher matcher = ISO8601_WEEK_PATTERN.matcher(source); if (!matcher.matches()) { throw new IllegalArgumentException( @@ -213,7 +213,7 @@ private static CqlDuration parseIso8601WeekFormat(boolean isNegative, @NonNull S return new Builder(isNegative).addWeeks(groupAsLong(matcher, 1)).build(); } - private static CqlDuration parseStandardFormat(boolean isNegative, @NonNull String source) { + private static CqlDuration parseStandardFormat(boolean isNegative, @Nonnull String source) { Matcher matcher = STANDARD_PATTERN.matcher(source); if (!matcher.find()) { throw new IllegalArgumentException( @@ -236,11 +236,11 @@ private static CqlDuration parseStandardFormat(boolean isNegative, @NonNull Stri return builder.build(); } - private static long groupAsLong(@NonNull Matcher matcher, int group) { + private static long groupAsLong(@Nonnull Matcher matcher, int group) { return Long.parseLong(matcher.group(group)); } - private static Builder add(@NonNull Builder builder, long number, @NonNull String symbol) { + private static Builder add(@Nonnull Builder builder, long number, @Nonnull String symbol) { String s = symbol.toLowerCase(Locale.ROOT); if (s.equals("y")) { return builder.addYears(number); @@ -276,7 +276,7 @@ private static Builder add(@NonNull Builder builder, long number, @NonNull Strin * @return the remainder of the division */ private static long append( - @NonNull StringBuilder builder, long dividend, long divisor, @NonNull String unit) { + @Nonnull StringBuilder builder, long dividend, long divisor, @Nonnull String unit) { if (dividend == 0 || dividend < divisor) { return dividend; } @@ -420,7 +420,7 @@ public Builder(boolean isNegative) { * @param numberOfYears the number of years to add. * @return this {@code Builder} */ - @NonNull + @Nonnull public Builder addYears(long numberOfYears) { validateOrder(1); validateMonths(numberOfYears, MONTHS_PER_YEAR); @@ -437,7 +437,7 @@ public Builder addYears(long numberOfYears) { * @param numberOfMonths the number of months to add. * @return this {@code Builder} */ - @NonNull + @Nonnull public Builder addMonths(long numberOfMonths) { validateOrder(2); validateMonths(numberOfMonths, 1); @@ -451,7 +451,7 @@ public Builder addMonths(long numberOfMonths) { * @param numberOfWeeks the number of weeks to add. * @return this {@code Builder} */ - @NonNull + @Nonnull public Builder addWeeks(long numberOfWeeks) { validateOrder(3); validateDays(numberOfWeeks, DAYS_PER_WEEK); @@ -465,7 +465,7 @@ public Builder addWeeks(long numberOfWeeks) { * @param numberOfDays the number of days to add. * @return this {@code Builder} */ - @NonNull + @Nonnull public Builder addDays(long numberOfDays) { validateOrder(4); validateDays(numberOfDays, 1); @@ -479,7 +479,7 @@ public Builder addDays(long numberOfDays) { * @param numberOfHours the number of hours to add. * @return this {@code Builder} */ - @NonNull + @Nonnull public Builder addHours(long numberOfHours) { validateOrder(5); validateNanos(numberOfHours, NANOS_PER_HOUR); @@ -493,7 +493,7 @@ public Builder addHours(long numberOfHours) { * @param numberOfMinutes the number of minutes to add. * @return this {@code Builder} */ - @NonNull + @Nonnull public Builder addMinutes(long numberOfMinutes) { validateOrder(6); validateNanos(numberOfMinutes, NANOS_PER_MINUTE); @@ -507,7 +507,7 @@ public Builder addMinutes(long numberOfMinutes) { * @param numberOfSeconds the number of seconds to add. * @return this {@code Builder} */ - @NonNull + @Nonnull public Builder addSeconds(long numberOfSeconds) { validateOrder(7); validateNanos(numberOfSeconds, NANOS_PER_SECOND); @@ -521,7 +521,7 @@ public Builder addSeconds(long numberOfSeconds) { * @param numberOfMillis the number of milliseconds to add. * @return this {@code Builder} */ - @NonNull + @Nonnull public Builder addMillis(long numberOfMillis) { validateOrder(8); validateNanos(numberOfMillis, NANOS_PER_MILLI); @@ -535,7 +535,7 @@ public Builder addMillis(long numberOfMillis) { * @param numberOfMicros the number of microseconds to add. * @return this {@code Builder} */ - @NonNull + @Nonnull public Builder addMicros(long numberOfMicros) { validateOrder(9); validateNanos(numberOfMicros, NANOS_PER_MICRO); @@ -549,7 +549,7 @@ public Builder addMicros(long numberOfMicros) { * @param numberOfNanos the number of nanoseconds to add. * @return this {@code Builder} */ - @NonNull + @Nonnull public Builder addNanos(long numberOfNanos) { validateOrder(10); validateNanos(numberOfNanos, 1); @@ -594,7 +594,7 @@ private void validateNanos(long units, long nanosPerUnit) { * @param limit the limit on the number of units * @param unitName the unit name */ - private void validate(long units, long limit, @NonNull String unitName) { + private void validate(long units, long limit, @Nonnull String unitName) { Preconditions.checkArgument( units <= limit, "Invalid duration. The total number of %s must be less or equal to %s", @@ -628,7 +628,7 @@ private void validateOrder(int unitIndex) { * @param unitIndex the unit index * @return the name of the unit corresponding to the specified index. */ - @NonNull + @Nonnull private String getUnitName(int unitIndex) { switch (unitIndex) { case 1: @@ -656,7 +656,7 @@ private String getUnitName(int unitIndex) { } } - @NonNull + @Nonnull public CqlDuration build() { return isNegative ? new CqlDuration(-months, -days, -nanoseconds) diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/data/CqlVector.java b/core/src/main/java/com/datastax/oss/driver/api/core/data/CqlVector.java index 911b6187f6d..2b1f5e7c29c 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/data/CqlVector.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/data/CqlVector.java @@ -23,7 +23,6 @@ import com.datastax.oss.driver.shaded.guava.common.base.Splitter; import com.datastax.oss.driver.shaded.guava.common.collect.Iterables; import com.datastax.oss.driver.shaded.guava.common.collect.Streams; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.io.InvalidObjectException; import java.io.ObjectInputStream; @@ -37,6 +36,7 @@ import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.Stream; +import javax.annotation.Nonnull; /** * Representation of a vector as defined in CQL. @@ -88,7 +88,7 @@ public static CqlVector newInstance(List list) { * @return a new CqlVector built from the String representation */ public static CqlVector from( - @NonNull String str, @NonNull TypeCodec subtypeCodec) { + @Nonnull String str, @Nonnull TypeCodec subtypeCodec) { Preconditions.checkArgument(str != null, "Cannot create CqlVector from null string"); Preconditions.checkArgument(!str.isEmpty(), "Cannot create CqlVector from empty string"); ArrayList vals = @@ -100,7 +100,7 @@ public static CqlVector from( private final List list; - private CqlVector(@NonNull List list) { + private CqlVector(@Nonnull List list) { Preconditions.checkArgument( Iterables.all(list, Predicates.notNull()), "CqlVectors cannot contain null values"); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/data/Data.java b/core/src/main/java/com/datastax/oss/driver/api/core/data/Data.java index 495b96e97c7..687967c98ad 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/data/Data.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/data/Data.java @@ -21,7 +21,7 @@ import com.datastax.oss.driver.api.core.ProtocolVersion; import com.datastax.oss.driver.api.core.detach.Detachable; import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** A data structure containing CQL values. */ public interface Data { @@ -35,7 +35,7 @@ public interface Data { * * @see Detachable */ - @NonNull + @Nonnull CodecRegistry codecRegistry(); /** @@ -47,6 +47,6 @@ public interface Data { * * @see Detachable */ - @NonNull + @Nonnull ProtocolVersion protocolVersion(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/data/GettableById.java b/core/src/main/java/com/datastax/oss/driver/api/core/data/GettableById.java index 0a24214b20a..391a72e2495 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/data/GettableById.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/data/GettableById.java @@ -22,8 +22,6 @@ import com.datastax.oss.driver.api.core.type.codec.CodecNotFoundException; import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.math.BigDecimal; import java.math.BigInteger; import java.net.InetAddress; @@ -35,6 +33,8 @@ import java.util.Map; import java.util.Set; import java.util.UUID; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** A data structure that provides methods to retrieve its values via a CQL identifier. */ public interface GettableById extends GettableByIndex, AccessibleById { @@ -59,7 +59,7 @@ public interface GettableById extends GettableByIndex, AccessibleById { * @throws IllegalArgumentException if the id is invalid. */ @Nullable - default ByteBuffer getBytesUnsafe(@NonNull CqlIdentifier id) { + default ByteBuffer getBytesUnsafe(@Nonnull CqlIdentifier id) { return getBytesUnsafe(firstIndexOf(id)); } @@ -74,7 +74,7 @@ default ByteBuffer getBytesUnsafe(@NonNull CqlIdentifier id) { * * @throws IllegalArgumentException if the id is invalid. */ - default boolean isNull(@NonNull CqlIdentifier id) { + default boolean isNull(@Nonnull CqlIdentifier id) { return isNull(firstIndexOf(id)); } @@ -98,7 +98,7 @@ default boolean isNull(@NonNull CqlIdentifier id) { * @throws IllegalArgumentException if the id is invalid. */ @Nullable - default ValueT get(@NonNull CqlIdentifier id, @NonNull TypeCodec codec) { + default ValueT get(@Nonnull CqlIdentifier id, @Nonnull TypeCodec codec) { return get(firstIndexOf(id), codec); } @@ -120,7 +120,7 @@ default ValueT get(@NonNull CqlIdentifier id, @NonNull TypeCodec ValueT get(@NonNull CqlIdentifier id, @NonNull GenericType targetType) { + default ValueT get(@Nonnull CqlIdentifier id, @Nonnull GenericType targetType) { return get(firstIndexOf(id), targetType); } @@ -141,7 +141,7 @@ default ValueT get(@NonNull CqlIdentifier id, @NonNull GenericType ValueT get(@NonNull CqlIdentifier id, @NonNull Class targetClass) { + default ValueT get(@Nonnull CqlIdentifier id, @Nonnull Class targetClass) { return get(firstIndexOf(id), targetClass); } @@ -172,7 +172,7 @@ default ValueT get(@NonNull CqlIdentifier id, @NonNull Class ta * @throws CodecNotFoundException if no codec can perform the conversion. */ @Nullable - default Object getObject(@NonNull CqlIdentifier id) { + default Object getObject(@Nonnull CqlIdentifier id) { return getObject(firstIndexOf(id)); } @@ -194,7 +194,7 @@ default Object getObject(@NonNull CqlIdentifier id) { * * @throws IllegalArgumentException if the id is invalid. */ - default boolean getBoolean(@NonNull CqlIdentifier id) { + default boolean getBoolean(@Nonnull CqlIdentifier id) { return getBoolean(firstIndexOf(id)); } @@ -203,7 +203,7 @@ default boolean getBoolean(@NonNull CqlIdentifier id) { * {@link #getBoolean(CqlIdentifier)}. */ @Deprecated - default boolean getBool(@NonNull CqlIdentifier id) { + default boolean getBool(@Nonnull CqlIdentifier id) { return getBoolean(id); } @@ -224,7 +224,7 @@ default boolean getBool(@NonNull CqlIdentifier id) { * * @throws IllegalArgumentException if the id is invalid. */ - default byte getByte(@NonNull CqlIdentifier id) { + default byte getByte(@Nonnull CqlIdentifier id) { return getByte(firstIndexOf(id)); } @@ -246,7 +246,7 @@ default byte getByte(@NonNull CqlIdentifier id) { * * @throws IllegalArgumentException if the id is invalid. */ - default double getDouble(@NonNull CqlIdentifier id) { + default double getDouble(@Nonnull CqlIdentifier id) { return getDouble(firstIndexOf(id)); } @@ -268,7 +268,7 @@ default double getDouble(@NonNull CqlIdentifier id) { * * @throws IllegalArgumentException if the id is invalid. */ - default float getFloat(@NonNull CqlIdentifier id) { + default float getFloat(@Nonnull CqlIdentifier id) { return getFloat(firstIndexOf(id)); } @@ -290,7 +290,7 @@ default float getFloat(@NonNull CqlIdentifier id) { * * @throws IllegalArgumentException if the id is invalid. */ - default int getInt(@NonNull CqlIdentifier id) { + default int getInt(@Nonnull CqlIdentifier id) { return getInt(firstIndexOf(id)); } @@ -311,7 +311,7 @@ default int getInt(@NonNull CqlIdentifier id) { * * @throws IllegalArgumentException if the id is invalid. */ - default long getLong(@NonNull CqlIdentifier id) { + default long getLong(@Nonnull CqlIdentifier id) { return getLong(firstIndexOf(id)); } @@ -333,7 +333,7 @@ default long getLong(@NonNull CqlIdentifier id) { * * @throws IllegalArgumentException if the id is invalid. */ - default short getShort(@NonNull CqlIdentifier id) { + default short getShort(@Nonnull CqlIdentifier id) { return getShort(firstIndexOf(id)); } @@ -351,7 +351,7 @@ default short getShort(@NonNull CqlIdentifier id) { * @throws IllegalArgumentException if the id is invalid. */ @Nullable - default Instant getInstant(@NonNull CqlIdentifier id) { + default Instant getInstant(@Nonnull CqlIdentifier id) { return getInstant(firstIndexOf(id)); } @@ -369,7 +369,7 @@ default Instant getInstant(@NonNull CqlIdentifier id) { * @throws IllegalArgumentException if the id is invalid. */ @Nullable - default LocalDate getLocalDate(@NonNull CqlIdentifier id) { + default LocalDate getLocalDate(@Nonnull CqlIdentifier id) { return getLocalDate(firstIndexOf(id)); } @@ -387,7 +387,7 @@ default LocalDate getLocalDate(@NonNull CqlIdentifier id) { * @throws IllegalArgumentException if the id is invalid. */ @Nullable - default LocalTime getLocalTime(@NonNull CqlIdentifier id) { + default LocalTime getLocalTime(@Nonnull CqlIdentifier id) { return getLocalTime(firstIndexOf(id)); } @@ -405,7 +405,7 @@ default LocalTime getLocalTime(@NonNull CqlIdentifier id) { * @throws IllegalArgumentException if the id is invalid. */ @Nullable - default ByteBuffer getByteBuffer(@NonNull CqlIdentifier id) { + default ByteBuffer getByteBuffer(@Nonnull CqlIdentifier id) { return getByteBuffer(firstIndexOf(id)); } @@ -423,7 +423,7 @@ default ByteBuffer getByteBuffer(@NonNull CqlIdentifier id) { * @throws IllegalArgumentException if the id is invalid. */ @Nullable - default String getString(@NonNull CqlIdentifier id) { + default String getString(@Nonnull CqlIdentifier id) { return getString(firstIndexOf(id)); } @@ -441,7 +441,7 @@ default String getString(@NonNull CqlIdentifier id) { * @throws IllegalArgumentException if the id is invalid. */ @Nullable - default BigInteger getBigInteger(@NonNull CqlIdentifier id) { + default BigInteger getBigInteger(@Nonnull CqlIdentifier id) { return getBigInteger(firstIndexOf(id)); } @@ -459,7 +459,7 @@ default BigInteger getBigInteger(@NonNull CqlIdentifier id) { * @throws IllegalArgumentException if the id is invalid. */ @Nullable - default BigDecimal getBigDecimal(@NonNull CqlIdentifier id) { + default BigDecimal getBigDecimal(@Nonnull CqlIdentifier id) { return getBigDecimal(firstIndexOf(id)); } @@ -477,7 +477,7 @@ default BigDecimal getBigDecimal(@NonNull CqlIdentifier id) { * @throws IllegalArgumentException if the id is invalid. */ @Nullable - default UUID getUuid(@NonNull CqlIdentifier id) { + default UUID getUuid(@Nonnull CqlIdentifier id) { return getUuid(firstIndexOf(id)); } @@ -495,7 +495,7 @@ default UUID getUuid(@NonNull CqlIdentifier id) { * @throws IllegalArgumentException if the id is invalid. */ @Nullable - default InetAddress getInetAddress(@NonNull CqlIdentifier id) { + default InetAddress getInetAddress(@Nonnull CqlIdentifier id) { return getInetAddress(firstIndexOf(id)); } @@ -513,7 +513,7 @@ default InetAddress getInetAddress(@NonNull CqlIdentifier id) { * @throws IllegalArgumentException if the id is invalid. */ @Nullable - default CqlDuration getCqlDuration(@NonNull CqlIdentifier id) { + default CqlDuration getCqlDuration(@Nonnull CqlIdentifier id) { return getCqlDuration(firstIndexOf(id)); } @@ -532,7 +532,7 @@ default CqlDuration getCqlDuration(@NonNull CqlIdentifier id) { */ @Nullable default CqlVector getVector( - @NonNull CqlIdentifier id, @NonNull Class elementsClass) { + @Nonnull CqlIdentifier id, @Nonnull Class elementsClass) { return getVector(firstIndexOf(id), elementsClass); } @@ -556,7 +556,7 @@ default CqlVector getVector( * or if the name is invalid. */ @Nullable - default Token getToken(@NonNull CqlIdentifier id) { + default Token getToken(@Nonnull CqlIdentifier id) { return getToken(firstIndexOf(id)); } @@ -582,7 +582,7 @@ default Token getToken(@NonNull CqlIdentifier id) { */ @Nullable default List getList( - @NonNull CqlIdentifier id, @NonNull Class elementsClass) { + @Nonnull CqlIdentifier id, @Nonnull Class elementsClass) { return getList(firstIndexOf(id), elementsClass); } @@ -608,7 +608,7 @@ default List getList( */ @Nullable default Set getSet( - @NonNull CqlIdentifier id, @NonNull Class elementsClass) { + @Nonnull CqlIdentifier id, @Nonnull Class elementsClass) { return getSet(firstIndexOf(id), elementsClass); } @@ -634,7 +634,7 @@ default Set getSet( */ @Nullable default Map getMap( - @NonNull CqlIdentifier id, @NonNull Class keyClass, @NonNull Class valueClass) { + @Nonnull CqlIdentifier id, @Nonnull Class keyClass, @Nonnull Class valueClass) { return getMap(firstIndexOf(id), keyClass, valueClass); } @@ -652,7 +652,7 @@ default Map getMap( * @throws IllegalArgumentException if the id is invalid. */ @Nullable - default UdtValue getUdtValue(@NonNull CqlIdentifier id) { + default UdtValue getUdtValue(@Nonnull CqlIdentifier id) { return getUdtValue(firstIndexOf(id)); } @@ -670,7 +670,7 @@ default UdtValue getUdtValue(@NonNull CqlIdentifier id) { * @throws IllegalArgumentException if the id is invalid. */ @Nullable - default TupleValue getTupleValue(@NonNull CqlIdentifier id) { + default TupleValue getTupleValue(@Nonnull CqlIdentifier id) { return getTupleValue(firstIndexOf(id)); } } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/data/GettableByIndex.java b/core/src/main/java/com/datastax/oss/driver/api/core/data/GettableByIndex.java index 53541b0ac58..65b98267b24 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/data/GettableByIndex.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/data/GettableByIndex.java @@ -33,8 +33,6 @@ import com.datastax.oss.driver.internal.core.metadata.token.ByteOrderedToken; import com.datastax.oss.driver.internal.core.metadata.token.Murmur3Token; import com.datastax.oss.driver.internal.core.metadata.token.RandomToken; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.math.BigDecimal; import java.math.BigInteger; import java.net.InetAddress; @@ -46,6 +44,8 @@ import java.util.Map; import java.util.Set; import java.util.UUID; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** A data structure that provides methods to retrieve its values via an integer index. */ public interface GettableByIndex extends AccessibleByIndex { @@ -447,7 +447,7 @@ default CqlDuration getCqlDuration(int i) { */ @Nullable default CqlVector getVector( - int i, @NonNull Class elementsClass) { + int i, @Nonnull Class elementsClass) { return get(i, GenericType.vectorOf(elementsClass)); } @@ -497,7 +497,7 @@ default Token getToken(int i) { * @throws IndexOutOfBoundsException if the index is invalid. */ @Nullable - default List getList(int i, @NonNull Class elementsClass) { + default List getList(int i, @Nonnull Class elementsClass) { return get(i, GenericType.listOf(elementsClass)); } @@ -516,7 +516,7 @@ default List getList(int i, @NonNull Class elemen * @throws IndexOutOfBoundsException if the index is invalid. */ @Nullable - default Set getSet(int i, @NonNull Class elementsClass) { + default Set getSet(int i, @Nonnull Class elementsClass) { return get(i, GenericType.setOf(elementsClass)); } @@ -536,7 +536,7 @@ default Set getSet(int i, @NonNull Class elements */ @Nullable default Map getMap( - int i, @NonNull Class keyClass, @NonNull Class valueClass) { + int i, @Nonnull Class keyClass, @Nonnull Class valueClass) { return get(i, GenericType.mapOf(keyClass, valueClass)); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/data/GettableByName.java b/core/src/main/java/com/datastax/oss/driver/api/core/data/GettableByName.java index ec3ee362ca8..5834a5bb6f3 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/data/GettableByName.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/data/GettableByName.java @@ -21,8 +21,6 @@ import com.datastax.oss.driver.api.core.type.codec.CodecNotFoundException; import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.math.BigDecimal; import java.math.BigInteger; import java.net.InetAddress; @@ -34,6 +32,8 @@ import java.util.Map; import java.util.Set; import java.util.UUID; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** A data structure that provides methods to retrieve its values via a name. */ public interface GettableByName extends GettableByIndex, AccessibleByName { @@ -58,7 +58,7 @@ public interface GettableByName extends GettableByIndex, AccessibleByName { * @throws IllegalArgumentException if the name is invalid. */ @Nullable - default ByteBuffer getBytesUnsafe(@NonNull String name) { + default ByteBuffer getBytesUnsafe(@Nonnull String name) { return getBytesUnsafe(firstIndexOf(name)); } @@ -73,7 +73,7 @@ default ByteBuffer getBytesUnsafe(@NonNull String name) { * * @throws IllegalArgumentException if the name is invalid. */ - default boolean isNull(@NonNull String name) { + default boolean isNull(@Nonnull String name) { return isNull(firstIndexOf(name)); } @@ -97,7 +97,7 @@ default boolean isNull(@NonNull String name) { * @throws IllegalArgumentException if the name is invalid. */ @Nullable - default ValueT get(@NonNull String name, @NonNull TypeCodec codec) { + default ValueT get(@Nonnull String name, @Nonnull TypeCodec codec) { return get(firstIndexOf(name), codec); } @@ -120,7 +120,7 @@ default ValueT get(@NonNull String name, @NonNull TypeCodec cod * @throws CodecNotFoundException if no codec can perform the conversion. */ @Nullable - default ValueT get(@NonNull String name, @NonNull GenericType targetType) { + default ValueT get(@Nonnull String name, @Nonnull GenericType targetType) { return get(firstIndexOf(name), targetType); } @@ -142,7 +142,7 @@ default ValueT get(@NonNull String name, @NonNull GenericType t * @throws CodecNotFoundException if no codec can perform the conversion. */ @Nullable - default ValueT get(@NonNull String name, @NonNull Class targetClass) { + default ValueT get(@Nonnull String name, @Nonnull Class targetClass) { return get(firstIndexOf(name), targetClass); } @@ -173,7 +173,7 @@ default ValueT get(@NonNull String name, @NonNull Class targetC * @throws CodecNotFoundException if no codec can perform the conversion. */ @Nullable - default Object getObject(@NonNull String name) { + default Object getObject(@Nonnull String name) { return getObject(firstIndexOf(name)); } @@ -194,7 +194,7 @@ default Object getObject(@NonNull String name) { * * @throws IllegalArgumentException if the name is invalid. */ - default boolean getBoolean(@NonNull String name) { + default boolean getBoolean(@Nonnull String name) { return getBoolean(firstIndexOf(name)); } @@ -203,7 +203,7 @@ default boolean getBoolean(@NonNull String name) { * {@link #getBoolean(String)}. */ @Deprecated - default boolean getBool(@NonNull String name) { + default boolean getBool(@Nonnull String name) { return getBoolean(name); } @@ -224,7 +224,7 @@ default boolean getBool(@NonNull String name) { * * @throws IllegalArgumentException if the name is invalid. */ - default byte getByte(@NonNull String name) { + default byte getByte(@Nonnull String name) { return getByte(firstIndexOf(name)); } @@ -245,7 +245,7 @@ default byte getByte(@NonNull String name) { * * @throws IllegalArgumentException if the name is invalid. */ - default double getDouble(@NonNull String name) { + default double getDouble(@Nonnull String name) { return getDouble(firstIndexOf(name)); } @@ -266,7 +266,7 @@ default double getDouble(@NonNull String name) { * * @throws IllegalArgumentException if the name is invalid. */ - default float getFloat(@NonNull String name) { + default float getFloat(@Nonnull String name) { return getFloat(firstIndexOf(name)); } @@ -287,7 +287,7 @@ default float getFloat(@NonNull String name) { * * @throws IllegalArgumentException if the name is invalid. */ - default int getInt(@NonNull String name) { + default int getInt(@Nonnull String name) { return getInt(firstIndexOf(name)); } @@ -308,7 +308,7 @@ default int getInt(@NonNull String name) { * * @throws IllegalArgumentException if the name is invalid. */ - default long getLong(@NonNull String name) { + default long getLong(@Nonnull String name) { return getLong(firstIndexOf(name)); } @@ -329,7 +329,7 @@ default long getLong(@NonNull String name) { * * @throws IllegalArgumentException if the name is invalid. */ - default short getShort(@NonNull String name) { + default short getShort(@Nonnull String name) { return getShort(firstIndexOf(name)); } @@ -347,7 +347,7 @@ default short getShort(@NonNull String name) { * @throws IllegalArgumentException if the name is invalid. */ @Nullable - default Instant getInstant(@NonNull String name) { + default Instant getInstant(@Nonnull String name) { return getInstant(firstIndexOf(name)); } @@ -365,7 +365,7 @@ default Instant getInstant(@NonNull String name) { * @throws IllegalArgumentException if the name is invalid. */ @Nullable - default LocalDate getLocalDate(@NonNull String name) { + default LocalDate getLocalDate(@Nonnull String name) { return getLocalDate(firstIndexOf(name)); } @@ -383,7 +383,7 @@ default LocalDate getLocalDate(@NonNull String name) { * @throws IllegalArgumentException if the name is invalid. */ @Nullable - default LocalTime getLocalTime(@NonNull String name) { + default LocalTime getLocalTime(@Nonnull String name) { return getLocalTime(firstIndexOf(name)); } @@ -401,7 +401,7 @@ default LocalTime getLocalTime(@NonNull String name) { * @throws IllegalArgumentException if the name is invalid. */ @Nullable - default ByteBuffer getByteBuffer(@NonNull String name) { + default ByteBuffer getByteBuffer(@Nonnull String name) { return getByteBuffer(firstIndexOf(name)); } @@ -419,7 +419,7 @@ default ByteBuffer getByteBuffer(@NonNull String name) { * @throws IllegalArgumentException if the name is invalid. */ @Nullable - default String getString(@NonNull String name) { + default String getString(@Nonnull String name) { return getString(firstIndexOf(name)); } @@ -437,7 +437,7 @@ default String getString(@NonNull String name) { * @throws IllegalArgumentException if the name is invalid. */ @Nullable - default BigInteger getBigInteger(@NonNull String name) { + default BigInteger getBigInteger(@Nonnull String name) { return getBigInteger(firstIndexOf(name)); } @@ -455,7 +455,7 @@ default BigInteger getBigInteger(@NonNull String name) { * @throws IllegalArgumentException if the name is invalid. */ @Nullable - default BigDecimal getBigDecimal(@NonNull String name) { + default BigDecimal getBigDecimal(@Nonnull String name) { return getBigDecimal(firstIndexOf(name)); } @@ -473,7 +473,7 @@ default BigDecimal getBigDecimal(@NonNull String name) { * @throws IllegalArgumentException if the name is invalid. */ @Nullable - default UUID getUuid(@NonNull String name) { + default UUID getUuid(@Nonnull String name) { return getUuid(firstIndexOf(name)); } @@ -491,7 +491,7 @@ default UUID getUuid(@NonNull String name) { * @throws IllegalArgumentException if the name is invalid. */ @Nullable - default InetAddress getInetAddress(@NonNull String name) { + default InetAddress getInetAddress(@Nonnull String name) { return getInetAddress(firstIndexOf(name)); } @@ -509,7 +509,7 @@ default InetAddress getInetAddress(@NonNull String name) { * @throws IllegalArgumentException if the name is invalid. */ @Nullable - default CqlDuration getCqlDuration(@NonNull String name) { + default CqlDuration getCqlDuration(@Nonnull String name) { return getCqlDuration(firstIndexOf(name)); } @@ -528,7 +528,7 @@ default CqlDuration getCqlDuration(@NonNull String name) { */ @Nullable default CqlVector getVector( - @NonNull String name, @NonNull Class elementsClass) { + @Nonnull String name, @Nonnull Class elementsClass) { return getVector(firstIndexOf(name), elementsClass); } @@ -552,7 +552,7 @@ default CqlVector getVector( * or if the name is invalid. */ @Nullable - default Token getToken(@NonNull String name) { + default Token getToken(@Nonnull String name) { return getToken(firstIndexOf(name)); } @@ -578,7 +578,7 @@ default Token getToken(@NonNull String name) { */ @Nullable default List getList( - @NonNull String name, @NonNull Class elementsClass) { + @Nonnull String name, @Nonnull Class elementsClass) { return getList(firstIndexOf(name), elementsClass); } @@ -604,7 +604,7 @@ default List getList( */ @Nullable default Set getSet( - @NonNull String name, @NonNull Class elementsClass) { + @Nonnull String name, @Nonnull Class elementsClass) { return getSet(firstIndexOf(name), elementsClass); } @@ -630,7 +630,7 @@ default Set getSet( */ @Nullable default Map getMap( - @NonNull String name, @NonNull Class keyClass, @NonNull Class valueClass) { + @Nonnull String name, @Nonnull Class keyClass, @Nonnull Class valueClass) { return getMap(firstIndexOf(name), keyClass, valueClass); } @@ -648,7 +648,7 @@ default Map getMap( * @throws IllegalArgumentException if the name is invalid. */ @Nullable - default UdtValue getUdtValue(@NonNull String name) { + default UdtValue getUdtValue(@Nonnull String name) { return getUdtValue(firstIndexOf(name)); } @@ -666,7 +666,7 @@ default UdtValue getUdtValue(@NonNull String name) { * @throws IllegalArgumentException if the name is invalid. */ @Nullable - default TupleValue getTupleValue(@NonNull String name) { + default TupleValue getTupleValue(@Nonnull String name) { return getTupleValue(firstIndexOf(name)); } } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/data/SettableById.java b/core/src/main/java/com/datastax/oss/driver/api/core/data/SettableById.java index 8452446205e..ff07c5e95f8 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/data/SettableById.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/data/SettableById.java @@ -23,9 +23,6 @@ import com.datastax.oss.driver.api.core.type.codec.CodecNotFoundException; import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.math.BigDecimal; import java.math.BigInteger; import java.net.InetAddress; @@ -37,6 +34,9 @@ import java.util.Map; import java.util.Set; import java.util.UUID; +import javax.annotation.CheckReturnValue; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** A data structure that provides methods to set its values via a CQL identifier. */ public interface SettableById> @@ -58,9 +58,9 @@ public interface SettableById> * further usage of this data will have unpredictable results. * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setBytesUnsafe(@NonNull CqlIdentifier id, @Nullable ByteBuffer v) { + default SelfT setBytesUnsafe(@Nonnull CqlIdentifier id, @Nullable ByteBuffer v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setBytesUnsafe(i, v); @@ -69,9 +69,9 @@ default SelfT setBytesUnsafe(@NonNull CqlIdentifier id, @Nullable ByteBuffer v) return result; } - @NonNull + @Nonnull @Override - default DataType getType(@NonNull CqlIdentifier id) { + default DataType getType(@Nonnull CqlIdentifier id) { return getType(firstIndexOf(id)); } @@ -83,9 +83,9 @@ default DataType getType(@NonNull CqlIdentifier id) { * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setToNull(@NonNull CqlIdentifier id) { + default SelfT setToNull(@Nonnull CqlIdentifier id) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setToNull(i); @@ -109,10 +109,10 @@ default SelfT setToNull(@NonNull CqlIdentifier id) { * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT set( - @NonNull CqlIdentifier id, @Nullable ValueT v, @NonNull TypeCodec codec) { + @Nonnull CqlIdentifier id, @Nullable ValueT v, @Nonnull TypeCodec codec) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).set(i, v, codec); @@ -135,10 +135,10 @@ default SelfT set( * @throws IllegalArgumentException if the id is invalid. * @throws CodecNotFoundException if no codec can perform the conversion. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT set( - @NonNull CqlIdentifier id, @Nullable ValueT v, @NonNull GenericType targetType) { + @Nonnull CqlIdentifier id, @Nullable ValueT v, @Nonnull GenericType targetType) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).set(i, v, targetType); @@ -160,10 +160,10 @@ default SelfT set( * @throws IllegalArgumentException if the id is invalid. * @throws CodecNotFoundException if no codec can perform the conversion. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT set( - @NonNull CqlIdentifier id, @Nullable ValueT v, @NonNull Class targetClass) { + @Nonnull CqlIdentifier id, @Nullable ValueT v, @Nonnull Class targetClass) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).set(i, v, targetClass); @@ -185,9 +185,9 @@ default SelfT set( * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setBoolean(@NonNull CqlIdentifier id, boolean v) { + default SelfT setBoolean(@Nonnull CqlIdentifier id, boolean v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setBoolean(i, v); @@ -201,9 +201,9 @@ default SelfT setBoolean(@NonNull CqlIdentifier id, boolean v) { * {@link #setBoolean(CqlIdentifier, boolean)}. */ @Deprecated - @NonNull + @Nonnull @CheckReturnValue - default SelfT setBool(@NonNull CqlIdentifier id, boolean v) { + default SelfT setBool(@Nonnull CqlIdentifier id, boolean v) { return setBoolean(id, v); } @@ -220,9 +220,9 @@ default SelfT setBool(@NonNull CqlIdentifier id, boolean v) { * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setByte(@NonNull CqlIdentifier id, byte v) { + default SelfT setByte(@Nonnull CqlIdentifier id, byte v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setByte(i, v); @@ -244,9 +244,9 @@ default SelfT setByte(@NonNull CqlIdentifier id, byte v) { * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setDouble(@NonNull CqlIdentifier id, double v) { + default SelfT setDouble(@Nonnull CqlIdentifier id, double v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setDouble(i, v); @@ -268,9 +268,9 @@ default SelfT setDouble(@NonNull CqlIdentifier id, double v) { * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setFloat(@NonNull CqlIdentifier id, float v) { + default SelfT setFloat(@Nonnull CqlIdentifier id, float v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setFloat(i, v); @@ -292,9 +292,9 @@ default SelfT setFloat(@NonNull CqlIdentifier id, float v) { * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setInt(@NonNull CqlIdentifier id, int v) { + default SelfT setInt(@Nonnull CqlIdentifier id, int v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setInt(i, v); @@ -316,9 +316,9 @@ default SelfT setInt(@NonNull CqlIdentifier id, int v) { * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setLong(@NonNull CqlIdentifier id, long v) { + default SelfT setLong(@Nonnull CqlIdentifier id, long v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setLong(i, v); @@ -340,9 +340,9 @@ default SelfT setLong(@NonNull CqlIdentifier id, long v) { * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setShort(@NonNull CqlIdentifier id, short v) { + default SelfT setShort(@Nonnull CqlIdentifier id, short v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setShort(i, v); @@ -361,9 +361,9 @@ default SelfT setShort(@NonNull CqlIdentifier id, short v) { * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setInstant(@NonNull CqlIdentifier id, @Nullable Instant v) { + default SelfT setInstant(@Nonnull CqlIdentifier id, @Nullable Instant v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setInstant(i, v); @@ -382,9 +382,9 @@ default SelfT setInstant(@NonNull CqlIdentifier id, @Nullable Instant v) { * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setLocalDate(@NonNull CqlIdentifier id, @Nullable LocalDate v) { + default SelfT setLocalDate(@Nonnull CqlIdentifier id, @Nullable LocalDate v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setLocalDate(i, v); @@ -403,9 +403,9 @@ default SelfT setLocalDate(@NonNull CqlIdentifier id, @Nullable LocalDate v) { * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setLocalTime(@NonNull CqlIdentifier id, @Nullable LocalTime v) { + default SelfT setLocalTime(@Nonnull CqlIdentifier id, @Nullable LocalTime v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setLocalTime(i, v); @@ -424,9 +424,9 @@ default SelfT setLocalTime(@NonNull CqlIdentifier id, @Nullable LocalTime v) { * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setByteBuffer(@NonNull CqlIdentifier id, @Nullable ByteBuffer v) { + default SelfT setByteBuffer(@Nonnull CqlIdentifier id, @Nullable ByteBuffer v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setByteBuffer(i, v); @@ -445,9 +445,9 @@ default SelfT setByteBuffer(@NonNull CqlIdentifier id, @Nullable ByteBuffer v) { * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setString(@NonNull CqlIdentifier id, @Nullable String v) { + default SelfT setString(@Nonnull CqlIdentifier id, @Nullable String v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setString(i, v); @@ -466,9 +466,9 @@ default SelfT setString(@NonNull CqlIdentifier id, @Nullable String v) { * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setBigInteger(@NonNull CqlIdentifier id, @Nullable BigInteger v) { + default SelfT setBigInteger(@Nonnull CqlIdentifier id, @Nullable BigInteger v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setBigInteger(i, v); @@ -487,9 +487,9 @@ default SelfT setBigInteger(@NonNull CqlIdentifier id, @Nullable BigInteger v) { * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setBigDecimal(@NonNull CqlIdentifier id, @Nullable BigDecimal v) { + default SelfT setBigDecimal(@Nonnull CqlIdentifier id, @Nullable BigDecimal v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setBigDecimal(i, v); @@ -508,9 +508,9 @@ default SelfT setBigDecimal(@NonNull CqlIdentifier id, @Nullable BigDecimal v) { * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setUuid(@NonNull CqlIdentifier id, @Nullable UUID v) { + default SelfT setUuid(@Nonnull CqlIdentifier id, @Nullable UUID v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setUuid(i, v); @@ -529,9 +529,9 @@ default SelfT setUuid(@NonNull CqlIdentifier id, @Nullable UUID v) { * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setInetAddress(@NonNull CqlIdentifier id, @Nullable InetAddress v) { + default SelfT setInetAddress(@Nonnull CqlIdentifier id, @Nullable InetAddress v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setInetAddress(i, v); @@ -550,9 +550,9 @@ default SelfT setInetAddress(@NonNull CqlIdentifier id, @Nullable InetAddress v) * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setCqlDuration(@NonNull CqlIdentifier id, @Nullable CqlDuration v) { + default SelfT setCqlDuration(@Nonnull CqlIdentifier id, @Nullable CqlDuration v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setCqlDuration(i, v); @@ -571,12 +571,12 @@ default SelfT setCqlDuration(@NonNull CqlIdentifier id, @Nullable CqlDuration v) * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setVector( - @NonNull CqlIdentifier id, + @Nonnull CqlIdentifier id, @Nullable CqlVector v, - @NonNull Class elementsClass) { + @Nonnull Class elementsClass) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setVector(i, v, elementsClass); @@ -597,9 +597,9 @@ default SelfT setVector( * * @throws IllegalArgumentException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setToken(@NonNull CqlIdentifier id, @NonNull Token v) { + default SelfT setToken(@Nonnull CqlIdentifier id, @Nonnull Token v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setToken(i, v); @@ -621,12 +621,12 @@ default SelfT setToken(@NonNull CqlIdentifier id, @NonNull Token v) { * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setList( - @NonNull CqlIdentifier id, + @Nonnull CqlIdentifier id, @Nullable List v, - @NonNull Class elementsClass) { + @Nonnull Class elementsClass) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setList(i, v, elementsClass); @@ -648,12 +648,12 @@ default SelfT setList( * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setSet( - @NonNull CqlIdentifier id, + @Nonnull CqlIdentifier id, @Nullable Set v, - @NonNull Class elementsClass) { + @Nonnull Class elementsClass) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setSet(i, v, elementsClass); @@ -675,13 +675,13 @@ default SelfT setSet( * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setMap( - @NonNull CqlIdentifier id, + @Nonnull CqlIdentifier id, @Nullable Map v, - @NonNull Class keyClass, - @NonNull Class valueClass) { + @Nonnull Class keyClass, + @Nonnull Class valueClass) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setMap(i, v, keyClass, valueClass); @@ -700,9 +700,9 @@ default SelfT setMap( * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setUdtValue(@NonNull CqlIdentifier id, @Nullable UdtValue v) { + default SelfT setUdtValue(@Nonnull CqlIdentifier id, @Nullable UdtValue v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setUdtValue(i, v); @@ -721,9 +721,9 @@ default SelfT setUdtValue(@NonNull CqlIdentifier id, @Nullable UdtValue v) { * * @throws IllegalArgumentException if the id is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setTupleValue(@NonNull CqlIdentifier id, @Nullable TupleValue v) { + default SelfT setTupleValue(@Nonnull CqlIdentifier id, @Nullable TupleValue v) { SelfT result = null; for (Integer i : allIndicesOf(id)) { result = (result == null ? this : result).setTupleValue(i, v); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/data/SettableByIndex.java b/core/src/main/java/com/datastax/oss/driver/api/core/data/SettableByIndex.java index bb55db3adde..279df6f74e6 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/data/SettableByIndex.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/data/SettableByIndex.java @@ -32,9 +32,6 @@ import com.datastax.oss.driver.internal.core.metadata.token.ByteOrderedToken; import com.datastax.oss.driver.internal.core.metadata.token.Murmur3Token; import com.datastax.oss.driver.internal.core.metadata.token.RandomToken; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.math.BigDecimal; import java.math.BigInteger; import java.net.InetAddress; @@ -46,6 +43,9 @@ import java.util.Map; import java.util.Set; import java.util.UUID; +import javax.annotation.CheckReturnValue; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** A data structure that provides methods to set its values via an integer index. */ public interface SettableByIndex> extends AccessibleByIndex { @@ -63,7 +63,7 @@ public interface SettableByIndex> extends A * further usage of this data will have unpredictable results. * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue SelfT setBytesUnsafe(int i, @Nullable ByteBuffer v); @@ -72,7 +72,7 @@ public interface SettableByIndex> extends A * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setToNull(int i) { return setBytesUnsafe(i, null); @@ -90,9 +90,9 @@ default SelfT setToNull(int i) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT set(int i, @Nullable ValueT v, @NonNull TypeCodec codec) { + default SelfT set(int i, @Nullable ValueT v, @Nonnull TypeCodec codec) { return setBytesUnsafe(i, codec.encode(v, protocolVersion())); } @@ -107,9 +107,9 @@ default SelfT set(int i, @Nullable ValueT v, @NonNull TypeCodec * @throws IndexOutOfBoundsException if the index is invalid. * @throws CodecNotFoundException if no codec can perform the conversion. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT set(int i, @Nullable ValueT v, @NonNull GenericType targetType) { + default SelfT set(int i, @Nullable ValueT v, @Nonnull GenericType targetType) { DataType cqlType = getType(i); TypeCodec codec = codecRegistry().codecFor(cqlType, targetType); return set(i, v, codec); @@ -125,9 +125,9 @@ default SelfT set(int i, @Nullable ValueT v, @NonNull GenericType SelfT set(int i, @Nullable ValueT v, @NonNull Class targetClass) { + default SelfT set(int i, @Nullable ValueT v, @Nonnull Class targetClass) { // This is duplicated from the GenericType variant, because we want to give the codec registry // a chance to process the unwrapped class directly, if it can do so in a more efficient way. DataType cqlType = getType(i); @@ -145,7 +145,7 @@ default SelfT set(int i, @Nullable ValueT v, @NonNull Class tar * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setBoolean(int i, boolean v) { DataType cqlType = getType(i); @@ -160,7 +160,7 @@ default SelfT setBoolean(int i, boolean v) { * {@link #setBoolean(int, boolean)}. */ @Deprecated - @NonNull + @Nonnull @CheckReturnValue default SelfT setBool(int i, boolean v) { return setBoolean(i, v); @@ -176,7 +176,7 @@ default SelfT setBool(int i, boolean v) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setByte(int i, byte v) { DataType cqlType = getType(i); @@ -196,7 +196,7 @@ default SelfT setByte(int i, byte v) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setDouble(int i, double v) { DataType cqlType = getType(i); @@ -216,7 +216,7 @@ default SelfT setDouble(int i, double v) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setFloat(int i, float v) { DataType cqlType = getType(i); @@ -236,7 +236,7 @@ default SelfT setFloat(int i, float v) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setInt(int i, int v) { DataType cqlType = getType(i); @@ -256,7 +256,7 @@ default SelfT setInt(int i, int v) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setLong(int i, long v) { DataType cqlType = getType(i); @@ -276,7 +276,7 @@ default SelfT setLong(int i, long v) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setShort(int i, short v) { DataType cqlType = getType(i); @@ -293,7 +293,7 @@ default SelfT setShort(int i, short v) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setInstant(int i, @Nullable Instant v) { return set(i, v, Instant.class); @@ -306,7 +306,7 @@ default SelfT setInstant(int i, @Nullable Instant v) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setLocalDate(int i, @Nullable LocalDate v) { return set(i, v, LocalDate.class); @@ -319,7 +319,7 @@ default SelfT setLocalDate(int i, @Nullable LocalDate v) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setLocalTime(int i, @Nullable LocalTime v) { return set(i, v, LocalTime.class); @@ -332,7 +332,7 @@ default SelfT setLocalTime(int i, @Nullable LocalTime v) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setByteBuffer(int i, @Nullable ByteBuffer v) { return set(i, v, ByteBuffer.class); @@ -345,7 +345,7 @@ default SelfT setByteBuffer(int i, @Nullable ByteBuffer v) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setString(int i, @Nullable String v) { return set(i, v, String.class); @@ -358,7 +358,7 @@ default SelfT setString(int i, @Nullable String v) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setBigInteger(int i, @Nullable BigInteger v) { return set(i, v, BigInteger.class); @@ -371,7 +371,7 @@ default SelfT setBigInteger(int i, @Nullable BigInteger v) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setBigDecimal(int i, @Nullable BigDecimal v) { return set(i, v, BigDecimal.class); @@ -384,7 +384,7 @@ default SelfT setBigDecimal(int i, @Nullable BigDecimal v) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setUuid(int i, @Nullable UUID v) { return set(i, v, UUID.class); @@ -397,7 +397,7 @@ default SelfT setUuid(int i, @Nullable UUID v) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setInetAddress(int i, @Nullable InetAddress v) { return set(i, v, InetAddress.class); @@ -410,7 +410,7 @@ default SelfT setInetAddress(int i, @Nullable InetAddress v) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setCqlDuration(int i, @Nullable CqlDuration v) { return set(i, v, CqlDuration.class); @@ -423,10 +423,10 @@ default SelfT setCqlDuration(int i, @Nullable CqlDuration v) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setVector( - int i, @Nullable CqlVector v, @NonNull Class elementsClass) { + int i, @Nullable CqlVector v, @Nonnull Class elementsClass) { return set(i, v, GenericType.vectorOf(elementsClass)); } @@ -439,9 +439,9 @@ default SelfT setVector( * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setToken(int i, @NonNull Token v) { + default SelfT setToken(int i, @Nonnull Token v) { // Simply enumerate all known implementations. This goes against the concept of TokenFactory, // but injecting the factory here is too much of a hassle. // The only issue is if someone uses a custom partitioner, but this is highly unlikely, and even @@ -467,10 +467,10 @@ default SelfT setToken(int i, @NonNull Token v) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setList( - int i, @Nullable List v, @NonNull Class elementsClass) { + int i, @Nullable List v, @Nonnull Class elementsClass) { return set(i, v, GenericType.listOf(elementsClass)); } @@ -484,10 +484,10 @@ default SelfT setList( * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setSet( - int i, @Nullable Set v, @NonNull Class elementsClass) { + int i, @Nullable Set v, @Nonnull Class elementsClass) { return set(i, v, GenericType.setOf(elementsClass)); } @@ -501,13 +501,13 @@ default SelfT setSet( * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setMap( int i, @Nullable Map v, - @NonNull Class keyClass, - @NonNull Class valueClass) { + @Nonnull Class keyClass, + @Nonnull Class valueClass) { return set(i, v, GenericType.mapOf(keyClass, valueClass)); } @@ -518,7 +518,7 @@ default SelfT setMap( * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setUdtValue(int i, @Nullable UdtValue v) { return set(i, v, UdtValue.class); @@ -531,7 +531,7 @@ default SelfT setUdtValue(int i, @Nullable UdtValue v) { * * @throws IndexOutOfBoundsException if the index is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setTupleValue(int i, @Nullable TupleValue v) { return set(i, v, TupleValue.class); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/data/SettableByName.java b/core/src/main/java/com/datastax/oss/driver/api/core/data/SettableByName.java index c25a7074373..79dffb2c008 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/data/SettableByName.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/data/SettableByName.java @@ -22,9 +22,6 @@ import com.datastax.oss.driver.api.core.type.codec.CodecNotFoundException; import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.math.BigDecimal; import java.math.BigInteger; import java.net.InetAddress; @@ -36,6 +33,9 @@ import java.util.Map; import java.util.Set; import java.util.UUID; +import javax.annotation.CheckReturnValue; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** A data structure that provides methods to set its values via a name. */ public interface SettableByName> @@ -57,9 +57,9 @@ public interface SettableByName> * further usage of this data will have unpredictable results. * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setBytesUnsafe(@NonNull String name, @Nullable ByteBuffer v) { + default SelfT setBytesUnsafe(@Nonnull String name, @Nullable ByteBuffer v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setBytesUnsafe(i, v); @@ -68,9 +68,9 @@ default SelfT setBytesUnsafe(@NonNull String name, @Nullable ByteBuffer v) { return result; } - @NonNull + @Nonnull @Override - default DataType getType(@NonNull String name) { + default DataType getType(@Nonnull String name) { return getType(firstIndexOf(name)); } @@ -82,9 +82,9 @@ default DataType getType(@NonNull String name) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setToNull(@NonNull String name) { + default SelfT setToNull(@Nonnull String name) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setToNull(i); @@ -108,10 +108,10 @@ default SelfT setToNull(@NonNull String name) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT set( - @NonNull String name, @Nullable ValueT v, @NonNull TypeCodec codec) { + @Nonnull String name, @Nullable ValueT v, @Nonnull TypeCodec codec) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).set(i, v, codec); @@ -134,10 +134,10 @@ default SelfT set( * @throws IllegalArgumentException if the name is invalid. * @throws CodecNotFoundException if no codec can perform the conversion. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT set( - @NonNull String name, @Nullable ValueT v, @NonNull GenericType targetType) { + @Nonnull String name, @Nullable ValueT v, @Nonnull GenericType targetType) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).set(i, v, targetType); @@ -159,10 +159,10 @@ default SelfT set( * @throws IllegalArgumentException if the name is invalid. * @throws CodecNotFoundException if no codec can perform the conversion. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT set( - @NonNull String name, @Nullable ValueT v, @NonNull Class targetClass) { + @Nonnull String name, @Nullable ValueT v, @Nonnull Class targetClass) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).set(i, v, targetClass); @@ -184,9 +184,9 @@ default SelfT set( * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setBoolean(@NonNull String name, boolean v) { + default SelfT setBoolean(@Nonnull String name, boolean v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setBoolean(i, v); @@ -200,9 +200,9 @@ default SelfT setBoolean(@NonNull String name, boolean v) { * for{@link #setBoolean(String, boolean)}. */ @Deprecated - @NonNull + @Nonnull @CheckReturnValue - default SelfT setBool(@NonNull String name, boolean v) { + default SelfT setBool(@Nonnull String name, boolean v) { return setBoolean(name, v); } @@ -219,9 +219,9 @@ default SelfT setBool(@NonNull String name, boolean v) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setByte(@NonNull String name, byte v) { + default SelfT setByte(@Nonnull String name, byte v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setByte(i, v); @@ -243,9 +243,9 @@ default SelfT setByte(@NonNull String name, byte v) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setDouble(@NonNull String name, double v) { + default SelfT setDouble(@Nonnull String name, double v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setDouble(i, v); @@ -267,9 +267,9 @@ default SelfT setDouble(@NonNull String name, double v) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setFloat(@NonNull String name, float v) { + default SelfT setFloat(@Nonnull String name, float v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setFloat(i, v); @@ -291,9 +291,9 @@ default SelfT setFloat(@NonNull String name, float v) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setInt(@NonNull String name, int v) { + default SelfT setInt(@Nonnull String name, int v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setInt(i, v); @@ -315,9 +315,9 @@ default SelfT setInt(@NonNull String name, int v) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setLong(@NonNull String name, long v) { + default SelfT setLong(@Nonnull String name, long v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setLong(i, v); @@ -339,9 +339,9 @@ default SelfT setLong(@NonNull String name, long v) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setShort(@NonNull String name, short v) { + default SelfT setShort(@Nonnull String name, short v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setShort(i, v); @@ -360,9 +360,9 @@ default SelfT setShort(@NonNull String name, short v) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setInstant(@NonNull String name, @Nullable Instant v) { + default SelfT setInstant(@Nonnull String name, @Nullable Instant v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setInstant(i, v); @@ -381,9 +381,9 @@ default SelfT setInstant(@NonNull String name, @Nullable Instant v) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setLocalDate(@NonNull String name, @Nullable LocalDate v) { + default SelfT setLocalDate(@Nonnull String name, @Nullable LocalDate v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setLocalDate(i, v); @@ -402,9 +402,9 @@ default SelfT setLocalDate(@NonNull String name, @Nullable LocalDate v) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setLocalTime(@NonNull String name, @Nullable LocalTime v) { + default SelfT setLocalTime(@Nonnull String name, @Nullable LocalTime v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setLocalTime(i, v); @@ -423,9 +423,9 @@ default SelfT setLocalTime(@NonNull String name, @Nullable LocalTime v) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setByteBuffer(@NonNull String name, @Nullable ByteBuffer v) { + default SelfT setByteBuffer(@Nonnull String name, @Nullable ByteBuffer v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setByteBuffer(i, v); @@ -444,9 +444,9 @@ default SelfT setByteBuffer(@NonNull String name, @Nullable ByteBuffer v) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setString(@NonNull String name, @Nullable String v) { + default SelfT setString(@Nonnull String name, @Nullable String v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setString(i, v); @@ -465,9 +465,9 @@ default SelfT setString(@NonNull String name, @Nullable String v) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setBigInteger(@NonNull String name, @Nullable BigInteger v) { + default SelfT setBigInteger(@Nonnull String name, @Nullable BigInteger v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setBigInteger(i, v); @@ -486,9 +486,9 @@ default SelfT setBigInteger(@NonNull String name, @Nullable BigInteger v) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setBigDecimal(@NonNull String name, @Nullable BigDecimal v) { + default SelfT setBigDecimal(@Nonnull String name, @Nullable BigDecimal v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setBigDecimal(i, v); @@ -507,9 +507,9 @@ default SelfT setBigDecimal(@NonNull String name, @Nullable BigDecimal v) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setUuid(@NonNull String name, @Nullable UUID v) { + default SelfT setUuid(@Nonnull String name, @Nullable UUID v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setUuid(i, v); @@ -528,9 +528,9 @@ default SelfT setUuid(@NonNull String name, @Nullable UUID v) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setInetAddress(@NonNull String name, @Nullable InetAddress v) { + default SelfT setInetAddress(@Nonnull String name, @Nullable InetAddress v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setInetAddress(i, v); @@ -549,9 +549,9 @@ default SelfT setInetAddress(@NonNull String name, @Nullable InetAddress v) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setCqlDuration(@NonNull String name, @Nullable CqlDuration v) { + default SelfT setCqlDuration(@Nonnull String name, @Nullable CqlDuration v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setCqlDuration(i, v); @@ -570,12 +570,12 @@ default SelfT setCqlDuration(@NonNull String name, @Nullable CqlDuration v) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setVector( - @NonNull String name, + @Nonnull String name, @Nullable CqlVector v, - @NonNull Class elementsClass) { + @Nonnull Class elementsClass) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setVector(i, v, elementsClass); @@ -596,9 +596,9 @@ default SelfT setVector( * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setToken(@NonNull String name, @NonNull Token v) { + default SelfT setToken(@Nonnull String name, @Nonnull Token v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setToken(i, v); @@ -620,10 +620,10 @@ default SelfT setToken(@NonNull String name, @NonNull Token v) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setList( - @NonNull String name, @Nullable List v, @NonNull Class elementsClass) { + @Nonnull String name, @Nullable List v, @Nonnull Class elementsClass) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setList(i, v, elementsClass); @@ -645,10 +645,10 @@ default SelfT setList( * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setSet( - @NonNull String name, @Nullable Set v, @NonNull Class elementsClass) { + @Nonnull String name, @Nullable Set v, @Nonnull Class elementsClass) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setSet(i, v, elementsClass); @@ -670,13 +670,13 @@ default SelfT setSet( * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT setMap( - @NonNull String name, + @Nonnull String name, @Nullable Map v, - @NonNull Class keyClass, - @NonNull Class valueClass) { + @Nonnull Class keyClass, + @Nonnull Class valueClass) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setMap(i, v, keyClass, valueClass); @@ -695,9 +695,9 @@ default SelfT setMap( * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setUdtValue(@NonNull String name, @Nullable UdtValue v) { + default SelfT setUdtValue(@Nonnull String name, @Nullable UdtValue v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setUdtValue(i, v); @@ -716,9 +716,9 @@ default SelfT setUdtValue(@NonNull String name, @Nullable UdtValue v) { * * @throws IllegalArgumentException if the name is invalid. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT setTupleValue(@NonNull String name, @Nullable TupleValue v) { + default SelfT setTupleValue(@Nonnull String name, @Nullable TupleValue v) { SelfT result = null; for (Integer i : allIndicesOf(name)) { result = (result == null ? this : result).setTupleValue(i, v); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/data/TupleValue.java b/core/src/main/java/com/datastax/oss/driver/api/core/data/TupleValue.java index 0fde2d87e71..8a80aef3d95 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/data/TupleValue.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/data/TupleValue.java @@ -19,7 +19,7 @@ import com.datastax.oss.driver.api.core.detach.Detachable; import com.datastax.oss.driver.api.core.type.TupleType; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * Driver-side representation of a CQL {@code tuple} value. @@ -34,7 +34,7 @@ */ public interface TupleValue extends GettableByIndex, SettableByIndex { - @NonNull + @Nonnull TupleType getType(); /** @@ -56,7 +56,7 @@ public interface TupleValue extends GettableByIndex, SettableByIndex * might be undesirable to leak data in application logs. * */ - @NonNull + @Nonnull default String getFormattedContents() { return codecRegistry().codecFor(getType(), TupleValue.class).format(this); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/data/UdtValue.java b/core/src/main/java/com/datastax/oss/driver/api/core/data/UdtValue.java index 7e8bc80793b..b5e153f1d71 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/data/UdtValue.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/data/UdtValue.java @@ -19,7 +19,7 @@ import com.datastax.oss.driver.api.core.detach.Detachable; import com.datastax.oss.driver.api.core.type.UserDefinedType; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * Driver-side representation of an instance of a CQL user defined type. @@ -35,7 +35,7 @@ public interface UdtValue extends GettableById, GettableByName, SettableById, SettableByName { - @NonNull + @Nonnull UserDefinedType getType(); /** @@ -57,7 +57,7 @@ public interface UdtValue * might be undesirable to leak data in application logs. * */ - @NonNull + @Nonnull default String getFormattedContents() { return codecRegistry().codecFor(getType(), UdtValue.class).format(this); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/detach/AttachmentPoint.java b/core/src/main/java/com/datastax/oss/driver/api/core/detach/AttachmentPoint.java index d1897f66e16..51a2cb71f0a 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/detach/AttachmentPoint.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/detach/AttachmentPoint.java @@ -20,26 +20,26 @@ import com.datastax.oss.driver.api.core.ProtocolVersion; import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry; import com.datastax.oss.driver.api.core.type.codec.registry.MutableCodecRegistry; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** @see Detachable */ public interface AttachmentPoint { AttachmentPoint NONE = new AttachmentPoint() { - @NonNull + @Nonnull @Override public ProtocolVersion getProtocolVersion() { return ProtocolVersion.DEFAULT; } - @NonNull + @Nonnull @Override public CodecRegistry getCodecRegistry() { return CodecRegistry.DEFAULT; } }; - @NonNull + @Nonnull ProtocolVersion getProtocolVersion(); /** @@ -48,6 +48,6 @@ public CodecRegistry getCodecRegistry() { * the result of this method (as long as you didn't extend the driver context to plug a custom * registry implementation). */ - @NonNull + @Nonnull CodecRegistry getCodecRegistry(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/detach/Detachable.java b/core/src/main/java/com/datastax/oss/driver/api/core/detach/Detachable.java index 0c92bb727ea..16ca105cc45 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/detach/Detachable.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/detach/Detachable.java @@ -21,7 +21,7 @@ import com.datastax.oss.driver.api.core.data.Data; import com.datastax.oss.driver.api.core.type.TupleType; import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * Defines the contract of an object that can be detached and reattached to a driver instance. @@ -53,5 +53,5 @@ public interface Detachable { boolean isDetached(); - void attach(@NonNull AttachmentPoint attachmentPoint); + void attach(@Nonnull AttachmentPoint attachmentPoint); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/loadbalancing/LoadBalancingPolicy.java b/core/src/main/java/com/datastax/oss/driver/api/core/loadbalancing/LoadBalancingPolicy.java index d890ae6c100..128f18fc2a8 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/loadbalancing/LoadBalancingPolicy.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/loadbalancing/LoadBalancingPolicy.java @@ -22,12 +22,12 @@ import com.datastax.oss.driver.api.core.session.Request; import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.api.core.tracker.RequestTracker; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Map; import java.util.Optional; import java.util.Queue; import java.util.UUID; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** Decides which Cassandra nodes to contact for each query. */ public interface LoadBalancingPolicy extends AutoCloseable { @@ -42,7 +42,7 @@ public interface LoadBalancingPolicy extends AutoCloseable { * * @since 4.13.0 */ - @NonNull + @Nonnull default Optional getRequestTracker() { return Optional.empty(); } @@ -74,7 +74,7 @@ default Optional getRequestTracker() { * #onAdd(Node) added} later and will need to have their distance set (or the policy might * change distances dynamically over time). */ - void init(@NonNull Map nodes, @NonNull DistanceReporter distanceReporter); + void init(@Nonnull Map nodes, @Nonnull DistanceReporter distanceReporter); /** * Returns the coordinators to use for a new query. @@ -88,7 +88,7 @@ default Optional getRequestTracker() { * @return the list of coordinators to try. This must be a concurrent queue; {@link * java.util.concurrent.ConcurrentLinkedQueue} is a good choice. */ - @NonNull + @Nonnull Queue newQueryPlan(@Nullable Request request, @Nullable Session session); /** @@ -107,16 +107,16 @@ default Optional getRequestTracker() { * * @see #init(Map, DistanceReporter) */ - void onAdd(@NonNull Node node); + void onAdd(@Nonnull Node node); /** Called when a node is determined to be up. */ - void onUp(@NonNull Node node); + void onUp(@Nonnull Node node); /** Called when a node is determined to be down. */ - void onDown(@NonNull Node node); + void onDown(@Nonnull Node node); /** Called when a node is removed from the cluster. */ - void onRemove(@NonNull Node node); + void onRemove(@Nonnull Node node); /** Called when the cluster that this policy is associated with closes. */ @Override @@ -124,6 +124,6 @@ default Optional getRequestTracker() { /** An object that the policy uses to signal decisions it makes about node distances. */ interface DistanceReporter { - void setDistance(@NonNull Node node, @NonNull NodeDistance distance); + void setDistance(@Nonnull Node node, @Nonnull NodeDistance distance); } } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/loadbalancing/NodeDistanceEvaluator.java b/core/src/main/java/com/datastax/oss/driver/api/core/loadbalancing/NodeDistanceEvaluator.java index 9a5a7f5a894..5745da88e73 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/loadbalancing/NodeDistanceEvaluator.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/loadbalancing/NodeDistanceEvaluator.java @@ -18,8 +18,8 @@ package com.datastax.oss.driver.api.core.loadbalancing; import com.datastax.oss.driver.api.core.metadata.Node; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A pluggable {@link NodeDistance} evaluator. @@ -50,5 +50,5 @@ public interface NodeDistanceEvaluator { * @return The {@link NodeDistance} to assign to the node, or null to let the policy decide. */ @Nullable - NodeDistance evaluateDistance(@NonNull Node node, @Nullable String localDc); + NodeDistance evaluateDistance(@Nonnull Node node, @Nullable String localDc); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/EndPoint.java b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/EndPoint.java index 530f2ad38ac..2721fc96beb 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/EndPoint.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/EndPoint.java @@ -17,9 +17,9 @@ */ package com.datastax.oss.driver.api.core.metadata; -import edu.umd.cs.findbugs.annotations.NonNull; import java.net.InetSocketAddress; import java.net.SocketAddress; +import javax.annotation.Nonnull; /** * Encapsulates the information needed to open connections to a node. @@ -37,7 +37,7 @@ public interface EndPoint { *

This will be called each time the driver opens a new connection to the node. The returned * address cannot be null. */ - @NonNull + @Nonnull SocketAddress resolve(); /** @@ -47,6 +47,6 @@ public interface EndPoint { * good identifiers. So this method will typically replace the dots by another character, for * example {@code 127_0_0_1_9042}. */ - @NonNull + @Nonnull String asMetricPrefix(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/Metadata.java b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/Metadata.java index 21ad200abed..503c3fa0fdb 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/Metadata.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/Metadata.java @@ -21,11 +21,11 @@ import com.datastax.oss.driver.api.core.config.DefaultDriverOption; import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata; import com.datastax.oss.driver.api.core.session.Session; -import edu.umd.cs.findbugs.annotations.NonNull; import java.net.InetSocketAddress; import java.util.Map; import java.util.Optional; import java.util.UUID; +import javax.annotation.Nonnull; /** * The metadata of the Cassandra cluster that this driver instance is connected to. @@ -43,7 +43,7 @@ public interface Metadata { * system.local}/{@code system.peers}). This might include nodes that are currently viewed as * down, or ignored by the load balancing policy. */ - @NonNull + @Nonnull Map getNodes(); /** @@ -52,8 +52,8 @@ public interface Metadata { * *

Note that this method performs a linear search of {@link #getNodes()}. */ - @NonNull - default Optional findNode(@NonNull EndPoint endPoint) { + @Nonnull + default Optional findNode(@Nonnull EndPoint endPoint) { for (Node node : getNodes().values()) { if (node.getEndPoint().equals(endPoint)) { return Optional.of(node); @@ -68,8 +68,8 @@ default Optional findNode(@NonNull EndPoint endPoint) { * *

Note that this method performs a linear search of {@link #getNodes()}. */ - @NonNull - default Optional findNode(@NonNull InetSocketAddress broadcastRpcAddress) { + @Nonnull + default Optional findNode(@Nonnull InetSocketAddress broadcastRpcAddress) { for (Node node : getNodes().values()) { Optional o = node.getBroadcastRpcAddress(); if (o.isPresent() && o.get().equals(broadcastRpcAddress)) { @@ -89,11 +89,11 @@ default Optional findNode(@NonNull InetSocketAddress broadcastRpcAddress) * @see Session#setSchemaMetadataEnabled(Boolean) * @see DefaultDriverOption#METADATA_SCHEMA_REFRESHED_KEYSPACES */ - @NonNull + @Nonnull Map getKeyspaces(); - @NonNull - default Optional getKeyspace(@NonNull CqlIdentifier keyspaceId) { + @Nonnull + default Optional getKeyspace(@Nonnull CqlIdentifier keyspaceId) { return Optional.ofNullable(getKeyspaces().get(keyspaceId)); } @@ -101,8 +101,8 @@ default Optional getKeyspace(@NonNull CqlIdentifier keyspaceId * Shortcut for {@link #getKeyspace(CqlIdentifier) * getKeyspace(CqlIdentifier.fromCql(keyspaceName))}. */ - @NonNull - default Optional getKeyspace(@NonNull String keyspaceName) { + @Nonnull + default Optional getKeyspace(@Nonnull String keyspaceName) { return getKeyspace(CqlIdentifier.fromCql(keyspaceName)); } @@ -114,7 +114,7 @@ default Optional getKeyspace(@NonNull String keyspaceName) { * * @see DefaultDriverOption#METADATA_TOKEN_MAP_ENABLED */ - @NonNull + @Nonnull Optional getTokenMap(); /** @@ -124,7 +124,7 @@ default Optional getKeyspace(@NonNull String keyspaceName) { *

Note that this method has a default implementation for backwards compatibility. It is * expected that any implementing classes override this method. */ - @NonNull + @Nonnull default Optional getClusterName() { return Optional.empty(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/Node.java b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/Node.java index fbfc748dd52..8fb2a89bc60 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/Node.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/Node.java @@ -21,12 +21,12 @@ import com.datastax.oss.driver.api.core.loadbalancing.LoadBalancingPolicy; import com.datastax.oss.driver.api.core.loadbalancing.NodeDistance; import com.datastax.oss.driver.api.core.session.Session; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.net.InetSocketAddress; import java.util.Map; import java.util.Optional; import java.util.UUID; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Metadata about a Cassandra node in the cluster. @@ -52,7 +52,7 @@ public interface Node { *

When behind a proxy, the endpoint reported here usually refers to the proxy itself, and is * unrelated to the node's broadcast RPC address. */ - @NonNull + @Nonnull EndPoint getEndPoint(); /** @@ -74,7 +74,7 @@ public interface Node { * @see CASSANDRA-9436 (where the * information was added to system.local) */ - @NonNull + @Nonnull Optional getBroadcastRpcAddress(); /** @@ -93,7 +93,7 @@ public interface Node { * @see CASSANDRA-9436 (where the * information was added to system.local) */ - @NonNull + @Nonnull Optional getBroadcastAddress(); /** @@ -106,7 +106,7 @@ public interface Node { *

This may not be known at all times. In particular, current Cassandra versions (up to 3.11) * only store it in {@code system.local}, so this will be known only for the control node. */ - @NonNull + @Nonnull Optional getListenAddress(); /** @@ -147,10 +147,10 @@ public interface Node { *

Note that the returned map is immutable: if the properties change, this is reflected by * publishing a new map instance, therefore you must call this method again to see the changes. */ - @NonNull + @Nonnull Map getExtras(); - @NonNull + @Nonnull NodeState getState(); /** @@ -179,7 +179,7 @@ public interface Node { *

This is exposed here for information only. Distance events are handled internally by the * driver. */ - @NonNull + @Nonnull NodeDistance getDistance(); /** @@ -198,7 +198,7 @@ public interface Node { * .withNodeStateListener( * new NodeStateListenerBase() { * @Override - * public void onUp(@NonNull Node node) { + * public void onUp(@Nonnull Node node) { * // node.getHostId() == null for the first invocation only * } * }) diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/NodeStateListener.java b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/NodeStateListener.java index bb52e9d1496..b09e40bfe8f 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/NodeStateListener.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/NodeStateListener.java @@ -20,7 +20,7 @@ import com.datastax.oss.driver.api.core.loadbalancing.NodeDistance; import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.api.core.session.SessionBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * A listener that gets notified when nodes states change. @@ -52,16 +52,16 @@ public interface NodeStateListener extends AutoCloseable { *

This method is not invoked for the contact points provided at initialization. It is * however for new nodes discovered during the full node list refresh after the first connection. */ - void onAdd(@NonNull Node node); + void onAdd(@Nonnull Node node); /** Invoked when a node's state switches to {@link NodeState#UP}. */ - void onUp(@NonNull Node node); + void onUp(@Nonnull Node node); /** * Invoked when a node's state switches to {@link NodeState#DOWN} or {@link * NodeState#FORCED_DOWN}. */ - void onDown(@NonNull Node node); + void onDown(@Nonnull Node node); /** * Invoked when a node leaves the cluster. @@ -69,7 +69,7 @@ public interface NodeStateListener extends AutoCloseable { *

This can be triggered by a topology event, or during a full node list refresh if the node is * absent from the new list. */ - void onRemove(@NonNull Node node); + void onRemove(@Nonnull Node node); /** * Invoked when the session is ready to process user requests. @@ -107,5 +107,5 @@ public interface NodeStateListener extends AutoCloseable { * *

This method's default implementation is empty. */ - default void onSessionReady(@NonNull Session session) {} + default void onSessionReady(@Nonnull Session session) {} } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/NodeStateListenerBase.java b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/NodeStateListenerBase.java index 0b747a00084..5ebfc661614 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/NodeStateListenerBase.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/NodeStateListenerBase.java @@ -17,7 +17,7 @@ */ package com.datastax.oss.driver.api.core.metadata; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * Convenience class for listener implementations that that don't need to override all methods (all @@ -26,22 +26,22 @@ public class NodeStateListenerBase implements NodeStateListener { @Override - public void onAdd(@NonNull Node node) { + public void onAdd(@Nonnull Node node) { // nothing to do } @Override - public void onUp(@NonNull Node node) { + public void onUp(@Nonnull Node node) { // nothing to do } @Override - public void onDown(@NonNull Node node) { + public void onDown(@Nonnull Node node) { // nothing to do } @Override - public void onRemove(@NonNull Node node) { + public void onRemove(@Nonnull Node node) { // nothing to do } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/SafeInitNodeStateListener.java b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/SafeInitNodeStateListener.java index c33f7616b5a..3c5ebb86786 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/SafeInitNodeStateListener.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/SafeInitNodeStateListener.java @@ -18,13 +18,13 @@ package com.datastax.oss.driver.api.core.metadata; import com.datastax.oss.driver.api.core.session.Session; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.BiConsumer; +import javax.annotation.Nonnull; import net.jcip.annotations.GuardedBy; /** @@ -87,13 +87,13 @@ public class SafeInitNodeStateListener implements NodeStateListener { * @param replayInitEvents whether to record events during initialization and replay them to the * child listener once it's created, or just ignore them. */ - public SafeInitNodeStateListener(@NonNull NodeStateListener delegate, boolean replayInitEvents) { + public SafeInitNodeStateListener(@Nonnull NodeStateListener delegate, boolean replayInitEvents) { this.delegate = Objects.requireNonNull(delegate); this.replayInitEvents = replayInitEvents; } @Override - public void onSessionReady(@NonNull Session session) { + public void onSessionReady(@Nonnull Session session) { lock.writeLock().lock(); try { if (!sessionReady) { @@ -111,22 +111,22 @@ public void onSessionReady(@NonNull Session session) { } @Override - public void onAdd(@NonNull Node node) { + public void onAdd(@Nonnull Node node) { onEvent(node, InitEvent.Type.ADD); } @Override - public void onUp(@NonNull Node node) { + public void onUp(@Nonnull Node node) { onEvent(node, InitEvent.Type.UP); } @Override - public void onDown(@NonNull Node node) { + public void onDown(@Nonnull Node node) { onEvent(node, InitEvent.Type.DOWN); } @Override - public void onRemove(@NonNull Node node) { + public void onRemove(@Nonnull Node node) { onEvent(node, InitEvent.Type.REMOVE); } @@ -183,12 +183,12 @@ enum Type { final Node node; final Type type; - InitEvent(@NonNull Node node, @NonNull Type type) { + InitEvent(@Nonnull Node node, @Nonnull Type type) { this.node = Objects.requireNonNull(node); this.type = Objects.requireNonNull(type); } - void invoke(@NonNull NodeStateListener target) { + void invoke(@Nonnull NodeStateListener target) { type.listenerMethod.accept(Objects.requireNonNull(target), node); } } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/TokenMap.java b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/TokenMap.java index 7746bf3382e..ac339f17805 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/TokenMap.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/TokenMap.java @@ -25,9 +25,9 @@ import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableSet; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.util.Set; +import javax.annotation.Nonnull; /** * Utility component to work with the tokens of a given driver instance. @@ -43,12 +43,12 @@ public interface TokenMap { /** Builds a token from its string representation. */ - @NonNull - Token parse(@NonNull String tokenString); + @Nonnull + Token parse(@Nonnull String tokenString); /** Formats a token into a string representation appropriate for concatenation in a CQL query. */ - @NonNull - String format(@NonNull Token token); + @Nonnull + String format(@Nonnull Token token); /** * Builds a token from a partition key. @@ -57,18 +57,18 @@ public interface TokenMap { * obtained with {@link TypeCodec#encode(Object, ProtocolVersion)}. Neither the individual * components, nor the vararg array itself, can be {@code null}. */ - @NonNull - Token newToken(@NonNull ByteBuffer... partitionKey); + @Nonnull + Token newToken(@Nonnull ByteBuffer... partitionKey); - @NonNull - TokenRange newTokenRange(@NonNull Token start, @NonNull Token end); + @Nonnull + TokenRange newTokenRange(@Nonnull Token start, @Nonnull Token end); /** The token ranges that define data distribution on the ring. */ - @NonNull + @Nonnull Set getTokenRanges(); /** The token ranges for which a given node is the primary replica. */ - @NonNull + @Nonnull Set getTokenRanges(Node node); /** @@ -77,8 +77,8 @@ public interface TokenMap { *

This is functionally equivalent to {@code getTokenRanges(node).map(r -> r.getEnd())}. Note * that the set is rebuilt every time you call this method. */ - @NonNull - default Set getTokens(@NonNull Node node) { + @Nonnull + default Set getTokens(@Nonnull Node node) { ImmutableSet.Builder result = ImmutableSet.builder(); for (TokenRange range : getTokenRanges(node)) { result.add(range.getEnd()); @@ -87,41 +87,41 @@ default Set getTokens(@NonNull Node node) { } /** The token ranges that are replicated on the given node, for the given keyspace. */ - @NonNull - Set getTokenRanges(@NonNull CqlIdentifier keyspace, @NonNull Node replica); + @Nonnull + Set getTokenRanges(@Nonnull CqlIdentifier keyspace, @Nonnull Node replica); /** * Shortcut for {@link #getTokenRanges(CqlIdentifier, Node) * getTokenRanges(CqlIdentifier.fromCql(keyspaceName), replica)}. */ - @NonNull - default Set getTokenRanges(@NonNull String keyspaceName, @NonNull Node replica) { + @Nonnull + default Set getTokenRanges(@Nonnull String keyspaceName, @Nonnull Node replica) { return getTokenRanges(CqlIdentifier.fromCql(keyspaceName), replica); } /** The replicas for a given partition key in the given keyspace. */ - @NonNull - Set getReplicas(@NonNull CqlIdentifier keyspace, @NonNull ByteBuffer partitionKey); + @Nonnull + Set getReplicas(@Nonnull CqlIdentifier keyspace, @Nonnull ByteBuffer partitionKey); /** * Shortcut for {@link #getReplicas(CqlIdentifier, ByteBuffer) * getReplicas(CqlIdentifier.fromCql(keyspaceName), partitionKey)}. */ - @NonNull - default Set getReplicas(@NonNull String keyspaceName, @NonNull ByteBuffer partitionKey) { + @Nonnull + default Set getReplicas(@Nonnull String keyspaceName, @Nonnull ByteBuffer partitionKey) { return getReplicas(CqlIdentifier.fromCql(keyspaceName), partitionKey); } /** The replicas for a given token in the given keyspace. */ - @NonNull - Set getReplicas(@NonNull CqlIdentifier keyspace, @NonNull Token token); + @Nonnull + Set getReplicas(@Nonnull CqlIdentifier keyspace, @Nonnull Token token); /** * Shortcut for {@link #getReplicas(CqlIdentifier, Token) * getReplicas(CqlIdentifier.fromCql(keyspaceName), token)}. */ - @NonNull - default Set getReplicas(@NonNull String keyspaceName, @NonNull Token token) { + @Nonnull + default Set getReplicas(@Nonnull String keyspaceName, @Nonnull Token token) { return getReplicas(CqlIdentifier.fromCql(keyspaceName), token); } @@ -133,8 +133,8 @@ default Set getReplicas(@NonNull String keyspaceName, @NonNull Token token * token of the range. In other words, this method is a shortcut for {@code getReplicas(keyspace, * range.getEnd())}. */ - @NonNull - default Set getReplicas(@NonNull CqlIdentifier keyspace, @NonNull TokenRange range) { + @Nonnull + default Set getReplicas(@Nonnull CqlIdentifier keyspace, @Nonnull TokenRange range) { return getReplicas(keyspace, range.getEnd()); } @@ -142,12 +142,12 @@ default Set getReplicas(@NonNull CqlIdentifier keyspace, @NonNull TokenRan * Shortcut for {@link #getReplicas(CqlIdentifier, TokenRange) * getReplicas(CqlIdentifier.fromCql(keyspaceName), range)}. */ - @NonNull - default Set getReplicas(@NonNull String keyspaceName, @NonNull TokenRange range) { + @Nonnull + default Set getReplicas(@Nonnull String keyspaceName, @Nonnull TokenRange range) { return getReplicas(CqlIdentifier.fromCql(keyspaceName), range); } /** The name of the partitioner class in use, as reported by the Cassandra nodes. */ - @NonNull + @Nonnull String getPartitionerName(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/AggregateMetadata.java b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/AggregateMetadata.java index 35eec88eb45..d91614e3a79 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/AggregateMetadata.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/AggregateMetadata.java @@ -21,16 +21,16 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.internal.core.metadata.schema.ScriptBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Optional; +import javax.annotation.Nonnull; /** A CQL aggregate in the schema metadata. */ public interface AggregateMetadata extends Describable { - @NonNull + @Nonnull CqlIdentifier getKeyspace(); - @NonNull + @Nonnull FunctionSignature getSignature(); /** @@ -39,7 +39,7 @@ public interface AggregateMetadata extends Describable { *

This is the function specified with {@code FINALFUNC} in the {@code CREATE AGGREGATE...} * statement. It transforms the final value after the aggregation is complete. */ - @NonNull + @Nonnull Optional getFinalFuncSignature(); /** @@ -59,7 +59,7 @@ public interface AggregateMetadata extends Describable { * * @return the initial state, or empty if there is none. */ - @NonNull + @Nonnull Optional getInitCond(); /** @@ -68,7 +68,7 @@ public interface AggregateMetadata extends Describable { *

This is the final type of the value computed by this aggregate; in other words, the return * type of the final function if it is defined, or the state type otherwise. */ - @NonNull + @Nonnull DataType getReturnType(); /** @@ -77,7 +77,7 @@ public interface AggregateMetadata extends Describable { *

This is the function specified with {@code SFUNC} in the {@code CREATE AGGREGATE...} * statement. It aggregates the current state with each row to produce a new state. */ - @NonNull + @Nonnull FunctionSignature getStateFuncSignature(); /** @@ -87,17 +87,17 @@ public interface AggregateMetadata extends Describable { * It defines the type of the value that is accumulated as the aggregate iterates through the * rows. */ - @NonNull + @Nonnull DataType getStateType(); - @NonNull + @Nonnull @Override default String describeWithChildren(boolean pretty) { // An aggregate has no children return describe(pretty); } - @NonNull + @Nonnull @Override default String describe(boolean pretty) { ScriptBuilder builder = new ScriptBuilder(pretty); @@ -141,6 +141,6 @@ default String describe(boolean pretty) { /** * Formats the {@linkplain #getInitCond() initial state value} for inclusion in a CQL statement. */ - @NonNull + @Nonnull Optional formatInitCond(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/ColumnMetadata.java b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/ColumnMetadata.java index fb91211e2fa..52d72080bf9 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/ColumnMetadata.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/ColumnMetadata.java @@ -19,25 +19,25 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.core.type.DataType; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** A column in the schema metadata. */ public interface ColumnMetadata { - @NonNull + @Nonnull CqlIdentifier getKeyspace(); /** * The identifier of the {@link TableMetadata} or a {@link ViewMetadata} that this column belongs * to. */ - @NonNull + @Nonnull CqlIdentifier getParent(); - @NonNull + @Nonnull CqlIdentifier getName(); - @NonNull + @Nonnull DataType getType(); boolean isStatic(); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/Describable.java b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/Describable.java index bf1bf97b19e..da8296063f2 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/Describable.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/Describable.java @@ -18,7 +18,7 @@ package com.datastax.oss.driver.api.core.metadata.schema; import com.datastax.oss.driver.api.core.CqlIdentifier; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** A schema element that can be described in terms of CQL {@code CREATE} statements. */ public interface Describable { @@ -30,7 +30,7 @@ public interface Describable { * {@link CqlIdentifier#asCql(boolean) pretty identifiers}). If {@code false}, return the * statement on a single line with minimal formatting. */ - @NonNull + @Nonnull String describe(boolean pretty); /** @@ -41,6 +41,6 @@ public interface Describable { * {@link CqlIdentifier#asCql(boolean) pretty identifiers}). If {@code false}, return each * statement on a single line with minimal formatting. */ - @NonNull + @Nonnull String describeWithChildren(boolean pretty); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/FunctionMetadata.java b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/FunctionMetadata.java index ed2d4d780de..7a4e5921119 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/FunctionMetadata.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/FunctionMetadata.java @@ -20,37 +20,37 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.internal.core.metadata.schema.ScriptBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; +import javax.annotation.Nonnull; /** A CQL function in the schema metadata. */ public interface FunctionMetadata extends Describable { - @NonNull + @Nonnull CqlIdentifier getKeyspace(); - @NonNull + @Nonnull FunctionSignature getSignature(); /** * The names of the parameters. This is in the same order as {@code * getSignature().getParameterTypes()} */ - @NonNull + @Nonnull List getParameterNames(); - @NonNull + @Nonnull String getBody(); boolean isCalledOnNullInput(); - @NonNull + @Nonnull String getLanguage(); - @NonNull + @Nonnull DataType getReturnType(); - @NonNull + @Nonnull @Override default String describe(boolean pretty) { ScriptBuilder builder = new ScriptBuilder(pretty); @@ -89,7 +89,7 @@ default String describe(boolean pretty) { .build(); } - @NonNull + @Nonnull @Override default String describeWithChildren(boolean pretty) { // A function has no children diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/FunctionSignature.java b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/FunctionSignature.java index 8108b4b7afd..a8364ba0e62 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/FunctionSignature.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/FunctionSignature.java @@ -20,10 +20,10 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.Serializable; import java.util.List; import java.util.Objects; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; /** @@ -37,11 +37,11 @@ public class FunctionSignature implements Serializable { private static final long serialVersionUID = 1; - @NonNull private final CqlIdentifier name; - @NonNull private final List parameterTypes; + @Nonnull private final CqlIdentifier name; + @Nonnull private final List parameterTypes; public FunctionSignature( - @NonNull CqlIdentifier name, @NonNull Iterable parameterTypes) { + @Nonnull CqlIdentifier name, @Nonnull Iterable parameterTypes) { this.name = name; this.parameterTypes = ImmutableList.copyOf(parameterTypes); } @@ -49,7 +49,7 @@ public FunctionSignature( /** * @param parameterTypes neither the individual types, nor the vararg array itself, can be null. */ - public FunctionSignature(@NonNull CqlIdentifier name, @NonNull DataType... parameterTypes) { + public FunctionSignature(@Nonnull CqlIdentifier name, @Nonnull DataType... parameterTypes) { this( name, parameterTypes.length == 0 @@ -61,7 +61,7 @@ public FunctionSignature(@NonNull CqlIdentifier name, @NonNull DataType... param * Shortcut for {@link #FunctionSignature(CqlIdentifier, Iterable) new * FunctionSignature(CqlIdentifier.fromCql(name), parameterTypes)}. */ - public FunctionSignature(@NonNull String name, @NonNull Iterable parameterTypes) { + public FunctionSignature(@Nonnull String name, @Nonnull Iterable parameterTypes) { this(CqlIdentifier.fromCql(name), parameterTypes); } @@ -71,16 +71,16 @@ public FunctionSignature(@NonNull String name, @NonNull Iterable param * * @param parameterTypes neither the individual types, nor the vararg array itself, can be null. */ - public FunctionSignature(@NonNull String name, @NonNull DataType... parameterTypes) { + public FunctionSignature(@Nonnull String name, @Nonnull DataType... parameterTypes) { this(CqlIdentifier.fromCql(name), parameterTypes); } - @NonNull + @Nonnull public CqlIdentifier getName() { return name; } - @NonNull + @Nonnull public List getParameterTypes() { return parameterTypes; } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/IndexMetadata.java b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/IndexMetadata.java index 631a6584a27..6124b32a451 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/IndexMetadata.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/IndexMetadata.java @@ -20,30 +20,30 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.internal.core.metadata.schema.ScriptBuilder; import com.datastax.oss.driver.shaded.guava.common.collect.Maps; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; import java.util.Optional; +import javax.annotation.Nonnull; /** A secondary index in the schema metadata. */ public interface IndexMetadata extends Describable { - @NonNull + @Nonnull CqlIdentifier getKeyspace(); - @NonNull + @Nonnull CqlIdentifier getTable(); - @NonNull + @Nonnull CqlIdentifier getName(); - @NonNull + @Nonnull IndexKind getKind(); - @NonNull + @Nonnull String getTarget(); /** If this index is custom, the name of the server-side implementation. Otherwise, empty. */ - @NonNull + @Nonnull default Optional getClassName() { return Optional.ofNullable(getOptions().get("class_name")); } @@ -58,10 +58,10 @@ default Optional getClassName() { *

Note that some of these options might also be exposed as standalone fields in this * interface, namely {@link #getClassName()} and {{@link #getTarget()}}. */ - @NonNull + @Nonnull Map getOptions(); - @NonNull + @Nonnull @Override default String describe(boolean pretty) { ScriptBuilder builder = new ScriptBuilder(pretty); @@ -106,7 +106,7 @@ default String describe(boolean pretty) { return builder.build(); } - @NonNull + @Nonnull @Override default String describeWithChildren(boolean pretty) { // An index has no children diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/KeyspaceMetadata.java b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/KeyspaceMetadata.java index e5080932b3c..bd734cc18ba 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/KeyspaceMetadata.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/KeyspaceMetadata.java @@ -23,15 +23,15 @@ import com.datastax.oss.driver.internal.core.metadata.schema.ScriptBuilder; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; import com.datastax.oss.driver.shaded.guava.common.collect.Iterables; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; import java.util.Objects; import java.util.Optional; +import javax.annotation.Nonnull; /** A keyspace in the schema metadata. */ public interface KeyspaceMetadata extends Describable { - @NonNull + @Nonnull CqlIdentifier getName(); /** Whether durable writes are set on this keyspace. */ @@ -41,29 +41,29 @@ public interface KeyspaceMetadata extends Describable { boolean isVirtual(); /** The replication options defined for this keyspace. */ - @NonNull + @Nonnull Map getReplication(); - @NonNull + @Nonnull Map getTables(); - @NonNull - default Optional getTable(@NonNull CqlIdentifier tableId) { + @Nonnull + default Optional getTable(@Nonnull CqlIdentifier tableId) { return Optional.ofNullable(getTables().get(tableId)); } /** Shortcut for {@link #getTable(CqlIdentifier) getTable(CqlIdentifier.fromCql(tableName))}. */ - @NonNull - default Optional getTable(@NonNull String tableName) { + @Nonnull + default Optional getTable(@Nonnull String tableName) { return getTable(CqlIdentifier.fromCql(tableName)); } - @NonNull + @Nonnull Map getViews(); /** Gets the views based on a given table. */ - @NonNull - default Map getViewsOnTable(@NonNull CqlIdentifier tableId) { + @Nonnull + default Map getViewsOnTable(@Nonnull CqlIdentifier tableId) { ImmutableMap.Builder builder = ImmutableMap.builder(); for (ViewMetadata view : getViews().values()) { if (view.getBaseTable().equals(tableId)) { @@ -73,22 +73,22 @@ default Map getViewsOnTable(@NonNull CqlIdentifier return builder.build(); } - @NonNull - default Optional getView(@NonNull CqlIdentifier viewId) { + @Nonnull + default Optional getView(@Nonnull CqlIdentifier viewId) { return Optional.ofNullable(getViews().get(viewId)); } /** Shortcut for {@link #getView(CqlIdentifier) getView(CqlIdentifier.fromCql(viewName))}. */ - @NonNull - default Optional getView(@NonNull String viewName) { + @Nonnull + default Optional getView(@Nonnull String viewName) { return getView(CqlIdentifier.fromCql(viewName)); } - @NonNull + @Nonnull Map getUserDefinedTypes(); - @NonNull - default Optional getUserDefinedType(@NonNull CqlIdentifier typeId) { + @Nonnull + default Optional getUserDefinedType(@Nonnull CqlIdentifier typeId) { return Optional.ofNullable(getUserDefinedTypes().get(typeId)); } @@ -96,22 +96,22 @@ default Optional getUserDefinedType(@NonNull CqlIdentifier type * Shortcut for {@link #getUserDefinedType(CqlIdentifier) * getUserDefinedType(CqlIdentifier.fromCql(typeName))}. */ - @NonNull - default Optional getUserDefinedType(@NonNull String typeName) { + @Nonnull + default Optional getUserDefinedType(@Nonnull String typeName) { return getUserDefinedType(CqlIdentifier.fromCql(typeName)); } - @NonNull + @Nonnull Map getFunctions(); - @NonNull - default Optional getFunction(@NonNull FunctionSignature functionSignature) { + @Nonnull + default Optional getFunction(@Nonnull FunctionSignature functionSignature) { return Optional.ofNullable(getFunctions().get(functionSignature)); } - @NonNull + @Nonnull default Optional getFunction( - @NonNull CqlIdentifier functionId, @NonNull Iterable parameterTypes) { + @Nonnull CqlIdentifier functionId, @Nonnull Iterable parameterTypes) { return Optional.ofNullable( getFunctions().get(new FunctionSignature(functionId, parameterTypes))); } @@ -120,18 +120,18 @@ default Optional getFunction( * Shortcut for {@link #getFunction(CqlIdentifier, Iterable) * getFunction(CqlIdentifier.fromCql(functionName), parameterTypes)}. */ - @NonNull + @Nonnull default Optional getFunction( - @NonNull String functionName, @NonNull Iterable parameterTypes) { + @Nonnull String functionName, @Nonnull Iterable parameterTypes) { return getFunction(CqlIdentifier.fromCql(functionName), parameterTypes); } /** * @param parameterTypes neither the individual types, nor the vararg array itself, can be null. */ - @NonNull + @Nonnull default Optional getFunction( - @NonNull CqlIdentifier functionId, @NonNull DataType... parameterTypes) { + @Nonnull CqlIdentifier functionId, @Nonnull DataType... parameterTypes) { return Optional.ofNullable( getFunctions().get(new FunctionSignature(functionId, parameterTypes))); } @@ -142,23 +142,23 @@ default Optional getFunction( * * @param parameterTypes neither the individual types, nor the vararg array itself, can be null. */ - @NonNull + @Nonnull default Optional getFunction( - @NonNull String functionName, @NonNull DataType... parameterTypes) { + @Nonnull String functionName, @Nonnull DataType... parameterTypes) { return getFunction(CqlIdentifier.fromCql(functionName), parameterTypes); } - @NonNull + @Nonnull Map getAggregates(); - @NonNull - default Optional getAggregate(@NonNull FunctionSignature aggregateSignature) { + @Nonnull + default Optional getAggregate(@Nonnull FunctionSignature aggregateSignature) { return Optional.ofNullable(getAggregates().get(aggregateSignature)); } - @NonNull + @Nonnull default Optional getAggregate( - @NonNull CqlIdentifier aggregateId, @NonNull Iterable parameterTypes) { + @Nonnull CqlIdentifier aggregateId, @Nonnull Iterable parameterTypes) { return Optional.ofNullable( getAggregates().get(new FunctionSignature(aggregateId, parameterTypes))); } @@ -167,18 +167,18 @@ default Optional getAggregate( * Shortcut for {@link #getAggregate(CqlIdentifier, Iterable) * getAggregate(CqlIdentifier.fromCql(aggregateName), parameterTypes)}. */ - @NonNull + @Nonnull default Optional getAggregate( - @NonNull String aggregateName, @NonNull Iterable parameterTypes) { + @Nonnull String aggregateName, @Nonnull Iterable parameterTypes) { return getAggregate(CqlIdentifier.fromCql(aggregateName), parameterTypes); } /** * @param parameterTypes neither the individual types, nor the vararg array itself, can be null. */ - @NonNull + @Nonnull default Optional getAggregate( - @NonNull CqlIdentifier aggregateId, @NonNull DataType... parameterTypes) { + @Nonnull CqlIdentifier aggregateId, @Nonnull DataType... parameterTypes) { return Optional.ofNullable( getAggregates().get(new FunctionSignature(aggregateId, parameterTypes))); } @@ -189,13 +189,13 @@ default Optional getAggregate( * * @param parameterTypes neither the individual types, nor the vararg array itself, can be null. */ - @NonNull + @Nonnull default Optional getAggregate( - @NonNull String aggregateName, @NonNull DataType... parameterTypes) { + @Nonnull String aggregateName, @Nonnull DataType... parameterTypes) { return getAggregate(CqlIdentifier.fromCql(aggregateName), parameterTypes); } - @NonNull + @Nonnull @Override default String describe(boolean pretty) { ScriptBuilder builder = new ScriptBuilder(pretty); @@ -230,7 +230,7 @@ default String describe(boolean pretty) { return builder.build(); } - @NonNull + @Nonnull @Override default String describeWithChildren(boolean pretty) { String createKeyspace = describe(pretty); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/RelationMetadata.java b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/RelationMetadata.java index 8b70ba04955..cdc4409a440 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/RelationMetadata.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/RelationMetadata.java @@ -19,19 +19,19 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.UUID; +import javax.annotation.Nonnull; /** A table or materialized view in the schema metadata. */ public interface RelationMetadata extends Describable { - @NonNull + @Nonnull CqlIdentifier getKeyspace(); - @NonNull + @Nonnull CqlIdentifier getName(); /** The unique id generated by the server for this element. */ @@ -46,7 +46,7 @@ public interface RelationMetadata extends Describable { * @see #getPartitionKey() * @see #getClusteringColumns() */ - @NonNull + @Nonnull default List getPrimaryKey() { return ImmutableList.builder() .addAll(getPartitionKey()) @@ -54,25 +54,25 @@ default List getPrimaryKey() { .build(); } - @NonNull + @Nonnull List getPartitionKey(); - @NonNull + @Nonnull Map getClusteringColumns(); - @NonNull + @Nonnull Map getColumns(); - @NonNull - default Optional getColumn(@NonNull CqlIdentifier columnId) { + @Nonnull + default Optional getColumn(@Nonnull CqlIdentifier columnId) { return Optional.ofNullable(getColumns().get(columnId)); } /** * Shortcut for {@link #getColumn(CqlIdentifier) getColumn(CqlIdentifier.fromCql(columnName))}. */ - @NonNull - default Optional getColumn(@NonNull String columnName) { + @Nonnull + default Optional getColumn(@Nonnull String columnName) { return getColumn(CqlIdentifier.fromCql(columnName)); } @@ -84,6 +84,6 @@ default Optional getColumn(@NonNull String columnName) { * version that this metadata was extracted from. For example, in Cassandra 2.2 and below, {@code * WITH caching} takes a string argument, whereas starting with Cassandra 3.0 it is a map. */ - @NonNull + @Nonnull Map getOptions(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/SchemaChangeListener.java b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/SchemaChangeListener.java index ac7317574ed..e0f885d4514 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/SchemaChangeListener.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/SchemaChangeListener.java @@ -20,7 +20,7 @@ import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.api.core.session.SessionBuilder; import com.datastax.oss.driver.api.core.type.UserDefinedType; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * Tracks schema changes. @@ -39,42 +39,42 @@ */ public interface SchemaChangeListener extends AutoCloseable { - void onKeyspaceCreated(@NonNull KeyspaceMetadata keyspace); + void onKeyspaceCreated(@Nonnull KeyspaceMetadata keyspace); - void onKeyspaceDropped(@NonNull KeyspaceMetadata keyspace); + void onKeyspaceDropped(@Nonnull KeyspaceMetadata keyspace); - void onKeyspaceUpdated(@NonNull KeyspaceMetadata current, @NonNull KeyspaceMetadata previous); + void onKeyspaceUpdated(@Nonnull KeyspaceMetadata current, @Nonnull KeyspaceMetadata previous); - void onTableCreated(@NonNull TableMetadata table); + void onTableCreated(@Nonnull TableMetadata table); - void onTableDropped(@NonNull TableMetadata table); + void onTableDropped(@Nonnull TableMetadata table); - void onTableUpdated(@NonNull TableMetadata current, @NonNull TableMetadata previous); + void onTableUpdated(@Nonnull TableMetadata current, @Nonnull TableMetadata previous); - void onUserDefinedTypeCreated(@NonNull UserDefinedType type); + void onUserDefinedTypeCreated(@Nonnull UserDefinedType type); - void onUserDefinedTypeDropped(@NonNull UserDefinedType type); + void onUserDefinedTypeDropped(@Nonnull UserDefinedType type); void onUserDefinedTypeUpdated( - @NonNull UserDefinedType current, @NonNull UserDefinedType previous); + @Nonnull UserDefinedType current, @Nonnull UserDefinedType previous); - void onFunctionCreated(@NonNull FunctionMetadata function); + void onFunctionCreated(@Nonnull FunctionMetadata function); - void onFunctionDropped(@NonNull FunctionMetadata function); + void onFunctionDropped(@Nonnull FunctionMetadata function); - void onFunctionUpdated(@NonNull FunctionMetadata current, @NonNull FunctionMetadata previous); + void onFunctionUpdated(@Nonnull FunctionMetadata current, @Nonnull FunctionMetadata previous); - void onAggregateCreated(@NonNull AggregateMetadata aggregate); + void onAggregateCreated(@Nonnull AggregateMetadata aggregate); - void onAggregateDropped(@NonNull AggregateMetadata aggregate); + void onAggregateDropped(@Nonnull AggregateMetadata aggregate); - void onAggregateUpdated(@NonNull AggregateMetadata current, @NonNull AggregateMetadata previous); + void onAggregateUpdated(@Nonnull AggregateMetadata current, @Nonnull AggregateMetadata previous); - void onViewCreated(@NonNull ViewMetadata view); + void onViewCreated(@Nonnull ViewMetadata view); - void onViewDropped(@NonNull ViewMetadata view); + void onViewDropped(@Nonnull ViewMetadata view); - void onViewUpdated(@NonNull ViewMetadata current, @NonNull ViewMetadata previous); + void onViewUpdated(@Nonnull ViewMetadata current, @Nonnull ViewMetadata previous); /** * Invoked when the session is ready to process user requests. @@ -90,5 +90,5 @@ void onUserDefinedTypeUpdated( * *

The default implementation is empty. */ - default void onSessionReady(@NonNull Session session) {} + default void onSessionReady(@Nonnull Session session) {} } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/SchemaChangeListenerBase.java b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/SchemaChangeListenerBase.java index 1cd449b39d8..b78c5768f01 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/SchemaChangeListenerBase.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/SchemaChangeListenerBase.java @@ -18,7 +18,7 @@ package com.datastax.oss.driver.api.core.metadata.schema; import com.datastax.oss.driver.api.core.type.UserDefinedType; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * Convenience class for listener implementations that that don't need to override all methods (all @@ -27,96 +27,96 @@ public class SchemaChangeListenerBase implements SchemaChangeListener { @Override - public void onKeyspaceCreated(@NonNull KeyspaceMetadata keyspace) { + public void onKeyspaceCreated(@Nonnull KeyspaceMetadata keyspace) { // nothing to do } @Override - public void onKeyspaceDropped(@NonNull KeyspaceMetadata keyspace) { + public void onKeyspaceDropped(@Nonnull KeyspaceMetadata keyspace) { // nothing to do } @Override public void onKeyspaceUpdated( - @NonNull KeyspaceMetadata current, @NonNull KeyspaceMetadata previous) { + @Nonnull KeyspaceMetadata current, @Nonnull KeyspaceMetadata previous) { // nothing to do } @Override - public void onTableCreated(@NonNull TableMetadata table) { + public void onTableCreated(@Nonnull TableMetadata table) { // nothing to do } @Override - public void onTableDropped(@NonNull TableMetadata table) { + public void onTableDropped(@Nonnull TableMetadata table) { // nothing to do } @Override - public void onTableUpdated(@NonNull TableMetadata current, @NonNull TableMetadata previous) { + public void onTableUpdated(@Nonnull TableMetadata current, @Nonnull TableMetadata previous) { // nothing to do } @Override - public void onUserDefinedTypeCreated(@NonNull UserDefinedType type) { + public void onUserDefinedTypeCreated(@Nonnull UserDefinedType type) { // nothing to do } @Override - public void onUserDefinedTypeDropped(@NonNull UserDefinedType type) { + public void onUserDefinedTypeDropped(@Nonnull UserDefinedType type) { // nothing to do } @Override public void onUserDefinedTypeUpdated( - @NonNull UserDefinedType current, @NonNull UserDefinedType previous) { + @Nonnull UserDefinedType current, @Nonnull UserDefinedType previous) { // nothing to do } @Override - public void onFunctionCreated(@NonNull FunctionMetadata function) { + public void onFunctionCreated(@Nonnull FunctionMetadata function) { // nothing to do } @Override - public void onFunctionDropped(@NonNull FunctionMetadata function) { + public void onFunctionDropped(@Nonnull FunctionMetadata function) { // nothing to do } @Override public void onFunctionUpdated( - @NonNull FunctionMetadata current, @NonNull FunctionMetadata previous) { + @Nonnull FunctionMetadata current, @Nonnull FunctionMetadata previous) { // nothing to do } @Override - public void onAggregateCreated(@NonNull AggregateMetadata aggregate) { + public void onAggregateCreated(@Nonnull AggregateMetadata aggregate) { // nothing to do } @Override - public void onAggregateDropped(@NonNull AggregateMetadata aggregate) { + public void onAggregateDropped(@Nonnull AggregateMetadata aggregate) { // nothing to do } @Override public void onAggregateUpdated( - @NonNull AggregateMetadata current, @NonNull AggregateMetadata previous) { + @Nonnull AggregateMetadata current, @Nonnull AggregateMetadata previous) { // nothing to do } @Override - public void onViewCreated(@NonNull ViewMetadata view) { + public void onViewCreated(@Nonnull ViewMetadata view) { // nothing to do } @Override - public void onViewDropped(@NonNull ViewMetadata view) { + public void onViewDropped(@Nonnull ViewMetadata view) { // nothing to do } @Override - public void onViewUpdated(@NonNull ViewMetadata current, @NonNull ViewMetadata previous) { + public void onViewUpdated(@Nonnull ViewMetadata current, @Nonnull ViewMetadata previous) { // nothing to do } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/TableMetadata.java b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/TableMetadata.java index bcda226b45d..8b5729eb94b 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/TableMetadata.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/TableMetadata.java @@ -20,9 +20,9 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.internal.core.metadata.schema.ScriptBuilder; import com.datastax.oss.driver.internal.core.metadata.schema.parsing.RelationParser; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; import java.util.Optional; +import javax.annotation.Nonnull; /** A table in the schema metadata. */ public interface TableMetadata extends RelationMetadata { @@ -32,21 +32,21 @@ public interface TableMetadata extends RelationMetadata { /** Whether this table is virtual */ boolean isVirtual(); - @NonNull + @Nonnull Map getIndexes(); - @NonNull - default Optional getIndex(@NonNull CqlIdentifier indexId) { + @Nonnull + default Optional getIndex(@Nonnull CqlIdentifier indexId) { return Optional.ofNullable(getIndexes().get(indexId)); } /** Shortcut for {@link #getIndex(CqlIdentifier) getIndex(CqlIdentifier.fromCql(indexName))}. */ - @NonNull - default Optional getIndex(@NonNull String indexName) { + @Nonnull + default Optional getIndex(@Nonnull String indexName) { return getIndex(CqlIdentifier.fromCql(indexName)); } - @NonNull + @Nonnull @Override default String describe(boolean pretty) { ScriptBuilder builder = new ScriptBuilder(pretty); @@ -130,7 +130,7 @@ default String describe(boolean pretty) { *

This describes the table and all of its indices. Contrary to previous driver versions, views * are not included. */ - @NonNull + @Nonnull @Override default String describeWithChildren(boolean pretty) { String createTable = describe(pretty); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/ViewMetadata.java b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/ViewMetadata.java index e6b06cffb97..7bd3dd5216c 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/ViewMetadata.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/schema/ViewMetadata.java @@ -20,14 +20,14 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.internal.core.metadata.schema.ScriptBuilder; import com.datastax.oss.driver.internal.core.metadata.schema.parsing.RelationParser; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Optional; +import javax.annotation.Nonnull; /** A materialized view in the schema metadata. */ public interface ViewMetadata extends RelationMetadata { /** The table that this view is based on. */ - @NonNull + @Nonnull CqlIdentifier getBaseTable(); /** @@ -36,10 +36,10 @@ public interface ViewMetadata extends RelationMetadata { */ boolean includesAllColumns(); - @NonNull + @Nonnull Optional getWhereClause(); - @NonNull + @Nonnull @Override default String describe(boolean pretty) { ScriptBuilder builder = @@ -101,7 +101,7 @@ default String describe(boolean pretty) { return builder.append(";").build(); } - @NonNull + @Nonnull @Override default String describeWithChildren(boolean pretty) { return describe(pretty); // A view has no children diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/token/TokenRange.java b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/token/TokenRange.java index e384300c571..db234b04ec6 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metadata/token/TokenRange.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metadata/token/TokenRange.java @@ -17,8 +17,8 @@ */ package com.datastax.oss.driver.api.core.metadata.token; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; +import javax.annotation.Nonnull; /** * A range of tokens on the Cassandra ring. @@ -33,11 +33,11 @@ public interface TokenRange extends Comparable { /** The start of the range (exclusive). */ - @NonNull + @Nonnull Token getStart(); /** The end of the range (inclusive). */ - @NonNull + @Nonnull Token getEnd(); /** @@ -49,7 +49,7 @@ public interface TokenRange extends Comparable { * * @throws IllegalArgumentException if the range is empty or if {@code numberOfSplits < 1}. */ - @NonNull + @Nonnull List splitEvenly(int numberOfSplits); /** @@ -90,7 +90,7 @@ public interface TokenRange extends Comparable { * } * } */ - @NonNull + @Nonnull List unwrap(); /** @@ -103,7 +103,7 @@ public interface TokenRange extends Comparable { *

  • {@code ]3,5]} does not intersect {@code ]1,2]}, {@code ]2,3]}, {@code ]5,7]}... * */ - boolean intersects(@NonNull TokenRange that); + boolean intersects(@Nonnull TokenRange that); /** * Computes the intersection of this range with another one, producing one or more ranges. @@ -118,14 +118,14 @@ public interface TokenRange extends Comparable { * @return the range(s) resulting from the intersection. * @throws IllegalArgumentException if the ranges do not intersect. */ - @NonNull - List intersectWith(@NonNull TokenRange that); + @Nonnull + List intersectWith(@Nonnull TokenRange that); /** * Checks whether this range contains a given token, i.e. {@code range.start < token <= * range.end}. */ - boolean contains(@NonNull Token token); + boolean contains(@Nonnull Token token); /** * Merges this range with another one. @@ -144,6 +144,6 @@ public interface TokenRange extends Comparable { * * @throws IllegalArgumentException if the ranges neither intersect nor are adjacent. */ - @NonNull - TokenRange mergeWith(@NonNull TokenRange that); + @Nonnull + TokenRange mergeWith(@Nonnull TokenRange that); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metrics/DefaultNodeMetric.java b/core/src/main/java/com/datastax/oss/driver/api/core/metrics/DefaultNodeMetric.java index 0e9934c7034..6598b3322a9 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metrics/DefaultNodeMetric.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metrics/DefaultNodeMetric.java @@ -18,8 +18,8 @@ package com.datastax.oss.driver.api.core.metrics; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.Nonnull; /** See {@code reference.conf} for a description of each metric. */ public enum DefaultNodeMetric implements NodeMetric { @@ -62,13 +62,13 @@ public enum DefaultNodeMetric implements NodeMetric { } @Override - @NonNull + @Nonnull public String getPath() { return path; } - @NonNull - public static DefaultNodeMetric fromPath(@NonNull String path) { + @Nonnull + public static DefaultNodeMetric fromPath(@Nonnull String path) { DefaultNodeMetric metric = BY_PATH.get(path); if (metric == null) { throw new IllegalArgumentException("Unknown node metric path " + path); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metrics/DefaultSessionMetric.java b/core/src/main/java/com/datastax/oss/driver/api/core/metrics/DefaultSessionMetric.java index 63027a23fe7..51f994825c4 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metrics/DefaultSessionMetric.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metrics/DefaultSessionMetric.java @@ -18,8 +18,8 @@ package com.datastax.oss.driver.api.core.metrics; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.Nonnull; /** See {@code reference.conf} for a description of each metric. */ public enum DefaultSessionMetric implements SessionMetric { @@ -42,14 +42,14 @@ public enum DefaultSessionMetric implements SessionMetric { this.path = path; } - @NonNull + @Nonnull @Override public String getPath() { return path; } - @NonNull - public static DefaultSessionMetric fromPath(@NonNull String path) { + @Nonnull + public static DefaultSessionMetric fromPath(@Nonnull String path) { DefaultSessionMetric metric = BY_PATH.get(path); if (metric == null) { throw new IllegalArgumentException("Unknown session metric path " + path); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metrics/Metrics.java b/core/src/main/java/com/datastax/oss/driver/api/core/metrics/Metrics.java index 58d531b3464..957c02f64cc 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metrics/Metrics.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metrics/Metrics.java @@ -20,9 +20,9 @@ import com.codahale.metrics.Metric; import com.codahale.metrics.MetricRegistry; import com.datastax.oss.driver.api.core.metadata.Node; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Optional; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A wrapper around a {@link MetricRegistry} to expose the driver's metrics. @@ -42,7 +42,7 @@ public interface Metrics { * (Dropwizard Metrics manual) * @leaks-private-api */ - @NonNull + @Nonnull MetricRegistry getRegistry(); /** @@ -68,16 +68,16 @@ public interface Metrics { * @return the metric, or empty if it is disabled. */ @SuppressWarnings("TypeParameterUnusedInFormals") - @NonNull + @Nonnull Optional getSessionMetric( - @NonNull SessionMetric metric, @Nullable String profileName); + @Nonnull SessionMetric metric, @Nullable String profileName); /** * Shortcut for {@link #getSessionMetric(SessionMetric, String) getSessionMetric(metric, null)}. */ @SuppressWarnings("TypeParameterUnusedInFormals") - @NonNull - default Optional getSessionMetric(@NonNull SessionMetric metric) { + @Nonnull + default Optional getSessionMetric(@Nonnull SessionMetric metric) { return getSessionMetric(metric, null); } @@ -104,18 +104,18 @@ default Optional getSessionMetric(@NonNull SessionMetric m * @return the metric, or empty if it is disabled. */ @SuppressWarnings("TypeParameterUnusedInFormals") - @NonNull + @Nonnull Optional getNodeMetric( - @NonNull Node node, @NonNull NodeMetric metric, @Nullable String profileName); + @Nonnull Node node, @Nonnull NodeMetric metric, @Nullable String profileName); /** * Shortcut for {@link #getNodeMetric(Node, NodeMetric, String) getNodeMetric(node, metric, * null)}. */ @SuppressWarnings("TypeParameterUnusedInFormals") - @NonNull + @Nonnull default Optional getNodeMetric( - @NonNull Node node, @NonNull NodeMetric metric) { + @Nonnull Node node, @Nonnull NodeMetric metric) { return getNodeMetric(node, metric, null); } } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metrics/NodeMetric.java b/core/src/main/java/com/datastax/oss/driver/api/core/metrics/NodeMetric.java index b31c0ed8bcf..7ca0fce76e1 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metrics/NodeMetric.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metrics/NodeMetric.java @@ -18,7 +18,7 @@ package com.datastax.oss.driver.api.core.metrics; import com.datastax.oss.driver.api.core.session.Session; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * A node-level metric exposed through {@link Session#getMetrics()}. @@ -31,6 +31,6 @@ */ public interface NodeMetric { - @NonNull + @Nonnull String getPath(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/metrics/SessionMetric.java b/core/src/main/java/com/datastax/oss/driver/api/core/metrics/SessionMetric.java index 2a1ee599754..8879663c897 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/metrics/SessionMetric.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/metrics/SessionMetric.java @@ -18,7 +18,7 @@ package com.datastax.oss.driver.api.core.metrics; import com.datastax.oss.driver.api.core.session.Session; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * A session-level metric exposed through {@link Session#getMetrics()}. @@ -31,6 +31,6 @@ */ public interface SessionMetric { - @NonNull + @Nonnull String getPath(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/paging/OffsetPager.java b/core/src/main/java/com/datastax/oss/driver/api/core/paging/OffsetPager.java index 3cb838f3171..bbb2a4553b1 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/paging/OffsetPager.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/paging/OffsetPager.java @@ -23,13 +23,13 @@ import com.datastax.oss.driver.api.core.cql.ResultSet; import com.datastax.oss.driver.api.core.cql.Statement; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; /** @@ -96,7 +96,7 @@ public class OffsetPager { public interface Page { /** The elements in the page. */ - @NonNull + @Nonnull List getElements(); /** @@ -138,9 +138,9 @@ public OffsetPager(int pageSize) { * iterable. * @throws IllegalArgumentException if the conditions on the arguments are not respected. */ - @NonNull + @Nonnull public Page getPage( - @NonNull PagingIterable iterable, final int targetPageNumber) { + @Nonnull PagingIterable iterable, final int targetPageNumber) { throwIfIllegalArguments(iterable, targetPageNumber); @@ -184,10 +184,10 @@ public Page getPage( * page was past the end of the iterable. * @throws IllegalArgumentException if the conditions on the arguments are not respected. */ - @NonNull + @Nonnull public > CompletionStage> getPage( - @NonNull IterableT iterable, final int targetPageNumber) { + @Nonnull IterableT iterable, final int targetPageNumber) { // Throw IllegalArgumentException directly instead of failing the stage, since it signals // blatant programming errors @@ -199,7 +199,7 @@ CompletionStage> getPage( return pageFuture; } - private void throwIfIllegalArguments(@NonNull Object iterable, int targetPageNumber) { + private void throwIfIllegalArguments(@Nonnull Object iterable, int targetPageNumber) { Objects.requireNonNull(iterable); if (targetPageNumber < 1) { throw new IllegalArgumentException( @@ -215,12 +215,12 @@ private void throwIfIllegalArguments(@NonNull Object iterable, int targetPageNum * manually. */ private , ElementT> void getPage( - @NonNull IterableT iterable, + @Nonnull IterableT iterable, final int targetPageNumber, int currentPageNumber, int currentPageSize, - @NonNull List currentPageElements, - @NonNull CompletableFuture> pageFuture) { + @Nonnull List currentPageElements, + @Nonnull CompletableFuture> pageFuture) { // Note: iterable.currentPage()/fetchNextPage() refer to protocol-level pages, do not confuse // with logical pages handled by this class @@ -296,13 +296,13 @@ private static class DefaultPage implements Page { private final int pageNumber; private final boolean isLast; - DefaultPage(@NonNull List elements, int pageNumber, boolean isLast) { + DefaultPage(@Nonnull List elements, int pageNumber, boolean isLast) { this.elements = ImmutableList.copyOf(elements); this.pageNumber = pageNumber; this.isLast = isLast; } - @NonNull + @Nonnull @Override public List getElements() { return elements; diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/retry/RetryPolicy.java b/core/src/main/java/com/datastax/oss/driver/api/core/retry/RetryPolicy.java index e8546816e23..2766c43034b 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/retry/RetryPolicy.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/retry/RetryPolicy.java @@ -34,7 +34,7 @@ import com.datastax.oss.driver.api.core.servererrors.WriteFailureException; import com.datastax.oss.driver.api.core.servererrors.WriteType; import com.datastax.oss.driver.api.core.session.Request; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * Defines the behavior to adopt when a request fails. @@ -71,8 +71,8 @@ public interface RetryPolicy extends AutoCloseable { */ @Deprecated RetryDecision onReadTimeout( - @NonNull Request request, - @NonNull ConsistencyLevel cl, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, int blockFor, int received, boolean dataPresent, @@ -95,8 +95,8 @@ RetryDecision onReadTimeout( * (not counting the current invocation). */ default RetryVerdict onReadTimeoutVerdict( - @NonNull Request request, - @NonNull ConsistencyLevel cl, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, int blockFor, int received, boolean dataPresent, @@ -130,9 +130,9 @@ default RetryVerdict onReadTimeoutVerdict( */ @Deprecated RetryDecision onWriteTimeout( - @NonNull Request request, - @NonNull ConsistencyLevel cl, - @NonNull WriteType writeType, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, + @Nonnull WriteType writeType, int blockFor, int received, int retryCount); @@ -158,9 +158,9 @@ RetryDecision onWriteTimeout( * (not counting the current invocation). */ default RetryVerdict onWriteTimeoutVerdict( - @NonNull Request request, - @NonNull ConsistencyLevel cl, - @NonNull WriteType writeType, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, + @Nonnull WriteType writeType, int blockFor, int received, int retryCount) { @@ -186,8 +186,8 @@ default RetryVerdict onWriteTimeoutVerdict( */ @Deprecated RetryDecision onUnavailable( - @NonNull Request request, - @NonNull ConsistencyLevel cl, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, int required, int alive, int retryCount); @@ -207,8 +207,8 @@ RetryDecision onUnavailable( * (not counting the current invocation). */ default RetryVerdict onUnavailableVerdict( - @NonNull Request request, - @NonNull ConsistencyLevel cl, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, int required, int alive, int retryCount) { @@ -238,7 +238,7 @@ default RetryVerdict onUnavailableVerdict( */ @Deprecated RetryDecision onRequestAborted( - @NonNull Request request, @NonNull Throwable error, int retryCount); + @Nonnull Request request, @Nonnull Throwable error, int retryCount); /** * Whether to retry when a request was aborted before we could get a response from the server. @@ -259,7 +259,7 @@ RetryDecision onRequestAborted( * (not counting the current invocation). */ default RetryVerdict onRequestAbortedVerdict( - @NonNull Request request, @NonNull Throwable error, int retryCount) { + @Nonnull Request request, @Nonnull Throwable error, int retryCount) { RetryDecision decision = onRequestAborted(request, error, retryCount); return () -> decision; } @@ -294,7 +294,7 @@ default RetryVerdict onRequestAbortedVerdict( */ @Deprecated RetryDecision onErrorResponse( - @NonNull Request request, @NonNull CoordinatorException error, int retryCount); + @Nonnull Request request, @Nonnull CoordinatorException error, int retryCount); /** * Whether to retry when the server replied with a recoverable error (other than {@code @@ -323,7 +323,7 @@ RetryDecision onErrorResponse( * (not counting the current invocation). */ default RetryVerdict onErrorResponseVerdict( - @NonNull Request request, @NonNull CoordinatorException error, int retryCount) { + @Nonnull Request request, @Nonnull CoordinatorException error, int retryCount) { RetryDecision decision = onErrorResponse(request, error, retryCount); return () -> decision; } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/retry/RetryVerdict.java b/core/src/main/java/com/datastax/oss/driver/api/core/retry/RetryVerdict.java index 9abb54156db..fff75db1a5f 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/retry/RetryVerdict.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/retry/RetryVerdict.java @@ -19,7 +19,7 @@ import com.datastax.oss.driver.api.core.session.Request; import com.datastax.oss.driver.internal.core.retry.DefaultRetryVerdict; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * The verdict returned by a {@link RetryPolicy} determining what to do when a request failed. A @@ -42,7 +42,7 @@ public interface RetryVerdict { RetryVerdict RETHROW = new DefaultRetryVerdict(RetryDecision.RETHROW); /** @return The retry decision to apply. */ - @NonNull + @Nonnull RetryDecision getRetryDecision(); /** @@ -56,8 +56,8 @@ public interface RetryVerdict { * @param previous The request that was just executed (and failed). * @return The request to retry. */ - @NonNull - default RequestT getRetryRequest(@NonNull RequestT previous) { + @Nonnull + default RequestT getRetryRequest(@Nonnull RequestT previous) { return previous; } } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/AlreadyExistsException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/AlreadyExistsException.java index 2bf541c91de..ebc81f90735 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/AlreadyExistsException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/AlreadyExistsException.java @@ -21,8 +21,8 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.retry.RetryPolicy; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Thrown when a query attempts to create a keyspace or table that already exists. @@ -36,15 +36,15 @@ public class AlreadyExistsException extends QueryValidationException { private final String table; public AlreadyExistsException( - @NonNull Node coordinator, @NonNull String keyspace, @NonNull String table) { + @Nonnull Node coordinator, @Nonnull String keyspace, @Nonnull String table) { this(coordinator, makeMessage(keyspace, table), keyspace, table, null, false); } private AlreadyExistsException( - @NonNull Node coordinator, - @NonNull String message, - @NonNull String keyspace, - @NonNull String table, + @Nonnull Node coordinator, + @Nonnull String message, + @Nonnull String keyspace, + @Nonnull String table, @Nullable ExecutionInfo executionInfo, boolean writableStackTrace) { super(coordinator, message, executionInfo, writableStackTrace); @@ -60,7 +60,7 @@ private static String makeMessage(String keyspace, String table) { } } - @NonNull + @Nonnull @Override public DriverException copy() { return new AlreadyExistsException( diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/BootstrappingException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/BootstrappingException.java index a408e0384f5..fd184fae906 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/BootstrappingException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/BootstrappingException.java @@ -22,8 +22,8 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.retry.RetryPolicy; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Thrown when the coordinator was bootstrapping when it received a query. @@ -34,19 +34,19 @@ */ public class BootstrappingException extends QueryExecutionException { - public BootstrappingException(@NonNull Node coordinator) { + public BootstrappingException(@Nonnull Node coordinator) { this(coordinator, String.format("%s is bootstrapping", coordinator), null, false); } private BootstrappingException( - @NonNull Node coordinator, - @NonNull String message, + @Nonnull Node coordinator, + @Nonnull String message, @Nullable ExecutionInfo executionInfo, boolean writableStackTrace) { super(coordinator, message, executionInfo, writableStackTrace); } - @NonNull + @Nonnull @Override public DriverException copy() { return new BootstrappingException(getCoordinator(), getMessage(), getExecutionInfo(), true); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/CASWriteUnknownException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/CASWriteUnknownException.java index 477bf7813c9..ae852a34102 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/CASWriteUnknownException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/CASWriteUnknownException.java @@ -24,7 +24,7 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.retry.RetryPolicy; import com.datastax.oss.driver.api.core.session.Request; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * The result of a CAS operation is in an unknown state. @@ -37,8 +37,8 @@ public class CASWriteUnknownException extends QueryConsistencyException { public CASWriteUnknownException( - @NonNull Node coordinator, - @NonNull ConsistencyLevel consistencyLevel, + @Nonnull Node coordinator, + @Nonnull ConsistencyLevel consistencyLevel, int received, int blockFor) { this( @@ -54,9 +54,9 @@ public CASWriteUnknownException( } private CASWriteUnknownException( - @NonNull Node coordinator, - @NonNull String message, - @NonNull ConsistencyLevel consistencyLevel, + @Nonnull Node coordinator, + @Nonnull String message, + @Nonnull ConsistencyLevel consistencyLevel, int received, int blockFor, ExecutionInfo executionInfo, @@ -71,7 +71,7 @@ private CASWriteUnknownException( writableStackTrace); } - @NonNull + @Nonnull @Override public DriverException copy() { return new CASWriteUnknownException( diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/CDCWriteFailureException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/CDCWriteFailureException.java index 3ce782653ab..08aacd64e8f 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/CDCWriteFailureException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/CDCWriteFailureException.java @@ -23,8 +23,8 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.retry.RetryPolicy; import com.datastax.oss.driver.api.core.session.Request; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * An attempt was made to write to a commitlog segment which doesn't support CDC mutations. @@ -36,23 +36,23 @@ */ public class CDCWriteFailureException extends QueryExecutionException { - public CDCWriteFailureException(@NonNull Node coordinator) { + public CDCWriteFailureException(@Nonnull Node coordinator) { super(coordinator, "Commitlog does not support CDC mutations", null, false); } - public CDCWriteFailureException(@NonNull Node coordinator, @NonNull String message) { + public CDCWriteFailureException(@Nonnull Node coordinator, @Nonnull String message) { super(coordinator, "Commitlog does not support CDC mutations", null, false); } private CDCWriteFailureException( - @NonNull Node coordinator, - @NonNull String message, + @Nonnull Node coordinator, + @Nonnull String message, @Nullable ExecutionInfo executionInfo, boolean writableStackTrace) { super(coordinator, message, executionInfo, writableStackTrace); } - @NonNull + @Nonnull @Override public DriverException copy() { return new CDCWriteFailureException(getCoordinator(), getMessage(), getExecutionInfo(), true); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/CoordinatorException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/CoordinatorException.java index 8f6052850df..0c16dc8b711 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/CoordinatorException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/CoordinatorException.java @@ -20,8 +20,8 @@ import com.datastax.oss.driver.api.core.DriverException; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.metadata.Node; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** A server-side error thrown by the coordinator node in response to a driver request. */ public abstract class CoordinatorException extends DriverException { @@ -32,15 +32,15 @@ public abstract class CoordinatorException extends DriverException { private final Node coordinator; protected CoordinatorException( - @NonNull Node coordinator, - @NonNull String message, + @Nonnull Node coordinator, + @Nonnull String message, @Nullable ExecutionInfo executionInfo, boolean writableStackTrace) { super(message, executionInfo, null, writableStackTrace); this.coordinator = coordinator; } - @NonNull + @Nonnull public Node getCoordinator() { return coordinator; } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/FunctionFailureException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/FunctionFailureException.java index 31993762319..0674dd1a2b9 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/FunctionFailureException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/FunctionFailureException.java @@ -21,8 +21,8 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.retry.RetryPolicy; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * An error during the execution of a CQL function. @@ -32,19 +32,19 @@ */ public class FunctionFailureException extends QueryExecutionException { - public FunctionFailureException(@NonNull Node coordinator, @NonNull String message) { + public FunctionFailureException(@Nonnull Node coordinator, @Nonnull String message) { this(coordinator, message, null, false); } private FunctionFailureException( - @NonNull Node coordinator, - @NonNull String message, + @Nonnull Node coordinator, + @Nonnull String message, @Nullable ExecutionInfo executionInfo, boolean writableStackTrace) { super(coordinator, message, executionInfo, writableStackTrace); } - @NonNull + @Nonnull @Override public DriverException copy() { return new FunctionFailureException(getCoordinator(), getMessage(), getExecutionInfo(), true); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/InvalidConfigurationInQueryException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/InvalidConfigurationInQueryException.java index 405efa47299..5c77e73b7be 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/InvalidConfigurationInQueryException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/InvalidConfigurationInQueryException.java @@ -21,8 +21,8 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.retry.RetryPolicy; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Indicates that a query is invalid because of some configuration problem. @@ -35,19 +35,19 @@ */ public class InvalidConfigurationInQueryException extends QueryValidationException { - public InvalidConfigurationInQueryException(@NonNull Node coordinator, @NonNull String message) { + public InvalidConfigurationInQueryException(@Nonnull Node coordinator, @Nonnull String message) { this(coordinator, message, null, false); } private InvalidConfigurationInQueryException( - @NonNull Node coordinator, - @NonNull String message, + @Nonnull Node coordinator, + @Nonnull String message, @Nullable ExecutionInfo executionInfo, boolean writableStackTrace) { super(coordinator, message, executionInfo, writableStackTrace); } - @NonNull + @Nonnull @Override public DriverException copy() { return new InvalidConfigurationInQueryException( diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/InvalidQueryException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/InvalidQueryException.java index 468de8a1bd0..9cfbe6ffa44 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/InvalidQueryException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/InvalidQueryException.java @@ -21,8 +21,8 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.retry.RetryPolicy; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Indicates a syntactically correct, but invalid query. @@ -32,19 +32,19 @@ */ public class InvalidQueryException extends QueryValidationException { - public InvalidQueryException(@NonNull Node coordinator, @NonNull String message) { + public InvalidQueryException(@Nonnull Node coordinator, @Nonnull String message) { this(coordinator, message, null, false); } private InvalidQueryException( - @NonNull Node coordinator, - @NonNull String message, + @Nonnull Node coordinator, + @Nonnull String message, @Nullable ExecutionInfo executionInfo, boolean writableStackTrace) { super(coordinator, message, executionInfo, writableStackTrace); } - @NonNull + @Nonnull @Override public DriverException copy() { return new InvalidQueryException(getCoordinator(), getMessage(), getExecutionInfo(), true); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/OverloadedException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/OverloadedException.java index f56a7f30a7e..44c63749e16 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/OverloadedException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/OverloadedException.java @@ -23,8 +23,8 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.retry.RetryPolicy; import com.datastax.oss.driver.api.core.session.Request; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Thrown when the coordinator reported itself as being overloaded. @@ -36,23 +36,23 @@ */ public class OverloadedException extends QueryExecutionException { - public OverloadedException(@NonNull Node coordinator) { + public OverloadedException(@Nonnull Node coordinator) { super(coordinator, String.format("%s is overloaded", coordinator), null, false); } - public OverloadedException(@NonNull Node coordinator, @NonNull String message) { + public OverloadedException(@Nonnull Node coordinator, @Nonnull String message) { super(coordinator, String.format("%s is overloaded: %s", coordinator, message), null, false); } private OverloadedException( - @NonNull Node coordinator, - @NonNull String message, + @Nonnull Node coordinator, + @Nonnull String message, @Nullable ExecutionInfo executionInfo, boolean writableStackTrace) { super(coordinator, message, executionInfo, writableStackTrace); } - @NonNull + @Nonnull @Override public DriverException copy() { return new OverloadedException(getCoordinator(), getMessage(), getExecutionInfo(), true); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ProtocolError.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ProtocolError.java index 898a857954f..9f16f5be95b 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ProtocolError.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ProtocolError.java @@ -21,8 +21,8 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.retry.RetryPolicy; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Indicates that the contacted node reported a protocol error. @@ -36,19 +36,19 @@ */ public class ProtocolError extends CoordinatorException { - public ProtocolError(@NonNull Node coordinator, @NonNull String message) { + public ProtocolError(@Nonnull Node coordinator, @Nonnull String message) { this(coordinator, message, null, false); } private ProtocolError( - @NonNull Node coordinator, - @NonNull String message, + @Nonnull Node coordinator, + @Nonnull String message, @Nullable ExecutionInfo executionInfo, boolean writableStackTrace) { super(coordinator, message, executionInfo, writableStackTrace); } - @NonNull + @Nonnull @Override public DriverException copy() { return new ProtocolError(getCoordinator(), getMessage(), getExecutionInfo(), true); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/QueryConsistencyException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/QueryConsistencyException.java index 4a6f97f3342..60ba9c520d8 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/QueryConsistencyException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/QueryConsistencyException.java @@ -20,7 +20,7 @@ import com.datastax.oss.driver.api.core.ConsistencyLevel; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.metadata.Node; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * A failure to reach the required consistency level during the execution of a query. @@ -41,9 +41,9 @@ public abstract class QueryConsistencyException extends QueryExecutionException private final int blockFor; protected QueryConsistencyException( - @NonNull Node coordinator, - @NonNull String message, - @NonNull ConsistencyLevel consistencyLevel, + @Nonnull Node coordinator, + @Nonnull String message, + @Nonnull ConsistencyLevel consistencyLevel, int received, int blockFor, ExecutionInfo executionInfo, @@ -55,7 +55,7 @@ protected QueryConsistencyException( } /** The consistency level of the operation that failed. */ - @NonNull + @Nonnull public ConsistencyLevel getConsistencyLevel() { return consistencyLevel; } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/QueryExecutionException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/QueryExecutionException.java index 541a32d9fba..c23c7911f57 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/QueryExecutionException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/QueryExecutionException.java @@ -19,15 +19,15 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.metadata.Node; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** A server-side error thrown when a valid query cannot be executed. */ public abstract class QueryExecutionException extends CoordinatorException { protected QueryExecutionException( - @NonNull Node coordinator, - @NonNull String message, + @Nonnull Node coordinator, + @Nonnull String message, @Nullable ExecutionInfo executionInfo, boolean writableStackTrace) { super(coordinator, message, executionInfo, writableStackTrace); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/QueryValidationException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/QueryValidationException.java index 9c8dfe537b6..b5e58ea9907 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/QueryValidationException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/QueryValidationException.java @@ -19,8 +19,8 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.metadata.Node; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A server-side error thrown when a query cannot be executed because it is syntactically incorrect, @@ -29,8 +29,8 @@ public abstract class QueryValidationException extends CoordinatorException { protected QueryValidationException( - @NonNull Node coordinator, - @NonNull String message, + @Nonnull Node coordinator, + @Nonnull String message, @Nullable ExecutionInfo executionInfo, boolean writableStackTrace) { super(coordinator, message, executionInfo, writableStackTrace); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ReadFailureException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ReadFailureException.java index 94c4404f8d9..74fdeadebf2 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ReadFailureException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ReadFailureException.java @@ -24,10 +24,10 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.retry.RetryPolicy; import com.datastax.oss.driver.api.core.session.Request; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.net.InetAddress; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A non-timeout error during a read query. @@ -47,13 +47,13 @@ public class ReadFailureException extends QueryConsistencyException { private final Map reasonMap; public ReadFailureException( - @NonNull Node coordinator, - @NonNull ConsistencyLevel consistencyLevel, + @Nonnull Node coordinator, + @Nonnull ConsistencyLevel consistencyLevel, int received, int blockFor, int numFailures, boolean dataPresent, - @NonNull Map reasonMap) { + @Nonnull Map reasonMap) { this( coordinator, String.format( @@ -71,14 +71,14 @@ public ReadFailureException( } private ReadFailureException( - @NonNull Node coordinator, - @NonNull String message, - @NonNull ConsistencyLevel consistencyLevel, + @Nonnull Node coordinator, + @Nonnull String message, + @Nonnull ConsistencyLevel consistencyLevel, int received, int blockFor, int numFailures, boolean dataPresent, - @NonNull Map reasonMap, + @Nonnull Map reasonMap, @Nullable ExecutionInfo executionInfo, boolean writableStackTrace) { super( @@ -130,12 +130,12 @@ public boolean wasDataPresent() { *

    This feature is available for protocol v5 or above only. With lower protocol versions, the * map will always be empty. */ - @NonNull + @Nonnull public Map getReasonMap() { return reasonMap; } - @NonNull + @Nonnull @Override public DriverException copy() { return new ReadFailureException( diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ReadTimeoutException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ReadTimeoutException.java index 4dddfedf49a..323bfb4a8ed 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ReadTimeoutException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ReadTimeoutException.java @@ -24,7 +24,7 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.retry.RetryPolicy; import com.datastax.oss.driver.api.core.session.Request; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * A server-side timeout during a read query. @@ -39,8 +39,8 @@ public class ReadTimeoutException extends QueryConsistencyException { private final boolean dataPresent; public ReadTimeoutException( - @NonNull Node coordinator, - @NonNull ConsistencyLevel consistencyLevel, + @Nonnull Node coordinator, + @Nonnull ConsistencyLevel consistencyLevel, int received, int blockFor, boolean dataPresent) { @@ -59,9 +59,9 @@ consistencyLevel, formatDetails(received, blockFor, dataPresent)), } private ReadTimeoutException( - @NonNull Node coordinator, - @NonNull String message, - @NonNull ConsistencyLevel consistencyLevel, + @Nonnull Node coordinator, + @Nonnull String message, + @Nonnull ConsistencyLevel consistencyLevel, int received, int blockFor, boolean dataPresent, @@ -101,7 +101,7 @@ public boolean wasDataPresent() { return dataPresent; } - @NonNull + @Nonnull @Override public DriverException copy() { return new ReadTimeoutException( diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ServerError.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ServerError.java index de300803421..08de16ab2b2 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ServerError.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ServerError.java @@ -23,8 +23,8 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.retry.RetryPolicy; import com.datastax.oss.driver.api.core.session.Request; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Indicates that the contacted node reported an internal error. @@ -38,19 +38,19 @@ */ public class ServerError extends CoordinatorException { - public ServerError(@NonNull Node coordinator, @NonNull String message) { + public ServerError(@Nonnull Node coordinator, @Nonnull String message) { this(coordinator, message, null, false); } private ServerError( - @NonNull Node coordinator, - @NonNull String message, + @Nonnull Node coordinator, + @Nonnull String message, @Nullable ExecutionInfo executionInfo, boolean writableStackTrace) { super(coordinator, message, executionInfo, writableStackTrace); } - @NonNull + @Nonnull @Override public DriverException copy() { return new ServerError(getCoordinator(), getMessage(), getExecutionInfo(), true); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/SyntaxError.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/SyntaxError.java index 708068c0299..c37d7fb0db9 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/SyntaxError.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/SyntaxError.java @@ -21,8 +21,8 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.retry.RetryPolicy; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A syntax error in a query. @@ -32,19 +32,19 @@ */ public class SyntaxError extends QueryValidationException { - public SyntaxError(@NonNull Node coordinator, @NonNull String message) { + public SyntaxError(@Nonnull Node coordinator, @Nonnull String message) { this(coordinator, message, null, false); } private SyntaxError( - @NonNull Node coordinator, - @NonNull String message, + @Nonnull Node coordinator, + @Nonnull String message, @Nullable ExecutionInfo executionInfo, boolean writableStackTrace) { super(coordinator, message, executionInfo, writableStackTrace); } - @NonNull + @Nonnull @Override public DriverException copy() { return new SyntaxError(getCoordinator(), getMessage(), getExecutionInfo(), true); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/TruncateException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/TruncateException.java index 2091d166e98..0bad864b5cc 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/TruncateException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/TruncateException.java @@ -23,8 +23,8 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.retry.RetryPolicy; import com.datastax.oss.driver.api.core.session.Request; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * An error during a truncation operation. @@ -36,19 +36,19 @@ */ public class TruncateException extends QueryExecutionException { - public TruncateException(@NonNull Node coordinator, @NonNull String message) { + public TruncateException(@Nonnull Node coordinator, @Nonnull String message) { this(coordinator, message, null, false); } private TruncateException( - @NonNull Node coordinator, - @NonNull String message, + @Nonnull Node coordinator, + @Nonnull String message, @Nullable ExecutionInfo executionInfo, boolean writableStackTrace) { super(coordinator, message, executionInfo, writableStackTrace); } - @NonNull + @Nonnull @Override public DriverException copy() { return new TruncateException(getCoordinator(), getMessage(), getExecutionInfo(), true); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/UnauthorizedException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/UnauthorizedException.java index 7a6235422de..7f215bf7035 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/UnauthorizedException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/UnauthorizedException.java @@ -21,8 +21,8 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.retry.RetryPolicy; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Indicates that a query cannot be performed due to the authorization restrictions of the logged @@ -33,19 +33,19 @@ */ public class UnauthorizedException extends QueryValidationException { - public UnauthorizedException(@NonNull Node coordinator, @NonNull String message) { + public UnauthorizedException(@Nonnull Node coordinator, @Nonnull String message) { this(coordinator, message, null, false); } private UnauthorizedException( - @NonNull Node coordinator, - @NonNull String message, + @Nonnull Node coordinator, + @Nonnull String message, @Nullable ExecutionInfo executionInfo, boolean writableStackTrace) { super(coordinator, message, executionInfo, writableStackTrace); } - @NonNull + @Nonnull @Override public DriverException copy() { return new UnauthorizedException(getCoordinator(), getMessage(), getExecutionInfo(), true); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/UnavailableException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/UnavailableException.java index b9e9848ce36..e75520a4aa8 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/UnavailableException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/UnavailableException.java @@ -24,7 +24,7 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.retry.RetryPolicy; import com.datastax.oss.driver.api.core.session.Request; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * Thrown when the coordinator knows there is not enough replicas alive to perform a query with the @@ -41,8 +41,8 @@ public class UnavailableException extends QueryExecutionException { private final int alive; public UnavailableException( - @NonNull Node coordinator, - @NonNull ConsistencyLevel consistencyLevel, + @Nonnull Node coordinator, + @Nonnull ConsistencyLevel consistencyLevel, int required, int alive) { this( @@ -58,9 +58,9 @@ public UnavailableException( } private UnavailableException( - @NonNull Node coordinator, - @NonNull String message, - @NonNull ConsistencyLevel consistencyLevel, + @Nonnull Node coordinator, + @Nonnull String message, + @Nonnull ConsistencyLevel consistencyLevel, int required, int alive, ExecutionInfo executionInfo, @@ -72,7 +72,7 @@ private UnavailableException( } /** The consistency level of the operation triggering this exception. */ - @NonNull + @Nonnull public ConsistencyLevel getConsistencyLevel() { return consistencyLevel; } @@ -93,7 +93,7 @@ public int getAlive() { return alive; } - @NonNull + @Nonnull @Override public DriverException copy() { return new UnavailableException( diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/WriteFailureException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/WriteFailureException.java index ffbbd2aef6f..ca09da1aeea 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/WriteFailureException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/WriteFailureException.java @@ -24,10 +24,10 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.retry.RetryPolicy; import com.datastax.oss.driver.api.core.session.Request; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.net.InetAddress; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A non-timeout error during a write query. @@ -47,13 +47,13 @@ public class WriteFailureException extends QueryConsistencyException { private final Map reasonMap; public WriteFailureException( - @NonNull Node coordinator, - @NonNull ConsistencyLevel consistencyLevel, + @Nonnull Node coordinator, + @Nonnull ConsistencyLevel consistencyLevel, int received, int blockFor, - @NonNull WriteType writeType, + @Nonnull WriteType writeType, int numFailures, - @NonNull Map reasonMap) { + @Nonnull Map reasonMap) { this( coordinator, String.format( @@ -71,14 +71,14 @@ public WriteFailureException( } private WriteFailureException( - @NonNull Node coordinator, - @NonNull String message, - @NonNull ConsistencyLevel consistencyLevel, + @Nonnull Node coordinator, + @Nonnull String message, + @Nonnull ConsistencyLevel consistencyLevel, int received, int blockFor, - @NonNull WriteType writeType, + @Nonnull WriteType writeType, int numFailures, - @NonNull Map reasonMap, + @Nonnull Map reasonMap, @Nullable ExecutionInfo executionInfo, boolean writableStackTrace) { super( @@ -95,7 +95,7 @@ private WriteFailureException( } /** The type of the write for which this failure was raised. */ - @NonNull + @Nonnull public WriteType getWriteType() { return writeType; } @@ -124,12 +124,12 @@ public int getNumFailures() { *

    This feature is available for protocol v5 or above only. With lower protocol versions, the * map will always be empty. */ - @NonNull + @Nonnull public Map getReasonMap() { return reasonMap; } - @NonNull + @Nonnull @Override public DriverException copy() { return new WriteFailureException( diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/WriteTimeoutException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/WriteTimeoutException.java index 9913dbd0a91..26aa3993fff 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/WriteTimeoutException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/WriteTimeoutException.java @@ -24,8 +24,8 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.retry.RetryPolicy; import com.datastax.oss.driver.api.core.session.Request; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A server-side timeout during a write query. @@ -40,11 +40,11 @@ public class WriteTimeoutException extends QueryConsistencyException { private final WriteType writeType; public WriteTimeoutException( - @NonNull Node coordinator, - @NonNull ConsistencyLevel consistencyLevel, + @Nonnull Node coordinator, + @Nonnull ConsistencyLevel consistencyLevel, int received, int blockFor, - @NonNull WriteType writeType) { + @Nonnull WriteType writeType) { this( coordinator, String.format( @@ -60,12 +60,12 @@ public WriteTimeoutException( } private WriteTimeoutException( - @NonNull Node coordinator, - @NonNull String message, - @NonNull ConsistencyLevel consistencyLevel, + @Nonnull Node coordinator, + @Nonnull String message, + @Nonnull ConsistencyLevel consistencyLevel, int received, int blockFor, - @NonNull WriteType writeType, + @Nonnull WriteType writeType, @Nullable ExecutionInfo executionInfo, boolean writableStackTrace) { super( @@ -80,12 +80,12 @@ private WriteTimeoutException( } /** The type of the write for which a timeout was raised. */ - @NonNull + @Nonnull public WriteType getWriteType() { return writeType; } - @NonNull + @Nonnull @Override public DriverException copy() { return new WriteTimeoutException( diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/WriteType.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/WriteType.java index 05ad99e5ce4..1706ff7d5dc 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/WriteType.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/WriteType.java @@ -17,7 +17,7 @@ */ package com.datastax.oss.driver.api.core.servererrors; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * The type of a Cassandra write query. @@ -41,6 +41,6 @@ public interface WriteType { WriteType CDC = DefaultWriteType.CDC; /** The textual representation that the write type is encoded to in protocol frames. */ - @NonNull + @Nonnull String name(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/session/ProgrammaticArguments.java b/core/src/main/java/com/datastax/oss/driver/api/core/session/ProgrammaticArguments.java index 4e08bd5434c..d79e9112eae 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/session/ProgrammaticArguments.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/session/ProgrammaticArguments.java @@ -32,8 +32,6 @@ import com.datastax.oss.driver.internal.core.tracker.MultiplexingRequestTracker; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.net.InetSocketAddress; import java.util.List; import java.util.Map; @@ -41,6 +39,8 @@ import java.util.Objects; import java.util.UUID; import java.util.function.Predicate; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * The arguments that can be set programmatically when building a session. @@ -50,7 +50,7 @@ */ public class ProgrammaticArguments { - @NonNull + @Nonnull public static Builder builder() { return new Builder(); } @@ -73,13 +73,13 @@ public static Builder builder() { private final Object metricRegistry; private ProgrammaticArguments( - @NonNull List> typeCodecs, + @Nonnull List> typeCodecs, @Nullable NodeStateListener nodeStateListener, @Nullable SchemaChangeListener schemaChangeListener, @Nullable RequestTracker requestTracker, - @NonNull Map localDatacenters, - @NonNull Map> nodeFilters, - @NonNull Map nodeDistanceEvaluators, + @Nonnull Map localDatacenters, + @Nonnull Map> nodeFilters, + @Nonnull Map nodeDistanceEvaluators, @Nullable ClassLoader classLoader, @Nullable AuthProvider authProvider, @Nullable SslEngineFactory sslEngineFactory, @@ -108,7 +108,7 @@ private ProgrammaticArguments( this.metricRegistry = metricRegistry; } - @NonNull + @Nonnull public List> getTypeCodecs() { return typeCodecs; } @@ -128,19 +128,19 @@ public RequestTracker getRequestTracker() { return requestTracker; } - @NonNull + @Nonnull public Map getLocalDatacenters() { return localDatacenters; } - @NonNull + @Nonnull @Deprecated @SuppressWarnings("DeprecatedIsStillUsed") public Map> getNodeFilters() { return nodeFilters; } - @NonNull + @Nonnull public Map getNodeDistanceEvaluators() { return nodeDistanceEvaluators; } @@ -211,20 +211,20 @@ public static class Builder { private MutableCodecRegistry codecRegistry; private Object metricRegistry; - @NonNull - public Builder addTypeCodecs(@NonNull TypeCodec... typeCodecs) { + @Nonnull + public Builder addTypeCodecs(@Nonnull TypeCodec... typeCodecs) { this.typeCodecsBuilder.add(typeCodecs); return this; } - @NonNull + @Nonnull public Builder withNodeStateListener(@Nullable NodeStateListener nodeStateListener) { this.nodeStateListener = nodeStateListener; return this; } - @NonNull - public Builder addNodeStateListener(@NonNull NodeStateListener nodeStateListener) { + @Nonnull + public Builder addNodeStateListener(@Nonnull NodeStateListener nodeStateListener) { Objects.requireNonNull(nodeStateListener, "nodeStateListener cannot be null"); if (this.nodeStateListener == null) { this.nodeStateListener = nodeStateListener; @@ -243,14 +243,14 @@ public Builder addNodeStateListener(@NonNull NodeStateListener nodeStateListener return this; } - @NonNull + @Nonnull public Builder withSchemaChangeListener(@Nullable SchemaChangeListener schemaChangeListener) { this.schemaChangeListener = schemaChangeListener; return this; } - @NonNull - public Builder addSchemaChangeListener(@NonNull SchemaChangeListener schemaChangeListener) { + @Nonnull + public Builder addSchemaChangeListener(@Nonnull SchemaChangeListener schemaChangeListener) { Objects.requireNonNull(schemaChangeListener, "schemaChangeListener cannot be null"); if (this.schemaChangeListener == null) { this.schemaChangeListener = schemaChangeListener; @@ -269,14 +269,14 @@ public Builder addSchemaChangeListener(@NonNull SchemaChangeListener schemaChang return this; } - @NonNull + @Nonnull public Builder withRequestTracker(@Nullable RequestTracker requestTracker) { this.requestTracker = requestTracker; return this; } - @NonNull - public Builder addRequestTracker(@NonNull RequestTracker requestTracker) { + @Nonnull + public Builder addRequestTracker(@Nonnull RequestTracker requestTracker) { Objects.requireNonNull(requestTracker, "requestTracker cannot be null"); if (this.requestTracker == null) { this.requestTracker = requestTracker; @@ -294,20 +294,20 @@ public Builder addRequestTracker(@NonNull RequestTracker requestTracker) { return this; } - @NonNull + @Nonnull public Builder withLocalDatacenter( - @NonNull String profileName, @NonNull String localDatacenter) { + @Nonnull String profileName, @Nonnull String localDatacenter) { this.localDatacentersBuilder.put(profileName, localDatacenter); return this; } - @NonNull + @Nonnull public Builder clearDatacenters() { this.localDatacentersBuilder = ImmutableMap.builder(); return this; } - @NonNull + @Nonnull public Builder withLocalDatacenters(Map localDatacenters) { for (Map.Entry entry : localDatacenters.entrySet()) { this.localDatacentersBuilder.put(entry.getKey(), entry.getValue()); @@ -315,14 +315,14 @@ public Builder withLocalDatacenters(Map localDatacenters) { return this; } - @NonNull + @Nonnull public Builder withNodeDistanceEvaluator( - @NonNull String profileName, @NonNull NodeDistanceEvaluator nodeDistanceEvaluator) { + @Nonnull String profileName, @Nonnull NodeDistanceEvaluator nodeDistanceEvaluator) { this.nodeDistanceEvaluatorsBuilder.put(profileName, nodeDistanceEvaluator); return this; } - @NonNull + @Nonnull public Builder withNodeDistanceEvaluators( Map nodeDistanceReporters) { for (Entry entry : nodeDistanceReporters.entrySet()) { @@ -334,10 +334,10 @@ public Builder withNodeDistanceEvaluators( /** * @deprecated Use {@link #withNodeDistanceEvaluator(String, NodeDistanceEvaluator)} instead. */ - @NonNull + @Nonnull @Deprecated public Builder withNodeFilter( - @NonNull String profileName, @NonNull Predicate nodeFilter) { + @Nonnull String profileName, @Nonnull Predicate nodeFilter) { this.nodeFiltersBuilder.put(profileName, nodeFilter); this.nodeDistanceEvaluatorsBuilder.put( profileName, new NodeFilterToDistanceEvaluatorAdapter(nodeFilter)); @@ -345,7 +345,7 @@ public Builder withNodeFilter( } /** @deprecated Use {@link #withNodeDistanceEvaluators(Map)} instead. */ - @NonNull + @Nonnull @Deprecated public Builder withNodeFilters(Map> nodeFilters) { for (Map.Entry> entry : nodeFilters.entrySet()) { @@ -356,61 +356,61 @@ public Builder withNodeFilters(Map> nodeFilters) { return this; } - @NonNull + @Nonnull public Builder withClassLoader(@Nullable ClassLoader classLoader) { this.classLoader = classLoader; return this; } - @NonNull + @Nonnull public Builder withCloudProxyAddress(@Nullable InetSocketAddress cloudAddress) { this.cloudProxyAddress = cloudAddress; return this; } - @NonNull + @Nonnull public Builder withAuthProvider(@Nullable AuthProvider authProvider) { this.authProvider = authProvider; return this; } - @NonNull + @Nonnull public Builder withSslEngineFactory(@Nullable SslEngineFactory sslEngineFactory) { this.sslEngineFactory = sslEngineFactory; return this; } - @NonNull + @Nonnull public Builder withStartupClientId(@Nullable UUID startupClientId) { this.startupClientId = startupClientId; return this; } - @NonNull + @Nonnull public Builder withStartupApplicationName(@Nullable String startupApplicationName) { this.startupApplicationName = startupApplicationName; return this; } - @NonNull + @Nonnull public Builder withStartupApplicationVersion(@Nullable String startupApplicationVersion) { this.startupApplicationVersion = startupApplicationVersion; return this; } - @NonNull + @Nonnull public Builder withCodecRegistry(@Nullable MutableCodecRegistry codecRegistry) { this.codecRegistry = codecRegistry; return this; } - @NonNull + @Nonnull public Builder withMetricRegistry(@Nullable Object metricRegistry) { this.metricRegistry = metricRegistry; return this; } - @NonNull + @Nonnull public ProgrammaticArguments build() { return new ProgrammaticArguments( typeCodecsBuilder.build(), diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/session/Request.java b/core/src/main/java/com/datastax/oss/driver/api/core/session/Request.java index 7d122276cbf..4db4159969e 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/session/Request.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/session/Request.java @@ -24,11 +24,11 @@ import com.datastax.oss.driver.api.core.config.DriverExecutionProfile; import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.metadata.token.Token; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.time.Duration; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A request executed by a {@link Session}. @@ -142,7 +142,7 @@ public interface Request { * * @return The custom payload, or an empty map if no payload is present. */ - @NonNull + @Nonnull Map getCustomPayload(); /** diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/session/Session.java b/core/src/main/java/com/datastax/oss/driver/api/core/session/Session.java index e047bf2fe09..2591132f82b 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/session/Session.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/session/Session.java @@ -32,10 +32,10 @@ import com.datastax.oss.driver.internal.core.DefaultMavenCoordinates; import com.datastax.oss.driver.internal.core.util.concurrent.BlockingOperation; import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Optional; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A nexus to send requests to a Cassandra cluster. @@ -58,7 +58,7 @@ public interface Session extends AsyncAutoCloseable { *

    This is intended for products that wrap or extend the driver, as a way to check * compatibility if end-users override the driver version in their application. */ - @NonNull + @Nonnull MavenCoordinates OSS_DRIVER_COORDINATES = DefaultMavenCoordinates.buildFromResourceAndPrint( Session.class.getResource("/com/datastax/oss/driver/Driver.properties")); @@ -74,7 +74,7 @@ public interface Session extends AsyncAutoCloseable { *

    Note that this is purely a client-side identifier; in particular, it has no relation with * {@code system.local.cluster_name} on the server. */ - @NonNull + @Nonnull String getName(); /** @@ -96,7 +96,7 @@ public interface Session extends AsyncAutoCloseable { *

    The returned object is never {@code null}, but may be empty if metadata has been disabled in * the configuration. */ - @NonNull + @Nonnull Metadata getMetadata(); /** Whether schema metadata is currently enabled. */ @@ -118,7 +118,7 @@ public interface Session extends AsyncAutoCloseable { * @return if this call triggered a refresh, a future that will complete when that refresh is * complete. Otherwise, a completed future with the current metadata. */ - @NonNull + @Nonnull CompletionStage setSchemaMetadataEnabled(@Nullable Boolean newValue); /** @@ -128,7 +128,7 @@ public interface Session extends AsyncAutoCloseable { *

    The new metadata is returned in the resulting future (and will also be reflected by {@link * #getMetadata()} when that future completes). */ - @NonNull + @Nonnull CompletionStage refreshSchemaAsync(); /** @@ -136,7 +136,7 @@ public interface Session extends AsyncAutoCloseable { * *

    This must not be called on a driver thread. */ - @NonNull + @Nonnull default Metadata refreshSchema() { BlockingOperation.checkNotDriverThread(); return CompletableFutures.getUninterruptibly(refreshSchemaAsync()); @@ -166,7 +166,7 @@ default Metadata refreshSchema() { * @see DefaultDriverOption#CONTROL_CONNECTION_AGREEMENT_INTERVAL * @see DefaultDriverOption#CONTROL_CONNECTION_AGREEMENT_TIMEOUT */ - @NonNull + @Nonnull CompletionStage checkSchemaAgreementAsync(); /** @@ -180,7 +180,7 @@ default boolean checkSchemaAgreement() { } /** Returns a context that provides access to all the policies used by this driver instance. */ - @NonNull + @Nonnull DriverContext getContext(); /** @@ -195,7 +195,7 @@ default boolean checkSchemaAgreement() { * concurrently. Therefore it is highly discouraged, aside from trivial cases (such as a * cqlsh-style program where requests are never concurrent). */ - @NonNull + @Nonnull Optional getKeyspace(); /** @@ -209,7 +209,7 @@ default boolean checkSchemaAgreement() { * SessionBuilder#withMetricRegistry(Object)} when you build the session. You can then use the * framework's proprietary APIs to retrieve the metrics from the registry. */ - @NonNull + @Nonnull Optional getMetrics(); /** @@ -221,5 +221,5 @@ default boolean checkSchemaAgreement() { */ @Nullable // because ResultT could be Void ResultT execute( - @NonNull RequestT request, @NonNull GenericType resultType); + @Nonnull RequestT request, @Nonnull GenericType resultType); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/session/SessionBuilder.java b/core/src/main/java/com/datastax/oss/driver/api/core/session/SessionBuilder.java index cbf896a0873..bebb0daf444 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/session/SessionBuilder.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/session/SessionBuilder.java @@ -49,8 +49,6 @@ import com.datastax.oss.driver.internal.core.session.DefaultSession; import com.datastax.oss.driver.internal.core.util.concurrent.BlockingOperation; import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.InputStream; import java.net.InetSocketAddress; import java.net.MalformedURLException; @@ -67,6 +65,8 @@ import java.util.concurrent.Callable; import java.util.concurrent.CompletionStage; import java.util.function.Predicate; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import javax.net.ssl.SSLContext; import net.jcip.annotations.NotThreadSafe; import org.slf4j.Logger; @@ -123,19 +123,19 @@ public abstract class SessionBuilder { * @see Typesafe config's * standard loading behavior */ - @NonNull + @Nonnull public SelfT withConfigLoader(@Nullable DriverConfigLoader configLoader) { this.configLoader = configLoader; return self; } - @NonNull + @Nonnull @Deprecated protected DriverConfigLoader defaultConfigLoader() { return new DefaultDriverConfigLoader(); } - @NonNull + @Nonnull protected DriverConfigLoader defaultConfigLoader(@Nullable ClassLoader classLoader) { if (classLoader == null) { return new DefaultDriverConfigLoader(); @@ -162,8 +162,8 @@ protected DriverConfigLoader defaultConfigLoader(@Nullable ClassLoader classLoad * sure you pass unresolved instances here (see {@code advanced.resolve-contact-points} in the * configuration for more explanations). */ - @NonNull - public SelfT addContactPoints(@NonNull Collection contactPoints) { + @Nonnull + public SelfT addContactPoints(@Nonnull Collection contactPoints) { for (InetSocketAddress contactPoint : contactPoints) { addContactPoint(contactPoint); } @@ -175,8 +175,8 @@ public SelfT addContactPoints(@NonNull Collection contactPoin * * @see #addContactPoints(Collection) */ - @NonNull - public SelfT addContactPoint(@NonNull InetSocketAddress contactPoint) { + @Nonnull + public SelfT addContactPoint(@Nonnull InetSocketAddress contactPoint) { this.programmaticContactPoints.add(new DefaultEndPoint(contactPoint)); return self; } @@ -187,8 +187,8 @@ public SelfT addContactPoint(@NonNull InetSocketAddress contactPoint) { *

    You only need this method if you use a custom {@link EndPoint} implementation. Otherwise, * use {@link #addContactPoints(Collection)}. */ - @NonNull - public SelfT addContactEndPoints(@NonNull Collection contactPoints) { + @Nonnull + public SelfT addContactEndPoints(@Nonnull Collection contactPoints) { for (EndPoint contactPoint : contactPoints) { addContactEndPoint(contactPoint); } @@ -201,8 +201,8 @@ public SelfT addContactEndPoints(@NonNull Collection contactPoints) { *

    You only need this method if you use a custom {@link EndPoint} implementation. Otherwise, * use {@link #addContactPoint(InetSocketAddress)}. */ - @NonNull - public SelfT addContactEndPoint(@NonNull EndPoint contactPoint) { + @Nonnull + public SelfT addContactEndPoint(@Nonnull EndPoint contactPoint) { this.programmaticContactPoints.add(contactPoint); return self; } @@ -213,8 +213,8 @@ public SelfT addContactEndPoint(@NonNull EndPoint contactPoint) { * @param typeCodecs neither the individual codecs, nor the vararg array itself, can be {@code * null}. */ - @NonNull - public SelfT addTypeCodecs(@NonNull TypeCodec... typeCodecs) { + @Nonnull + public SelfT addTypeCodecs(@Nonnull TypeCodec... typeCodecs) { this.programmaticArgumentsBuilder.addTypeCodecs(typeCodecs); return self; } @@ -228,7 +228,7 @@ public SelfT addTypeCodecs(@NonNull TypeCodec... typeCodecs) { *

    This method unregisters any previously-registered listener. If you intend to register more * than one listener, use {@link #addNodeStateListener(NodeStateListener)} instead. */ - @NonNull + @Nonnull public SelfT withNodeStateListener(@Nullable NodeStateListener nodeStateListener) { this.programmaticArgumentsBuilder.withNodeStateListener(nodeStateListener); return self; @@ -246,8 +246,8 @@ public SelfT withNodeStateListener(@Nullable NodeStateListener nodeStateListener * listeners. When multiple listeners are registered, they are notified in sequence every time a * new listener event is triggered. */ - @NonNull - public SelfT addNodeStateListener(@NonNull NodeStateListener nodeStateListener) { + @Nonnull + public SelfT addNodeStateListener(@Nonnull NodeStateListener nodeStateListener) { programmaticArgumentsBuilder.addNodeStateListener(nodeStateListener); return self; } @@ -261,7 +261,7 @@ public SelfT addNodeStateListener(@NonNull NodeStateListener nodeStateListener) *

    This method unregisters any previously-registered listener. If you intend to register more * than one listener, use {@link #addSchemaChangeListener(SchemaChangeListener)} instead. */ - @NonNull + @Nonnull public SelfT withSchemaChangeListener(@Nullable SchemaChangeListener schemaChangeListener) { this.programmaticArgumentsBuilder.withSchemaChangeListener(schemaChangeListener); return self; @@ -279,8 +279,8 @@ public SelfT withSchemaChangeListener(@Nullable SchemaChangeListener schemaChang * multiple listeners. When multiple listeners are registered, they are notified in sequence every * time a new listener event is triggered. */ - @NonNull - public SelfT addSchemaChangeListener(@NonNull SchemaChangeListener schemaChangeListener) { + @Nonnull + public SelfT addSchemaChangeListener(@Nonnull SchemaChangeListener schemaChangeListener) { programmaticArgumentsBuilder.addSchemaChangeListener(schemaChangeListener); return self; } @@ -294,7 +294,7 @@ public SelfT addSchemaChangeListener(@NonNull SchemaChangeListener schemaChangeL *

    This method unregisters any previously-registered tracker. If you intend to register more * than one tracker, use {@link #addRequestTracker(RequestTracker)} instead. */ - @NonNull + @Nonnull public SelfT withRequestTracker(@Nullable RequestTracker requestTracker) { this.programmaticArgumentsBuilder.withRequestTracker(requestTracker); return self; @@ -312,8 +312,8 @@ public SelfT withRequestTracker(@Nullable RequestTracker requestTracker) { * When multiple trackers are registered, they are notified in sequence every time a new tracker * event is triggered. */ - @NonNull - public SelfT addRequestTracker(@NonNull RequestTracker requestTracker) { + @Nonnull + public SelfT addRequestTracker(@Nonnull RequestTracker requestTracker) { programmaticArgumentsBuilder.addRequestTracker(requestTracker); return self; } @@ -324,7 +324,7 @@ public SelfT addRequestTracker(@NonNull RequestTracker requestTracker) { *

    If the provider is specified programmatically with this method, it overrides the * configuration (that is, the {@code advanced.auth-provider.class} option will be ignored). */ - @NonNull + @Nonnull public SelfT withAuthProvider(@Nullable AuthProvider authProvider) { this.programmaticArgumentsBuilder.withAuthProvider(authProvider); return self; @@ -344,8 +344,8 @@ public SelfT withAuthProvider(@Nullable AuthProvider authProvider) { * #withAuthProvider(AuthProvider)} or via the configuration ({@code * advanced.auth-provider.class}). */ - @NonNull - public SelfT withAuthCredentials(@NonNull String username, @NonNull String password) { + @Nonnull + public SelfT withAuthCredentials(@Nonnull String username, @Nonnull String password) { return withAuthProvider(new ProgrammaticPlainTextAuthProvider(username, password)); } @@ -368,9 +368,9 @@ public SelfT withAuthCredentials(@NonNull String username, @NonNull String passw * #withAuthProvider(AuthProvider)} or via the configuration ({@code * advanced.auth-provider.class}). */ - @NonNull + @Nonnull public SelfT withAuthCredentials( - @NonNull String username, @NonNull String password, @NonNull String authorizationId) { + @Nonnull String username, @Nonnull String password, @Nonnull String authorizationId) { return withAuthProvider( new ProgrammaticPlainTextAuthProvider(username, password, authorizationId)); } @@ -380,8 +380,8 @@ public SelfT withAuthCredentials( * {@link #withAuthCredentials(String, String)}. */ @Deprecated - @NonNull - public SelfT withCredentials(@NonNull String username, @NonNull String password) { + @Nonnull + public SelfT withCredentials(@Nonnull String username, @Nonnull String password) { return withAuthCredentials(username, password); } @@ -390,9 +390,9 @@ public SelfT withCredentials(@NonNull String username, @NonNull String password) * {@link #withAuthCredentials(String, String,String)}. */ @Deprecated - @NonNull + @Nonnull public SelfT withCredentials( - @NonNull String username, @NonNull String password, @NonNull String authorizationId) { + @Nonnull String username, @Nonnull String password, @Nonnull String authorizationId) { return withAuthCredentials(username, password, authorizationId); } @@ -404,7 +404,7 @@ public SelfT withCredentials( * * @see ProgrammaticSslEngineFactory */ - @NonNull + @Nonnull public SelfT withSslEngineFactory(@Nullable SslEngineFactory sslEngineFactory) { this.programmaticSslFactory = true; this.programmaticArgumentsBuilder.withSslEngineFactory(sslEngineFactory); @@ -426,7 +426,7 @@ public SelfT withSslEngineFactory(@Nullable SslEngineFactory sslEngineFactory) { *

    Also, note that SSL engines will be created with advisory peer information ({@link * SSLContext#createSSLEngine(String, int)}) whenever possible. */ - @NonNull + @Nonnull public SelfT withSslContext(@Nullable SSLContext sslContext) { return withSslEngineFactory( sslContext == null ? null : new ProgrammaticSslEngineFactory(sslContext)); @@ -443,14 +443,14 @@ public SelfT withSslContext(@Nullable SSLContext sslContext) { * implementation in use. The driver's built-in {@code DefaultLoadBalancingPolicy} relies on it; * if you use a third-party implementation, refer to their documentation. */ - public SelfT withLocalDatacenter(@NonNull String profileName, @NonNull String localDatacenter) { + public SelfT withLocalDatacenter(@Nonnull String profileName, @Nonnull String localDatacenter) { this.programmaticLocalDatacenter = true; this.programmaticArgumentsBuilder.withLocalDatacenter(profileName, localDatacenter); return self; } /** Alias to {@link #withLocalDatacenter(String, String)} for the default profile. */ - public SelfT withLocalDatacenter(@NonNull String localDatacenter) { + public SelfT withLocalDatacenter(@Nonnull String localDatacenter) { return withLocalDatacenter(DriverExecutionProfile.DEFAULT_NAME, localDatacenter); } @@ -468,9 +468,9 @@ public SelfT withLocalDatacenter(@NonNull String localDatacenter) { * * @see #withNodeDistanceEvaluator(NodeDistanceEvaluator) */ - @NonNull + @Nonnull public SelfT withNodeDistanceEvaluator( - @NonNull String profileName, @NonNull NodeDistanceEvaluator nodeDistanceEvaluator) { + @Nonnull String profileName, @Nonnull NodeDistanceEvaluator nodeDistanceEvaluator) { this.programmaticArgumentsBuilder.withNodeDistanceEvaluator(profileName, nodeDistanceEvaluator); return self; } @@ -479,8 +479,8 @@ public SelfT withNodeDistanceEvaluator( * Alias to {@link #withNodeDistanceEvaluator(String, NodeDistanceEvaluator)} for the default * profile. */ - @NonNull - public SelfT withNodeDistanceEvaluator(@NonNull NodeDistanceEvaluator nodeDistanceEvaluator) { + @Nonnull + public SelfT withNodeDistanceEvaluator(@Nonnull NodeDistanceEvaluator nodeDistanceEvaluator) { return withNodeDistanceEvaluator(DriverExecutionProfile.DEFAULT_NAME, nodeDistanceEvaluator); } @@ -531,8 +531,8 @@ public SelfT withNodeDistanceEvaluator(@NonNull NodeDistanceEvaluator nodeDistan * @deprecated Use {@link #withNodeDistanceEvaluator(String, NodeDistanceEvaluator)} instead. */ @Deprecated - @NonNull - public SelfT withNodeFilter(@NonNull String profileName, @NonNull Predicate nodeFilter) { + @Nonnull + public SelfT withNodeFilter(@Nonnull String profileName, @Nonnull Predicate nodeFilter) { this.programmaticArgumentsBuilder.withNodeFilter(profileName, nodeFilter); return self; } @@ -547,8 +547,8 @@ public SelfT withNodeFilter(@NonNull String profileName, @NonNull Predicate nodeFilter) { + @Nonnull + public SelfT withNodeFilter(@Nonnull Predicate nodeFilter) { return withNodeFilter(DriverExecutionProfile.DEFAULT_NAME, nodeFilter); } @@ -558,7 +558,7 @@ public SelfT withNodeFilter(@NonNull Predicate nodeFilter) { *

    Note that this can also be provided by the configuration; if both are defined, this method * takes precedence. */ - @NonNull + @Nonnull public SelfT withKeyspace(@Nullable CqlIdentifier keyspace) { this.keyspace = keyspace; return self; @@ -568,7 +568,7 @@ public SelfT withKeyspace(@Nullable CqlIdentifier keyspace) { * Shortcut for {@link #withKeyspace(CqlIdentifier) * setKeyspace(CqlIdentifier.fromCql(keyspaceName))} */ - @NonNull + @Nonnull public SelfT withKeyspace(@Nullable String keyspaceName) { return withKeyspace(keyspaceName == null ? null : CqlIdentifier.fromCql(keyspaceName)); } @@ -620,7 +620,7 @@ public SelfT withKeyspace(@Nullable String keyspaceName) { * href="https://docs.datastax.com/en/developer/java-driver/latest/manual/osgi/#using-a-custom-class-loader">Using * a custom ClassLoader in our OSGi online docs for more information. */ - @NonNull + @Nonnull public SelfT withClassLoader(@Nullable ClassLoader classLoader) { this.programmaticArgumentsBuilder.withClassLoader(classLoader); return self; @@ -640,8 +640,8 @@ public SelfT withClassLoader(@Nullable ClassLoader classLoader) { * @see #withCloudSecureConnectBundle(URL) * @see #withCloudSecureConnectBundle(InputStream) */ - @NonNull - public SelfT withCloudSecureConnectBundle(@NonNull Path cloudConfigPath) { + @Nonnull + public SelfT withCloudSecureConnectBundle(@Nonnull Path cloudConfigPath) { try { URL cloudConfigUrl = cloudConfigPath.toAbsolutePath().normalize().toUri().toURL(); this.cloudConfigInputStream = cloudConfigUrl::openStream; @@ -657,7 +657,7 @@ public SelfT withCloudSecureConnectBundle(@NonNull Path cloudConfigPath) { *

    When both this and {@link #addTypeCodecs(TypeCodec[])} are called, the added type codecs * will be registered on the provided CodecRegistry. */ - @NonNull + @Nonnull public SelfT withCodecRegistry(@Nullable MutableCodecRegistry codecRegistry) { this.programmaticArgumentsBuilder.withCodecRegistry(codecRegistry); return self; @@ -677,8 +677,8 @@ public SelfT withCodecRegistry(@Nullable MutableCodecRegistry codecRegistry) { * @see #withCloudSecureConnectBundle(Path) * @see #withCloudSecureConnectBundle(InputStream) */ - @NonNull - public SelfT withCloudSecureConnectBundle(@NonNull URL cloudConfigUrl) { + @Nonnull + public SelfT withCloudSecureConnectBundle(@Nonnull URL cloudConfigUrl) { this.cloudConfigInputStream = cloudConfigUrl::openStream; return self; } @@ -701,8 +701,8 @@ public SelfT withCloudSecureConnectBundle(@NonNull URL cloudConfigUrl) { * @see #withCloudSecureConnectBundle(Path) * @see #withCloudSecureConnectBundle(URL) */ - @NonNull - public SelfT withCloudSecureConnectBundle(@NonNull InputStream cloudConfigInputStream) { + @Nonnull + public SelfT withCloudSecureConnectBundle(@Nonnull InputStream cloudConfigInputStream) { this.cloudConfigInputStream = () -> cloudConfigInputStream; return self; } @@ -723,7 +723,7 @@ public SelfT withCloudSecureConnectBundle(@NonNull InputStream cloudConfigInputS * @param cloudProxyAddress The address of the Cloud proxy to use. * @see Server Name Indication */ - @NonNull + @Nonnull public SelfT withCloudProxyAddress(@Nullable InetSocketAddress cloudProxyAddress) { this.programmaticArgumentsBuilder.withCloudProxyAddress(cloudProxyAddress); return self; @@ -740,7 +740,7 @@ public SelfT withCloudProxyAddress(@Nullable InetSocketAddress cloudProxyAddress *

    If you don't call this method, the driver will generate an identifier with {@link * Uuids#random()}. */ - @NonNull + @Nonnull public SelfT withClientId(@Nullable UUID clientId) { this.programmaticArgumentsBuilder.withStartupClientId(clientId); return self; @@ -759,7 +759,7 @@ public SelfT withClientId(@Nullable UUID clientId) { * configuration option will be ignored. If neither is specified, the entry is not included in the * message. */ - @NonNull + @Nonnull public SelfT withApplicationName(@Nullable String applicationName) { this.programmaticArgumentsBuilder.withStartupApplicationName(applicationName); return self; @@ -778,7 +778,7 @@ public SelfT withApplicationName(@Nullable String applicationName) { * configuration option will be ignored. If neither is specified, the entry is not included in the * message. */ - @NonNull + @Nonnull public SelfT withApplicationVersion(@Nullable String applicationVersion) { this.programmaticArgumentsBuilder.withStartupApplicationVersion(applicationVersion); return self; @@ -801,7 +801,7 @@ public SelfT withApplicationVersion(@Nullable String applicationVersion) { * used. For Dropwizard, if no Registry object is provided, an instance of {@code MetricRegistry} * will be created and used. */ - @NonNull + @Nonnull public SelfT withMetricRegistry(@Nullable Object metricRegistry) { this.programmaticArgumentsBuilder.withMetricRegistry(metricRegistry); return self; @@ -814,7 +814,7 @@ public SelfT withMetricRegistry(@Nullable Object metricRegistry) { * * @return a completion stage that completes with the session when it is fully initialized. */ - @NonNull + @Nonnull public CompletionStage buildAsync() { CompletionStage buildStage = buildDefaultSessionAsync(); CompletionStage wrapStage = buildStage.thenApply(this::wrap); @@ -831,15 +831,15 @@ public CompletionStage buildAsync() { * *

    This must not be called on a driver thread. */ - @NonNull + @Nonnull public SessionT build() { BlockingOperation.checkNotDriverThread(); return CompletableFutures.getUninterruptibly(buildAsync()); } - protected abstract SessionT wrap(@NonNull CqlSession defaultSession); + protected abstract SessionT wrap(@Nonnull CqlSession defaultSession); - @NonNull + @Nonnull protected final CompletionStage buildDefaultSessionAsync() { try { diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/session/throttling/RequestThrottler.java b/core/src/main/java/com/datastax/oss/driver/api/core/session/throttling/RequestThrottler.java index cb55fac336c..2d99fa7bf8a 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/session/throttling/RequestThrottler.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/session/throttling/RequestThrottler.java @@ -17,8 +17,8 @@ */ package com.datastax.oss.driver.api.core.session.throttling; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.Closeable; +import javax.annotation.Nonnull; /** * Limits the number of concurrent requests executed by the driver. @@ -34,19 +34,19 @@ public interface RequestThrottler extends Closeable { * Registers a new request to be throttled. The throttler will invoke {@link * Throttled#onThrottleReady(boolean)} when the request is allowed to proceed. */ - void register(@NonNull Throttled request); + void register(@Nonnull Throttled request); /** * Signals that a request has succeeded. This indicates to the throttler that another request * might be started. */ - void signalSuccess(@NonNull Throttled request); + void signalSuccess(@Nonnull Throttled request); /** * Signals that a request has failed. This indicates to the throttler that another request might * be started. */ - void signalError(@NonNull Throttled request, @NonNull Throwable error); + void signalError(@Nonnull Throttled request, @Nonnull Throwable error); /** * Signals that a request has timed out. This indicates to the throttler that this request has @@ -55,5 +55,5 @@ public interface RequestThrottler extends Closeable { *

    Note: requests are responsible for handling their own timeout. The throttler does not * perform time-based eviction on pending requests. */ - void signalTimeout(@NonNull Throttled request); + void signalTimeout(@Nonnull Throttled request); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/session/throttling/Throttled.java b/core/src/main/java/com/datastax/oss/driver/api/core/session/throttling/Throttled.java index 6fd562804da..799b1aa6ddc 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/session/throttling/Throttled.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/session/throttling/Throttled.java @@ -18,7 +18,7 @@ package com.datastax.oss.driver.api.core.session.throttling; import com.datastax.oss.driver.api.core.RequestThrottlingException; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * A request that may be subjected to throttling by a {@link @@ -42,5 +42,5 @@ public interface Throttled { * * @param error the error that the request should be completed (exceptionally) with. */ - void onThrottleFailure(@NonNull RequestThrottlingException error); + void onThrottleFailure(@Nonnull RequestThrottlingException error); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/specex/SpeculativeExecutionPolicy.java b/core/src/main/java/com/datastax/oss/driver/api/core/specex/SpeculativeExecutionPolicy.java index 163204ba62d..cff46f2cae6 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/specex/SpeculativeExecutionPolicy.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/specex/SpeculativeExecutionPolicy.java @@ -21,8 +21,8 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.session.Request; import com.datastax.oss.driver.api.core.session.SessionBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * The policy that decides if the driver will send speculative queries to the next nodes when the @@ -46,9 +46,9 @@ public interface SpeculativeExecutionPolicy extends AutoCloseable { * to send it immediately, or a negative value to stop sending requests. */ long nextExecution( - @NonNull Node node, + @Nonnull Node node, @Nullable CqlIdentifier keyspace, - @NonNull Request request, + @Nonnull Request request, int runningExecutions); /** Called when the cluster that this policy is associated with closes. */ diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/ssl/ProgrammaticSslEngineFactory.java b/core/src/main/java/com/datastax/oss/driver/api/core/ssl/ProgrammaticSslEngineFactory.java index 6dfe4087b91..493f4a7f822 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/ssl/ProgrammaticSslEngineFactory.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/ssl/ProgrammaticSslEngineFactory.java @@ -19,10 +19,10 @@ import com.datastax.oss.driver.api.core.metadata.EndPoint; import com.datastax.oss.driver.api.core.session.SessionBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.net.InetSocketAddress; import java.net.SocketAddress; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLParameters; @@ -52,7 +52,7 @@ public class ProgrammaticSslEngineFactory implements SslEngineFactory { * * @param sslContext the {@link SSLContext} to use. */ - public ProgrammaticSslEngineFactory(@NonNull SSLContext sslContext) { + public ProgrammaticSslEngineFactory(@Nonnull SSLContext sslContext) { this(sslContext, null); } @@ -64,7 +64,7 @@ public ProgrammaticSslEngineFactory(@NonNull SSLContext sslContext) { * @param cipherSuites the cipher suites to use, or null to use the default ones. */ public ProgrammaticSslEngineFactory( - @NonNull SSLContext sslContext, @Nullable String[] cipherSuites) { + @Nonnull SSLContext sslContext, @Nullable String[] cipherSuites) { this(sslContext, cipherSuites, false); } @@ -77,7 +77,7 @@ public ProgrammaticSslEngineFactory( * validation will be done using HTTPS algorithm. */ public ProgrammaticSslEngineFactory( - @NonNull SSLContext sslContext, + @Nonnull SSLContext sslContext, @Nullable String[] cipherSuites, boolean requireHostnameValidation) { this.sslContext = sslContext; @@ -85,9 +85,9 @@ public ProgrammaticSslEngineFactory( this.requireHostnameValidation = requireHostnameValidation; } - @NonNull + @Nonnull @Override - public SSLEngine newSslEngine(@NonNull EndPoint remoteEndpoint) { + public SSLEngine newSslEngine(@Nonnull EndPoint remoteEndpoint) { SSLEngine engine; SocketAddress remoteAddress = remoteEndpoint.resolve(); if (remoteAddress instanceof InetSocketAddress) { diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/ssl/SslEngineFactory.java b/core/src/main/java/com/datastax/oss/driver/api/core/ssl/SslEngineFactory.java index db4f18a97b9..5c9d6e7b8df 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/ssl/SslEngineFactory.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/ssl/SslEngineFactory.java @@ -18,7 +18,7 @@ package com.datastax.oss.driver.api.core.ssl; import com.datastax.oss.driver.api.core.metadata.EndPoint; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import javax.net.ssl.SSLEngine; /** @@ -35,6 +35,6 @@ public interface SslEngineFactory extends AutoCloseable { * @param remoteEndpoint the remote endpoint we are connecting to (the address of the Cassandra * node). */ - @NonNull - SSLEngine newSslEngine(@NonNull EndPoint remoteEndpoint); + @Nonnull + SSLEngine newSslEngine(@Nonnull EndPoint remoteEndpoint); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/tracker/RequestTracker.java b/core/src/main/java/com/datastax/oss/driver/api/core/tracker/RequestTracker.java index d29ee48d352..024bfe1f03f 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/tracker/RequestTracker.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/tracker/RequestTracker.java @@ -23,8 +23,8 @@ import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.api.core.session.SessionBuilder; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Tracks request execution for a session. @@ -41,10 +41,10 @@ public interface RequestTracker extends AutoCloseable { */ @Deprecated default void onSuccess( - @NonNull Request request, + @Nonnull Request request, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, - @NonNull Node node) {} + @Nonnull DriverExecutionProfile executionProfile, + @Nonnull Node node) {} /** * Invoked each time a request succeeds. @@ -56,11 +56,11 @@ default void onSuccess( * @param requestLogPrefix the dedicated log prefix for this request */ default void onSuccess( - @NonNull Request request, + @Nonnull Request request, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, - @NonNull Node node, - @NonNull String requestLogPrefix) { + @Nonnull DriverExecutionProfile executionProfile, + @Nonnull Node node, + @Nonnull String requestLogPrefix) { // If client doesn't override onSuccess with requestLogPrefix delegate call to the old method onSuccess(request, latencyNanos, executionProfile, node); } @@ -71,10 +71,10 @@ default void onSuccess( */ @Deprecated default void onError( - @NonNull Request request, - @NonNull Throwable error, + @Nonnull Request request, + @Nonnull Throwable error, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, + @Nonnull DriverExecutionProfile executionProfile, @Nullable Node node) {} /** @@ -87,12 +87,12 @@ default void onError( * @param requestLogPrefix the dedicated log prefix for this request */ default void onError( - @NonNull Request request, - @NonNull Throwable error, + @Nonnull Request request, + @Nonnull Throwable error, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, + @Nonnull DriverExecutionProfile executionProfile, @Nullable Node node, - @NonNull String requestLogPrefix) { + @Nonnull String requestLogPrefix) { // If client doesn't override onError with requestLogPrefix delegate call to the old method onError(request, error, latencyNanos, executionProfile, node); } @@ -103,11 +103,11 @@ default void onError( */ @Deprecated default void onNodeError( - @NonNull Request request, - @NonNull Throwable error, + @Nonnull Request request, + @Nonnull Throwable error, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, - @NonNull Node node) {} + @Nonnull DriverExecutionProfile executionProfile, + @Nonnull Node node) {} /** * Invoked each time a request fails at the node level. Similar to {@link #onError(Request, @@ -120,12 +120,12 @@ default void onNodeError( * @param requestLogPrefix the dedicated log prefix for this request */ default void onNodeError( - @NonNull Request request, - @NonNull Throwable error, + @Nonnull Request request, + @Nonnull Throwable error, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, - @NonNull Node node, - @NonNull String requestLogPrefix) { + @Nonnull DriverExecutionProfile executionProfile, + @Nonnull Node node, + @Nonnull String requestLogPrefix) { // If client doesn't override onNodeError with requestLogPrefix delegate call to the old method onNodeError(request, error, latencyNanos, executionProfile, node); } @@ -136,10 +136,10 @@ default void onNodeError( */ @Deprecated default void onNodeSuccess( - @NonNull Request request, + @Nonnull Request request, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, - @NonNull Node node) {} + @Nonnull DriverExecutionProfile executionProfile, + @Nonnull Node node) {} /** * Invoked each time a request succeeds at the node level. Similar to {@link #onSuccess(Request, @@ -152,11 +152,11 @@ default void onNodeSuccess( * @param requestLogPrefix the dedicated log prefix for this request */ default void onNodeSuccess( - @NonNull Request request, + @Nonnull Request request, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, - @NonNull Node node, - @NonNull String requestLogPrefix) { + @Nonnull DriverExecutionProfile executionProfile, + @Nonnull Node node, + @Nonnull String requestLogPrefix) { // If client doesn't override onNodeSuccess with requestLogPrefix delegate call to the old // method onNodeSuccess(request, latencyNanos, executionProfile, node); @@ -181,5 +181,5 @@ default void onNodeSuccess( * *

    The default implementation is empty. */ - default void onSessionReady(@NonNull Session session) {} + default void onSessionReady(@Nonnull Session session) {} } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/ContainerType.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/ContainerType.java index 93e92ec2c2b..15137af6752 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/ContainerType.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/ContainerType.java @@ -17,7 +17,7 @@ */ package com.datastax.oss.driver.api.core.type; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * Representation of a type which "contains" some other type. This might be a collection type or it @@ -25,6 +25,6 @@ */ public interface ContainerType { - @NonNull + @Nonnull DataType getElementType(); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/CustomType.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/CustomType.java index 93f913a584d..ebe1757da49 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/CustomType.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/CustomType.java @@ -18,17 +18,17 @@ package com.datastax.oss.driver.api.core.type; import com.datastax.oss.protocol.internal.ProtocolConstants; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CustomType extends DataType { /** * The fully qualified name of the subtype of {@code org.apache.cassandra.db.marshal.AbstractType} * that represents this type server-side. */ - @NonNull + @Nonnull String getClassName(); - @NonNull + @Nonnull @Override default String asCql(boolean includeFrozen, boolean pretty) { return String.format("'%s'", getClassName()); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/DataType.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/DataType.java index 92e5cc5edf0..58162e5626e 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/DataType.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/DataType.java @@ -19,7 +19,7 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.core.detach.Detachable; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * The type of a CQL column, field or function argument. @@ -44,6 +44,6 @@ public interface DataType extends Detachable { * @param pretty whether to pretty-print UDT names (as described in {@link * CqlIdentifier#asCql(boolean)}. */ - @NonNull + @Nonnull String asCql(boolean includeFrozen, boolean pretty); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/DataTypes.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/DataTypes.java index 3a341eaa5aa..ad5abf515f7 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/DataTypes.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/DataTypes.java @@ -30,9 +30,9 @@ import com.datastax.oss.driver.shaded.guava.common.base.Splitter; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; import com.datastax.oss.protocol.internal.ProtocolConstants; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Arrays; import java.util.List; +import javax.annotation.Nonnull; /** Constants and factory methods to obtain data type instances. */ public class DataTypes { @@ -61,8 +61,8 @@ public class DataTypes { private static final DataTypeClassNameParser classNameParser = new DataTypeClassNameParser(); private static final Splitter paramSplitter = Splitter.on(',').trimResults(); - @NonNull - public static DataType custom(@NonNull String className) { + @Nonnull + public static DataType custom(@Nonnull String className) { // In protocol v4, duration is implemented as a custom type if (className.equals("org.apache.cassandra.db.marshal.DurationType")) return DURATION; @@ -85,49 +85,49 @@ public static DataType custom(@NonNull String className) { return new DefaultCustomType(className); } - @NonNull - public static ListType listOf(@NonNull DataType elementType) { + @Nonnull + public static ListType listOf(@Nonnull DataType elementType) { return new DefaultListType(elementType, false); } - @NonNull - public static ListType listOf(@NonNull DataType elementType, boolean frozen) { + @Nonnull + public static ListType listOf(@Nonnull DataType elementType, boolean frozen) { return new DefaultListType(elementType, frozen); } - @NonNull - public static ListType frozenListOf(@NonNull DataType elementType) { + @Nonnull + public static ListType frozenListOf(@Nonnull DataType elementType) { return new DefaultListType(elementType, true); } - @NonNull - public static SetType setOf(@NonNull DataType elementType) { + @Nonnull + public static SetType setOf(@Nonnull DataType elementType) { return new DefaultSetType(elementType, false); } - @NonNull - public static SetType setOf(@NonNull DataType elementType, boolean frozen) { + @Nonnull + public static SetType setOf(@Nonnull DataType elementType, boolean frozen) { return new DefaultSetType(elementType, frozen); } - @NonNull - public static SetType frozenSetOf(@NonNull DataType elementType) { + @Nonnull + public static SetType frozenSetOf(@Nonnull DataType elementType) { return new DefaultSetType(elementType, true); } - @NonNull - public static MapType mapOf(@NonNull DataType keyType, @NonNull DataType valueType) { + @Nonnull + public static MapType mapOf(@Nonnull DataType keyType, @Nonnull DataType valueType) { return new DefaultMapType(keyType, valueType, false); } - @NonNull + @Nonnull public static MapType mapOf( - @NonNull DataType keyType, @NonNull DataType valueType, boolean frozen) { + @Nonnull DataType keyType, @Nonnull DataType valueType, boolean frozen) { return new DefaultMapType(keyType, valueType, frozen); } - @NonNull - public static MapType frozenMapOf(@NonNull DataType keyType, @NonNull DataType valueType) { + @Nonnull + public static MapType frozenMapOf(@Nonnull DataType keyType, @Nonnull DataType valueType) { return new DefaultMapType(keyType, valueType, true); } @@ -138,8 +138,8 @@ public static MapType frozenMapOf(@NonNull DataType keyType, @NonNull DataType v * null}. * @see Detachable */ - @NonNull - public static TupleType tupleOf(@NonNull DataType... componentTypes) { + @Nonnull + public static TupleType tupleOf(@Nonnull DataType... componentTypes) { return new DefaultTupleType(ImmutableList.copyOf(Arrays.asList(componentTypes))); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/ListType.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/ListType.java index ca377d10bbf..8bc86851e39 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/ListType.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/ListType.java @@ -18,13 +18,13 @@ package com.datastax.oss.driver.api.core.type; import com.datastax.oss.protocol.internal.ProtocolConstants; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface ListType extends DataType, ContainerType { boolean isFrozen(); - @NonNull + @Nonnull @Override default String asCql(boolean includeFrozen, boolean pretty) { String template = (isFrozen() && includeFrozen) ? "frozen>" : "list<%s>"; diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/MapType.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/MapType.java index f3bca2ac6a4..60899d83f63 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/MapType.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/MapType.java @@ -18,19 +18,19 @@ package com.datastax.oss.driver.api.core.type; import com.datastax.oss.protocol.internal.ProtocolConstants; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface MapType extends DataType { - @NonNull + @Nonnull DataType getKeyType(); - @NonNull + @Nonnull DataType getValueType(); boolean isFrozen(); - @NonNull + @Nonnull @Override default String asCql(boolean includeFrozen, boolean pretty) { String template = (isFrozen() && includeFrozen) ? "frozen>" : "map<%s, %s>"; diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/SetType.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/SetType.java index fa902c72bb8..61117b41f7d 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/SetType.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/SetType.java @@ -18,13 +18,13 @@ package com.datastax.oss.driver.api.core.type; import com.datastax.oss.protocol.internal.ProtocolConstants; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface SetType extends DataType, ContainerType { boolean isFrozen(); - @NonNull + @Nonnull @Override default String asCql(boolean includeFrozen, boolean pretty) { String template = (isFrozen() && includeFrozen) ? "frozen>" : "set<%s>"; diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/TupleType.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/TupleType.java index 9e2736ddce8..50dc469bbaa 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/TupleType.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/TupleType.java @@ -21,15 +21,15 @@ import com.datastax.oss.driver.api.core.detach.AttachmentPoint; import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry; import com.datastax.oss.protocol.internal.ProtocolConstants; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; +import javax.annotation.Nonnull; public interface TupleType extends DataType { - @NonNull + @Nonnull List getComponentTypes(); - @NonNull + @Nonnull TupleValue newValue(); /** @@ -45,13 +45,13 @@ public interface TupleType extends DataType { * values can be {@code null}, but the array itself can't. * @throws IllegalArgumentException if there are too many values. */ - @NonNull - TupleValue newValue(@NonNull Object... values); + @Nonnull + TupleValue newValue(@Nonnull Object... values); - @NonNull + @Nonnull AttachmentPoint getAttachmentPoint(); - @NonNull + @Nonnull @Override default String asCql(boolean includeFrozen, boolean pretty) { StringBuilder builder = new StringBuilder(); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/UserDefinedType.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/UserDefinedType.java index 4d4768a8ae4..e984568e4eb 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/UserDefinedType.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/UserDefinedType.java @@ -25,22 +25,22 @@ import com.datastax.oss.driver.internal.core.metadata.schema.ScriptBuilder; import com.datastax.oss.driver.internal.core.util.Loggers; import com.datastax.oss.protocol.internal.ProtocolConstants; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Collections; import java.util.List; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public interface UserDefinedType extends DataType, Describable { @Nullable // because of ShallowUserDefinedType usage in the query builder CqlIdentifier getKeyspace(); - @NonNull + @Nonnull CqlIdentifier getName(); boolean isFrozen(); - @NonNull + @Nonnull List getFieldNames(); /** @@ -50,8 +50,8 @@ public interface UserDefinedType extends DataType, Describable { *

    Implementors should always override this method (all built-in driver implementations * do). */ - @NonNull - default List allIndicesOf(@NonNull CqlIdentifier id) { + @Nonnull + default List allIndicesOf(@Nonnull CqlIdentifier id) { Loggers.USER_DEFINED_TYPE.warn( "{} should override allIndicesOf(CqlIdentifier), the default implementation is a " + "workaround for backward compatibility, it only returns the first occurrence", @@ -59,7 +59,7 @@ default List allIndicesOf(@NonNull CqlIdentifier id) { return Collections.singletonList(firstIndexOf(id)); } - int firstIndexOf(@NonNull CqlIdentifier id); + int firstIndexOf(@Nonnull CqlIdentifier id); /** * @apiNote the default implementation only exists for backward compatibility. It wraps the result @@ -68,8 +68,8 @@ default List allIndicesOf(@NonNull CqlIdentifier id) { *

    Implementors should always override this method (all built-in driver implementations * do). */ - @NonNull - default List allIndicesOf(@NonNull String name) { + @Nonnull + default List allIndicesOf(@Nonnull String name) { Loggers.USER_DEFINED_TYPE.warn( "{} should override allIndicesOf(String), the default implementation is a " + "workaround for backward compatibility, it only returns the first occurrence", @@ -77,23 +77,23 @@ default List allIndicesOf(@NonNull String name) { return Collections.singletonList(firstIndexOf(name)); } - int firstIndexOf(@NonNull String name); + int firstIndexOf(@Nonnull String name); - default boolean contains(@NonNull CqlIdentifier id) { + default boolean contains(@Nonnull CqlIdentifier id) { return firstIndexOf(id) >= 0; } - default boolean contains(@NonNull String name) { + default boolean contains(@Nonnull String name) { return firstIndexOf(name) >= 0; } - @NonNull + @Nonnull List getFieldTypes(); - @NonNull + @Nonnull UserDefinedType copy(boolean newFrozen); - @NonNull + @Nonnull UdtValue newValue(); /** @@ -109,13 +109,13 @@ default boolean contains(@NonNull String name) { * can be {@code null}, but the array itself can't. * @throws IllegalArgumentException if there are too many values. */ - @NonNull - UdtValue newValue(@NonNull Object... fields); + @Nonnull + UdtValue newValue(@Nonnull Object... fields); - @NonNull + @Nonnull AttachmentPoint getAttachmentPoint(); - @NonNull + @Nonnull @Override default String asCql(boolean includeFrozen, boolean pretty) { if (getKeyspace() != null) { @@ -127,7 +127,7 @@ default String asCql(boolean includeFrozen, boolean pretty) { } } - @NonNull + @Nonnull @Override default String describe(boolean pretty) { ScriptBuilder builder = new ScriptBuilder(pretty); @@ -155,7 +155,7 @@ default String describe(boolean pretty) { return builder.build(); } - @NonNull + @Nonnull @Override default String describeWithChildren(boolean pretty) { // No children (if it uses other types, they're considered dependencies, not sub-elements) diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/CodecNotFoundException.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/CodecNotFoundException.java index 4f45af0924f..5afb6337c38 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/CodecNotFoundException.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/CodecNotFoundException.java @@ -21,8 +21,8 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** Thrown when a suitable {@link TypeCodec} cannot be found by the {@link CodecRegistry}. */ public class CodecNotFoundException extends DriverException { @@ -40,7 +40,7 @@ public CodecNotFoundException(@Nullable DataType cqlType, @Nullable GenericType< } public CodecNotFoundException( - @NonNull Throwable cause, @Nullable DataType cqlType, @Nullable GenericType javaType) { + @Nonnull Throwable cause, @Nullable DataType cqlType, @Nullable GenericType javaType) { this( String.format( "Error while looking up codec for requested operation: [%s <-> %s]", cqlType, javaType), @@ -66,7 +66,7 @@ public GenericType getJavaType() { return javaType; } - @NonNull + @Nonnull @Override public DriverException copy() { return new CodecNotFoundException(getMessage(), getCause(), getCqlType(), getJavaType()); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/ExtraTypeCodecs.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/ExtraTypeCodecs.java index 51a96a16376..73fd8ee94bc 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/ExtraTypeCodecs.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/ExtraTypeCodecs.java @@ -42,7 +42,6 @@ import com.datastax.oss.driver.internal.core.type.codec.extras.time.ZonedTimestampCodec; import com.datastax.oss.driver.internal.core.type.codec.extras.vector.FloatVectorToArrayCodec; import com.fasterxml.jackson.databind.ObjectMapper; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.time.Instant; import java.time.LocalDateTime; @@ -50,6 +49,7 @@ import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.util.Optional; +import javax.annotation.Nonnull; /** * Additional codecs that can be registered to handle different type mappings. @@ -317,8 +317,8 @@ public class ExtraTypeCodecs { * @see TypeCodecs#TIMESTAMP * @see ExtraTypeCodecs#TIMESTAMP_UTC */ - @NonNull - public static TypeCodec timestampAt(@NonNull ZoneId timeZone) { + @Nonnull + public static TypeCodec timestampAt(@Nonnull ZoneId timeZone) { return new TimestampCodec(timeZone); } @@ -340,8 +340,8 @@ public static TypeCodec timestampAt(@NonNull ZoneId timeZone) { * @see ExtraTypeCodecs#TIMESTAMP_MILLIS_SYSTEM * @see ExtraTypeCodecs#TIMESTAMP_MILLIS_UTC */ - @NonNull - public static PrimitiveLongCodec timestampMillisAt(@NonNull ZoneId timeZone) { + @Nonnull + public static PrimitiveLongCodec timestampMillisAt(@Nonnull ZoneId timeZone) { return new TimestampMillisCodec(timeZone); } @@ -359,8 +359,8 @@ public static PrimitiveLongCodec timestampMillisAt(@NonNull ZoneId timeZone) { * @see ExtraTypeCodecs#ZONED_TIMESTAMP_UTC * @see ExtraTypeCodecs#ZONED_TIMESTAMP_PERSISTED */ - @NonNull - public static TypeCodec zonedTimestampAt(@NonNull ZoneId timeZone) { + @Nonnull + public static TypeCodec zonedTimestampAt(@Nonnull ZoneId timeZone) { return new ZonedTimestampCodec(timeZone); } @@ -377,8 +377,8 @@ public static TypeCodec zonedTimestampAt(@NonNull ZoneId timeZone * @see ExtraTypeCodecs#LOCAL_TIMESTAMP_UTC * @see #localTimestampAt(ZoneId) */ - @NonNull - public static TypeCodec localTimestampAt(@NonNull ZoneId timeZone) { + @Nonnull + public static TypeCodec localTimestampAt(@Nonnull ZoneId timeZone) { return new LocalTimestampCodec(timeZone); } @@ -392,8 +392,8 @@ public static TypeCodec localTimestampAt(@NonNull ZoneId timeZone * ExtraTypeCodecs#LONG_LIST_TO_ARRAY}, {@link ExtraTypeCodecs#FLOAT_LIST_TO_ARRAY} or {@link * ExtraTypeCodecs#DOUBLE_LIST_TO_ARRAY} instead. */ - @NonNull - public static TypeCodec listToArrayOf(@NonNull TypeCodec elementCodec) { + @Nonnull + public static TypeCodec listToArrayOf(@Nonnull TypeCodec elementCodec) { return new ObjectListToArrayCodec<>(elementCodec); } @@ -412,9 +412,9 @@ public static TypeCodec listToArrayOf(@NonNull TypeCodec elementCode * fairly straightforward to implement a codec with {@link MappingCodec}, using {@link * TypeCodecs#INT} as the "inner" codec. */ - @NonNull + @Nonnull public static > TypeCodec enumOrdinalsOf( - @NonNull Class enumClass) { + @Nonnull Class enumClass) { return new EnumOrdinalCodec<>(enumClass); } @@ -424,9 +424,9 @@ public static > TypeCodec enumOrdinalsOf( * * @see #enumOrdinalsOf(Class) */ - @NonNull + @Nonnull public static > TypeCodec enumNamesOf( - @NonNull Class enumClass) { + @Nonnull Class enumClass) { return new EnumNameCodec<>(enumClass); } @@ -434,8 +434,8 @@ public static > TypeCodec enumNamesOf( * Builds a new codec that wraps another codec's Java type into {@link Optional} instances * (mapping CQL null to {@link Optional#empty()}). */ - @NonNull - public static TypeCodec> optionalOf(@NonNull TypeCodec innerCodec) { + @Nonnull + public static TypeCodec> optionalOf(@Nonnull TypeCodec innerCodec) { return new OptionalCodec<>(innerCodec); } @@ -445,8 +445,8 @@ public static TypeCodec> optionalOf(@NonNull TypeCodec innerC * * @see Jackson JSON Library */ - @NonNull - public static TypeCodec json(@NonNull GenericType javaType) { + @Nonnull + public static TypeCodec json(@Nonnull GenericType javaType) { return new JsonCodec<>(javaType); } @@ -456,8 +456,8 @@ public static TypeCodec json(@NonNull GenericType javaType) { * * @see Jackson JSON Library */ - @NonNull - public static TypeCodec json(@NonNull Class javaType) { + @Nonnull + public static TypeCodec json(@Nonnull Class javaType) { return new JsonCodec<>(javaType); } @@ -467,9 +467,9 @@ public static TypeCodec json(@NonNull Class javaType) { * * @see Jackson JSON Library */ - @NonNull + @Nonnull public static TypeCodec json( - @NonNull GenericType javaType, @NonNull ObjectMapper objectMapper) { + @Nonnull GenericType javaType, @Nonnull ObjectMapper objectMapper) { return new JsonCodec<>(javaType, objectMapper); } @@ -479,9 +479,9 @@ public static TypeCodec json( * * @see Jackson JSON Library */ - @NonNull + @Nonnull public static TypeCodec json( - @NonNull Class javaType, @NonNull ObjectMapper objectMapper) { + @Nonnull Class javaType, @Nonnull ObjectMapper objectMapper) { return new JsonCodec<>(javaType, objectMapper); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/MappingCodec.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/MappingCodec.java index df1a34a566a..ced5226f7d6 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/MappingCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/MappingCodec.java @@ -20,10 +20,10 @@ import com.datastax.oss.driver.api.core.ProtocolVersion; import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A {@link TypeCodec} that maps instances of {@code InnerT}, a driver supported Java type, to @@ -56,13 +56,13 @@ public abstract class MappingCodec implements TypeCodec * @param outerJavaType The outer Java type; must not be null. */ protected MappingCodec( - @NonNull TypeCodec innerCodec, @NonNull GenericType outerJavaType) { + @Nonnull TypeCodec innerCodec, @Nonnull GenericType outerJavaType) { this.innerCodec = Objects.requireNonNull(innerCodec, "innerCodec cannot be null"); this.outerJavaType = Objects.requireNonNull(outerJavaType, "outerJavaType cannot be null"); } /** @return The type of {@code OuterT}. */ - @NonNull + @Nonnull @Override public GenericType getJavaType() { return outerJavaType; @@ -73,23 +73,23 @@ public GenericType getInnerJavaType() { return innerCodec.getJavaType(); } - @NonNull + @Nonnull @Override public DataType getCqlType() { return innerCodec.getCqlType(); } @Override - public ByteBuffer encode(OuterT value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(OuterT value, @Nonnull ProtocolVersion protocolVersion) { return innerCodec.encode(outerToInner(value), protocolVersion); } @Override - public OuterT decode(ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public OuterT decode(ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { return innerToOuter(innerCodec.decode(bytes, protocolVersion)); } - @NonNull + @Nonnull @Override public String format(OuterT value) { return innerCodec.format(outerToInner(value)); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveBooleanCodec.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveBooleanCodec.java index 2ad4f2fa15a..984a1bf5d4e 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveBooleanCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveBooleanCodec.java @@ -18,9 +18,9 @@ package com.datastax.oss.driver.api.core.type.codec; import com.datastax.oss.driver.api.core.ProtocolVersion; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A specialized boolean codec that knows how to deal with primitive types. @@ -31,19 +31,19 @@ public interface PrimitiveBooleanCodec extends TypeCodec { @Nullable - ByteBuffer encodePrimitive(boolean value, @NonNull ProtocolVersion protocolVersion); + ByteBuffer encodePrimitive(boolean value, @Nonnull ProtocolVersion protocolVersion); - boolean decodePrimitive(@Nullable ByteBuffer value, @NonNull ProtocolVersion protocolVersion); + boolean decodePrimitive(@Nullable ByteBuffer value, @Nonnull ProtocolVersion protocolVersion); @Nullable @Override - default ByteBuffer encode(@Nullable Boolean value, @NonNull ProtocolVersion protocolVersion) { + default ByteBuffer encode(@Nullable Boolean value, @Nonnull ProtocolVersion protocolVersion) { return (value == null) ? null : encodePrimitive(value, protocolVersion); } @Nullable @Override - default Boolean decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + default Boolean decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { return (bytes == null || bytes.remaining() == 0) ? null : decodePrimitive(bytes, protocolVersion); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveByteCodec.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveByteCodec.java index 5909bcd4ff9..b52614ef7a3 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveByteCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveByteCodec.java @@ -18,9 +18,9 @@ package com.datastax.oss.driver.api.core.type.codec; import com.datastax.oss.driver.api.core.ProtocolVersion; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A specialized byte codec that knows how to deal with primitive types. @@ -31,19 +31,19 @@ public interface PrimitiveByteCodec extends TypeCodec { @Nullable - ByteBuffer encodePrimitive(byte value, @NonNull ProtocolVersion protocolVersion); + ByteBuffer encodePrimitive(byte value, @Nonnull ProtocolVersion protocolVersion); - byte decodePrimitive(@Nullable ByteBuffer value, @NonNull ProtocolVersion protocolVersion); + byte decodePrimitive(@Nullable ByteBuffer value, @Nonnull ProtocolVersion protocolVersion); @Nullable @Override - default ByteBuffer encode(@Nullable Byte value, @NonNull ProtocolVersion protocolVersion) { + default ByteBuffer encode(@Nullable Byte value, @Nonnull ProtocolVersion protocolVersion) { return (value == null) ? null : encodePrimitive(value, protocolVersion); } @Nullable @Override - default Byte decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + default Byte decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { return (bytes == null || bytes.remaining() == 0) ? null : decodePrimitive(bytes, protocolVersion); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveDoubleCodec.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveDoubleCodec.java index c46160f0942..98dc05e54a8 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveDoubleCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveDoubleCodec.java @@ -18,9 +18,9 @@ package com.datastax.oss.driver.api.core.type.codec; import com.datastax.oss.driver.api.core.ProtocolVersion; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A specialized double codec that knows how to deal with primitive types. @@ -31,19 +31,19 @@ public interface PrimitiveDoubleCodec extends TypeCodec { @Nullable - ByteBuffer encodePrimitive(double value, @NonNull ProtocolVersion protocolVersion); + ByteBuffer encodePrimitive(double value, @Nonnull ProtocolVersion protocolVersion); - double decodePrimitive(@Nullable ByteBuffer value, @NonNull ProtocolVersion protocolVersion); + double decodePrimitive(@Nullable ByteBuffer value, @Nonnull ProtocolVersion protocolVersion); @Nullable @Override - default ByteBuffer encode(@Nullable Double value, @NonNull ProtocolVersion protocolVersion) { + default ByteBuffer encode(@Nullable Double value, @Nonnull ProtocolVersion protocolVersion) { return (value == null) ? null : encodePrimitive(value, protocolVersion); } @Nullable @Override - default Double decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + default Double decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { return (bytes == null || bytes.remaining() == 0) ? null : decodePrimitive(bytes, protocolVersion); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveFloatCodec.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveFloatCodec.java index 585d5fdb1fa..22cbef1ab89 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveFloatCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveFloatCodec.java @@ -18,9 +18,9 @@ package com.datastax.oss.driver.api.core.type.codec; import com.datastax.oss.driver.api.core.ProtocolVersion; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A specialized float codec that knows how to deal with primitive types. @@ -31,19 +31,19 @@ public interface PrimitiveFloatCodec extends TypeCodec { @Nullable - ByteBuffer encodePrimitive(float value, @NonNull ProtocolVersion protocolVersion); + ByteBuffer encodePrimitive(float value, @Nonnull ProtocolVersion protocolVersion); - float decodePrimitive(@Nullable ByteBuffer value, @NonNull ProtocolVersion protocolVersion); + float decodePrimitive(@Nullable ByteBuffer value, @Nonnull ProtocolVersion protocolVersion); @Nullable @Override - default ByteBuffer encode(@Nullable Float value, @NonNull ProtocolVersion protocolVersion) { + default ByteBuffer encode(@Nullable Float value, @Nonnull ProtocolVersion protocolVersion) { return (value == null) ? null : encodePrimitive(value, protocolVersion); } @Nullable @Override - default Float decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + default Float decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { return (bytes == null || bytes.remaining() == 0) ? null : decodePrimitive(bytes, protocolVersion); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveIntCodec.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveIntCodec.java index b3f374eb8d7..40ba59f2577 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveIntCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveIntCodec.java @@ -18,9 +18,9 @@ package com.datastax.oss.driver.api.core.type.codec; import com.datastax.oss.driver.api.core.ProtocolVersion; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A specialized integer codec that knows how to deal with primitive types. @@ -31,19 +31,19 @@ public interface PrimitiveIntCodec extends TypeCodec { @Nullable - ByteBuffer encodePrimitive(int value, @NonNull ProtocolVersion protocolVersion); + ByteBuffer encodePrimitive(int value, @Nonnull ProtocolVersion protocolVersion); - int decodePrimitive(@Nullable ByteBuffer value, @NonNull ProtocolVersion protocolVersion); + int decodePrimitive(@Nullable ByteBuffer value, @Nonnull ProtocolVersion protocolVersion); @Nullable @Override - default ByteBuffer encode(@Nullable Integer value, @NonNull ProtocolVersion protocolVersion) { + default ByteBuffer encode(@Nullable Integer value, @Nonnull ProtocolVersion protocolVersion) { return (value == null) ? null : encodePrimitive(value, protocolVersion); } @Nullable @Override - default Integer decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + default Integer decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { return (bytes == null || bytes.remaining() == 0) ? null : decodePrimitive(bytes, protocolVersion); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveLongCodec.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveLongCodec.java index ec65820c60f..f69c7bbccba 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveLongCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveLongCodec.java @@ -18,9 +18,9 @@ package com.datastax.oss.driver.api.core.type.codec; import com.datastax.oss.driver.api.core.ProtocolVersion; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A specialized long codec that knows how to deal with primitive types. @@ -31,19 +31,19 @@ public interface PrimitiveLongCodec extends TypeCodec { @Nullable - ByteBuffer encodePrimitive(long value, @NonNull ProtocolVersion protocolVersion); + ByteBuffer encodePrimitive(long value, @Nonnull ProtocolVersion protocolVersion); - long decodePrimitive(@Nullable ByteBuffer value, @NonNull ProtocolVersion protocolVersion); + long decodePrimitive(@Nullable ByteBuffer value, @Nonnull ProtocolVersion protocolVersion); @Nullable @Override - default ByteBuffer encode(@Nullable Long value, @NonNull ProtocolVersion protocolVersion) { + default ByteBuffer encode(@Nullable Long value, @Nonnull ProtocolVersion protocolVersion) { return (value == null) ? null : encodePrimitive(value, protocolVersion); } @Nullable @Override - default Long decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + default Long decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { return (bytes == null || bytes.remaining() == 0) ? null : decodePrimitive(bytes, protocolVersion); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveShortCodec.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveShortCodec.java index 48c063b3dc6..81f6a0af4ba 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveShortCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/PrimitiveShortCodec.java @@ -18,9 +18,9 @@ package com.datastax.oss.driver.api.core.type.codec; import com.datastax.oss.driver.api.core.ProtocolVersion; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A specialized short codec that knows how to deal with primitive types. @@ -31,19 +31,19 @@ public interface PrimitiveShortCodec extends TypeCodec { @Nullable - ByteBuffer encodePrimitive(short value, @NonNull ProtocolVersion protocolVersion); + ByteBuffer encodePrimitive(short value, @Nonnull ProtocolVersion protocolVersion); - short decodePrimitive(@Nullable ByteBuffer value, @NonNull ProtocolVersion protocolVersion); + short decodePrimitive(@Nullable ByteBuffer value, @Nonnull ProtocolVersion protocolVersion); @Nullable @Override - default ByteBuffer encode(@Nullable Short value, @NonNull ProtocolVersion protocolVersion) { + default ByteBuffer encode(@Nullable Short value, @Nonnull ProtocolVersion protocolVersion) { return (value == null) ? null : encodePrimitive(value, protocolVersion); } @Nullable @Override - default Short decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + default Short decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { return (bytes == null || bytes.remaining() == 0) ? null : decodePrimitive(bytes, protocolVersion); diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/TypeCodec.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/TypeCodec.java index 05ae3980823..a844a48bf7c 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/TypeCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/TypeCodec.java @@ -25,9 +25,9 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Manages the two-way conversion between a CQL type and a Java type. @@ -62,10 +62,10 @@ */ public interface TypeCodec { - @NonNull + @Nonnull GenericType getJavaType(); - @NonNull + @Nonnull DataType getCqlType(); /** @@ -78,7 +78,7 @@ public interface TypeCodec { * *

    If the argument represents a Java primitive type, its wrapper type is considered instead. */ - default boolean accepts(@NonNull GenericType javaType) { + default boolean accepts(@Nonnull GenericType javaType) { Preconditions.checkNotNull(javaType); return getJavaType().equals(javaType.wrap()); } @@ -95,7 +95,7 @@ default boolean accepts(@NonNull GenericType javaType) { *

    Implementors are encouraged to override this method if there is a more efficient way. In * particular, if the codec targets a final class, the check can be done with a simple {@code ==}. */ - default boolean accepts(@NonNull Class javaClass) { + default boolean accepts(@Nonnull Class javaClass) { Preconditions.checkNotNull(javaClass); if (javaClass.isPrimitive()) { if (javaClass == Boolean.TYPE) { @@ -145,13 +145,13 @@ default boolean accepts(@NonNull Class javaClass) { *

    Finally, if the codec targets a non-generic Java class, it might be possible to implement * this method with a simple {@code instanceof} check. */ - default boolean accepts(@NonNull Object value) { + default boolean accepts(@Nonnull Object value) { Preconditions.checkNotNull(value); return getJavaType().getRawType().isAssignableFrom(value.getClass()); } /** Whether this codec is capable of processing the given CQL type. */ - default boolean accepts(@NonNull DataType cqlType) { + default boolean accepts(@Nonnull DataType cqlType) { Preconditions.checkNotNull(cqlType); return this.getCqlType().equals(cqlType); } @@ -168,7 +168,7 @@ default boolean accepts(@NonNull DataType cqlType) { * */ @Nullable - ByteBuffer encode(@Nullable JavaTypeT value, @NonNull ProtocolVersion protocolVersion); + ByteBuffer encode(@Nullable JavaTypeT value, @Nonnull ProtocolVersion protocolVersion); /** * Decodes a value from the binary format of the CQL type handled by this codec. @@ -190,7 +190,7 @@ default boolean accepts(@NonNull DataType cqlType) { * */ @Nullable - JavaTypeT decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion); + JavaTypeT decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion); /** * Formats the given value as a valid CQL literal according to the CQL type handled by this codec. @@ -213,7 +213,7 @@ default boolean accepts(@NonNull DataType cqlType) { * If you choose not to implement this method, don't throw an exception but instead return a * constant string (for example "XxxCodec.format not implemented"). */ - @NonNull + @Nonnull String format(@Nullable JavaTypeT value); /** diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/TypeCodecs.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/TypeCodecs.java index 9f2fd5cc69e..2f2d821c8ce 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/TypeCodecs.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/TypeCodecs.java @@ -55,7 +55,6 @@ import com.datastax.oss.driver.internal.core.type.codec.VectorCodec; import com.datastax.oss.driver.shaded.guava.common.base.Charsets; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; -import edu.umd.cs.findbugs.annotations.NonNull; import java.math.BigDecimal; import java.math.BigInteger; import java.net.InetAddress; @@ -69,6 +68,7 @@ import java.util.Map; import java.util.Set; import java.util.UUID; +import javax.annotation.Nonnull; /** * Constants and factory methods to obtain instances of the driver's default type codecs. @@ -163,8 +163,8 @@ public class TypeCodecs { * * @param cqlType the fully-qualified name of the custom type. */ - @NonNull - public static TypeCodec custom(@NonNull DataType cqlType) { + @Nonnull + public static TypeCodec custom(@Nonnull DataType cqlType) { Preconditions.checkArgument(cqlType instanceof CustomType, "cqlType must be a custom type"); return new CustomCodec((CustomType) cqlType); } @@ -173,8 +173,8 @@ public static TypeCodec custom(@NonNull DataType cqlType) { * Builds a new codec that maps a CQL list to a Java list, using the given codec to map each * element. */ - @NonNull - public static TypeCodec> listOf(@NonNull TypeCodec elementCodec) { + @Nonnull + public static TypeCodec> listOf(@Nonnull TypeCodec elementCodec) { return new ListCodec<>(DataTypes.listOf(elementCodec.getCqlType()), elementCodec); } @@ -182,8 +182,8 @@ public static TypeCodec> listOf(@NonNull TypeCodec elementCodec) * Builds a new codec that maps a CQL set to a Java set, using the given codec to map each * element. */ - @NonNull - public static TypeCodec> setOf(@NonNull TypeCodec elementCodec) { + @Nonnull + public static TypeCodec> setOf(@Nonnull TypeCodec elementCodec) { return new SetCodec<>(DataTypes.setOf(elementCodec.getCqlType()), elementCodec); } @@ -191,9 +191,9 @@ public static TypeCodec> setOf(@NonNull TypeCodec elementCodec) { * Builds a new codec that maps a CQL map to a Java map, using the given codecs to map each key * and value. */ - @NonNull + @Nonnull public static TypeCodec> mapOf( - @NonNull TypeCodec keyCodec, @NonNull TypeCodec valueCodec) { + @Nonnull TypeCodec keyCodec, @Nonnull TypeCodec valueCodec) { return new MapCodec<>( DataTypes.mapOf(keyCodec.getCqlType(), valueCodec.getCqlType()), keyCodec, valueCodec); } @@ -205,19 +205,19 @@ public static TypeCodec> mapOf( *

    Note that the components of a {@link TupleValue} are stored in their encoded form. They are * encoded/decoded on the fly when you set or get them, using the codec registry. */ - @NonNull - public static TypeCodec tupleOf(@NonNull TupleType cqlType) { + @Nonnull + public static TypeCodec tupleOf(@Nonnull TupleType cqlType) { return new TupleCodec(cqlType); } public static TypeCodec> vectorOf( - @NonNull VectorType type, @NonNull TypeCodec subtypeCodec) { + @Nonnull VectorType type, @Nonnull TypeCodec subtypeCodec) { return new VectorCodec( DataTypes.vectorOf(subtypeCodec.getCqlType(), type.getDimensions()), subtypeCodec); } public static TypeCodec> vectorOf( - int dimensions, @NonNull TypeCodec subtypeCodec) { + int dimensions, @Nonnull TypeCodec subtypeCodec) { return new VectorCodec(DataTypes.vectorOf(subtypeCodec.getCqlType(), dimensions), subtypeCodec); } @@ -228,8 +228,8 @@ public static TypeCodec> vectorOf( *

    Note that the fields of a {@link UdtValue} are stored in their encoded form. They are * encoded/decoded on the fly when you set or get them, using the codec registry. */ - @NonNull - public static TypeCodec udtOf(@NonNull UserDefinedType cqlType) { + @Nonnull + public static TypeCodec udtOf(@Nonnull UserDefinedType cqlType) { return new UdtCodec(cqlType); } @@ -257,8 +257,8 @@ public static TypeCodec udtOf(@NonNull UserDefinedType cqlType) { *

    This exists for historical reasons: the method was originally defined in this class, but * technically it belongs to {@link ExtraTypeCodecs} because this is not a built-in mapping. */ - @NonNull - public static TypeCodec zonedTimestampAt(@NonNull ZoneId timeZone) { + @Nonnull + public static TypeCodec zonedTimestampAt(@Nonnull ZoneId timeZone) { return ExtraTypeCodecs.zonedTimestampAt(timeZone); } } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/registry/CodecRegistry.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/registry/CodecRegistry.java index 36472f34c79..520b1612e21 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/registry/CodecRegistry.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/codec/registry/CodecRegistry.java @@ -30,8 +30,8 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.internal.core.type.codec.registry.DefaultCodecRegistry; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; +import javax.annotation.Nonnull; /** * Provides codecs to convert CQL types to their Java equivalent, and vice-versa. @@ -79,9 +79,9 @@ public void register(TypeCodec newCodec) { * * @throws CodecNotFoundException if there is no such codec. */ - @NonNull + @Nonnull TypeCodec codecFor( - @NonNull DataType cqlType, @NonNull GenericType javaType); + @Nonnull DataType cqlType, @Nonnull GenericType javaType); /** * Shortcut for {@link #codecFor(DataType, GenericType) codecFor(cqlType, @@ -92,9 +92,9 @@ TypeCodec codecFor( * * @throws CodecNotFoundException if there is no such codec. */ - @NonNull + @Nonnull default TypeCodec codecFor( - @NonNull DataType cqlType, @NonNull Class javaType) { + @Nonnull DataType cqlType, @Nonnull Class javaType) { return codecFor(cqlType, GenericType.of(javaType)); } @@ -111,8 +111,8 @@ default TypeCodec codecFor( * * @throws CodecNotFoundException if there is no such codec. */ - @NonNull - TypeCodec codecFor(@NonNull DataType cqlType); + @Nonnull + TypeCodec codecFor(@Nonnull DataType cqlType); /** * Returns a codec to convert the given Java type to the CQL type deemed most appropriate to @@ -128,8 +128,8 @@ default TypeCodec codecFor( * * @throws CodecNotFoundException if there is no such codec. */ - @NonNull - TypeCodec codecFor(@NonNull GenericType javaType); + @Nonnull + TypeCodec codecFor(@Nonnull GenericType javaType); /** * Shortcut for {@link #codecFor(GenericType) codecFor(GenericType.of(javaType))}. @@ -139,8 +139,8 @@ default TypeCodec codecFor( * * @throws CodecNotFoundException if there is no such codec. */ - @NonNull - default TypeCodec codecFor(@NonNull Class javaType) { + @Nonnull + default TypeCodec codecFor(@Nonnull Class javaType) { return codecFor(GenericType.of(javaType)); } @@ -160,8 +160,8 @@ default TypeCodec codecFor(@NonNull Class java * * @throws CodecNotFoundException if there is no such codec. */ - @NonNull - TypeCodec codecFor(@NonNull DataType cqlType, @NonNull JavaTypeT value); + @Nonnull + TypeCodec codecFor(@Nonnull DataType cqlType, @Nonnull JavaTypeT value); /** * Returns a codec to convert the given Java object to the CQL type deemed most appropriate to @@ -183,6 +183,6 @@ default TypeCodec codecFor(@NonNull Class java * * @throws CodecNotFoundException if there is no such codec. */ - @NonNull - TypeCodec codecFor(@NonNull JavaTypeT value); + @Nonnull + TypeCodec codecFor(@Nonnull JavaTypeT value); } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/reflect/GenericType.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/reflect/GenericType.java index c6482d4f4d1..07bfb73a694 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/reflect/GenericType.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/reflect/GenericType.java @@ -27,8 +27,6 @@ import com.datastax.oss.driver.shaded.guava.common.reflect.TypeParameter; import com.datastax.oss.driver.shaded.guava.common.reflect.TypeResolver; import com.datastax.oss.driver.shaded.guava.common.reflect.TypeToken; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.lang.reflect.Type; import java.math.BigDecimal; import java.math.BigInteger; @@ -45,6 +43,8 @@ import java.util.Optional; import java.util.Set; import java.util.UUID; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; /** @@ -112,103 +112,103 @@ public class GenericType { public static final GenericType UDT_VALUE = of(UdtValue.class); public static final GenericType DURATION = of(Duration.class); - @NonNull - public static GenericType of(@NonNull Class type) { + @Nonnull + public static GenericType of(@Nonnull Class type) { return new SimpleGenericType<>(type); } - @NonNull - public static GenericType of(@NonNull java.lang.reflect.Type type) { + @Nonnull + public static GenericType of(@Nonnull java.lang.reflect.Type type) { return new GenericType<>(TypeToken.of(type)); } - @NonNull - public static GenericType> listOf(@NonNull Class elementType) { + @Nonnull + public static GenericType> listOf(@Nonnull Class elementType) { TypeToken> token = new TypeToken>() {}.where(new TypeParameter() {}, TypeToken.of(elementType)); return new GenericType<>(token); } - @NonNull - public static GenericType> listOf(@NonNull GenericType elementType) { + @Nonnull + public static GenericType> listOf(@Nonnull GenericType elementType) { TypeToken> token = new TypeToken>() {}.where(new TypeParameter() {}, elementType.token); return new GenericType<>(token); } - @NonNull - public static GenericType> setOf(@NonNull Class elementType) { + @Nonnull + public static GenericType> setOf(@Nonnull Class elementType) { TypeToken> token = new TypeToken>() {}.where(new TypeParameter() {}, TypeToken.of(elementType)); return new GenericType<>(token); } - @NonNull - public static GenericType> setOf(@NonNull GenericType elementType) { + @Nonnull + public static GenericType> setOf(@Nonnull GenericType elementType) { TypeToken> token = new TypeToken>() {}.where(new TypeParameter() {}, elementType.token); return new GenericType<>(token); } - @NonNull + @Nonnull public static GenericType> vectorOf( - @NonNull Class elementType) { + @Nonnull Class elementType) { TypeToken> token = new TypeToken>() {}.where( new TypeParameter() {}, TypeToken.of(elementType)); return new GenericType<>(token); } - @NonNull + @Nonnull public static GenericType> vectorOf( - @NonNull GenericType elementType) { + @Nonnull GenericType elementType) { TypeToken> token = new TypeToken>() {}.where(new TypeParameter() {}, elementType.token); return new GenericType<>(token); } - @NonNull + @Nonnull public static GenericType> mapOf( - @NonNull Class keyType, @NonNull Class valueType) { + @Nonnull Class keyType, @Nonnull Class valueType) { TypeToken> token = new TypeToken>() {}.where(new TypeParameter() {}, TypeToken.of(keyType)) .where(new TypeParameter() {}, TypeToken.of(valueType)); return new GenericType<>(token); } - @NonNull + @Nonnull public static GenericType> mapOf( - @NonNull GenericType keyType, @NonNull GenericType valueType) { + @Nonnull GenericType keyType, @Nonnull GenericType valueType) { TypeToken> token = new TypeToken>() {}.where(new TypeParameter() {}, keyType.token) .where(new TypeParameter() {}, valueType.token); return new GenericType<>(token); } - @NonNull - public static GenericType arrayOf(@NonNull Class componentType) { + @Nonnull + public static GenericType arrayOf(@Nonnull Class componentType) { TypeToken token = new TypeToken() {}.where(new TypeParameter() {}, TypeToken.of(componentType)); return new GenericType<>(token); } - @NonNull - public static GenericType arrayOf(@NonNull GenericType componentType) { + @Nonnull + public static GenericType arrayOf(@Nonnull GenericType componentType) { TypeToken token = new TypeToken() {}.where(new TypeParameter() {}, componentType.token); return new GenericType<>(token); } - @NonNull - public static GenericType> optionalOf(@NonNull Class componentType) { + @Nonnull + public static GenericType> optionalOf(@Nonnull Class componentType) { TypeToken> token = new TypeToken>() {}.where( new TypeParameter() {}, TypeToken.of(componentType)); return new GenericType<>(token); } - @NonNull - public static GenericType> optionalOf(@NonNull GenericType componentType) { + @Nonnull + public static GenericType> optionalOf(@Nonnull GenericType componentType) { TypeToken> token = new TypeToken>() {}.where(new TypeParameter() {}, componentType.token); return new GenericType<>(token); @@ -230,7 +230,7 @@ protected GenericType() { * href="http://docs.oracle.com/javase/specs/jls/se8/html/jls-4.html#jls-4.5.1">the rules for type * arguments introduced with Java generics. */ - public final boolean isSupertypeOf(@NonNull GenericType type) { + public final boolean isSupertypeOf(@Nonnull GenericType type) { return token.isSupertypeOf(type.token); } @@ -240,7 +240,7 @@ public final boolean isSupertypeOf(@NonNull GenericType type) { * href="http://docs.oracle.com/javase/specs/jls/se8/html/jls-4.html#jls-4.5.1">the rules for type * arguments introduced with Java generics. */ - public final boolean isSubtypeOf(@NonNull GenericType type) { + public final boolean isSubtypeOf(@Nonnull GenericType type) { return token.isSubtypeOf(type.token); } @@ -261,7 +261,7 @@ public final boolean isPrimitive() { * Returns the corresponding wrapper type if this is a primitive type; otherwise returns {@code * this} itself. Idempotent. */ - @NonNull + @Nonnull public final GenericType wrap() { if (isPrimitive()) { return new GenericType<>(token.wrap()); @@ -273,7 +273,7 @@ public final GenericType wrap() { * Returns the corresponding primitive type if this is a wrapper type; otherwise returns {@code * this} itself. Idempotent. */ - @NonNull + @Nonnull public final GenericType unwrap() { if (Primitives.allWrapperTypes().contains(token.getRawType())) { return new GenericType<>(token.unwrap()); @@ -285,9 +285,9 @@ public final GenericType unwrap() { * Substitutes a free type variable with an actual type. See {@link GenericType this class's * javadoc} for an example. */ - @NonNull + @Nonnull public final GenericType where( - @NonNull GenericTypeParameter freeVariable, @NonNull GenericType actualType) { + @Nonnull GenericTypeParameter freeVariable, @Nonnull GenericType actualType) { TypeResolver resolver = new TypeResolver().where(freeVariable.getTypeVariable(), actualType.__getToken().getType()); Type resolvedType = resolver.resolveType(this.token.getType()); @@ -300,9 +300,9 @@ public final GenericType where( * Substitutes a free type variable with an actual type. See {@link GenericType this class's * javadoc} for an example. */ - @NonNull + @Nonnull public final GenericType where( - @NonNull GenericTypeParameter freeVariable, @NonNull Class actualType) { + @Nonnull GenericTypeParameter freeVariable, @Nonnull Class actualType) { return where(freeVariable, GenericType.of(actualType)); } @@ -331,7 +331,7 @@ public final GenericType getComponentType() { * is returned. For example: {@code => Foo}. * */ - @NonNull + @Nonnull public Class getRawType() { return token.getRawType(); } @@ -342,8 +342,8 @@ public Class getRawType() { * Iterable.class}. */ @SuppressWarnings("unchecked") - @NonNull - public final GenericType getSupertype(@NonNull Class superclass) { + @Nonnull + public final GenericType getSupertype(@Nonnull Class superclass) { return new GenericType(token.getSupertype(superclass)); } @@ -353,13 +353,13 @@ public final GenericType getSupertype(@NonNull Class super * returned. */ @SuppressWarnings("unchecked") - @NonNull - public final GenericType getSubtype(@NonNull Class subclass) { + @Nonnull + public final GenericType getSubtype(@Nonnull Class subclass) { return new GenericType(token.getSubtype(subclass)); } /** Returns the represented type. */ - @NonNull + @Nonnull public final Type getType() { return token.getType(); } @@ -372,7 +372,7 @@ public final Type getType() { * * @leaks-private-api */ - @NonNull + @Nonnull public TypeToken __getToken() { return token; } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/type/reflect/GenericTypeParameter.java b/core/src/main/java/com/datastax/oss/driver/api/core/type/reflect/GenericTypeParameter.java index 3bf0e3537e0..dc166ede690 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/type/reflect/GenericTypeParameter.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/type/reflect/GenericTypeParameter.java @@ -18,10 +18,10 @@ package com.datastax.oss.driver.api.core.type.reflect; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; -import edu.umd.cs.findbugs.annotations.NonNull; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; /** @@ -41,7 +41,7 @@ protected GenericTypeParameter() { (TypeVariable) ((ParameterizedType) superclass).getActualTypeArguments()[0]; } - @NonNull + @Nonnull public TypeVariable getTypeVariable() { return typeVariable; } diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/uuid/Uuids.java b/core/src/main/java/com/datastax/oss/driver/api/core/uuid/Uuids.java index 8dae31f3734..fd6e1b97ac7 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/uuid/Uuids.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/uuid/Uuids.java @@ -21,7 +21,6 @@ import com.datastax.oss.driver.internal.core.util.Loggers; import com.datastax.oss.driver.shaded.guava.common.annotations.VisibleForTesting; import com.datastax.oss.driver.shaded.guava.common.base.Charsets; -import edu.umd.cs.findbugs.annotations.NonNull; import java.lang.management.ManagementFactory; import java.net.InetAddress; import java.net.NetworkInterface; @@ -40,6 +39,7 @@ import java.util.SplittableRandom; import java.util.UUID; import java.util.concurrent.atomic.AtomicLong; +import javax.annotation.Nonnull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -279,7 +279,7 @@ private static long makeClockSeqAndNode() { * cryptographic strength, consider using {@link Uuids#random(Random)} instead, and pass an * instance of {@link java.security.SecureRandom}. */ - @NonNull + @Nonnull public static UUID random() { return random(new Random()); } @@ -297,8 +297,8 @@ public static UUID random() { * I/O activity during random number generation; these instances should not be used in * non-blocking contexts. */ - @NonNull - public static UUID random(@NonNull Random random) { + @Nonnull + public static UUID random(@Nonnull Random random) { byte[] data = new byte[16]; random.nextBytes(data); return buildUuid(data, 4); @@ -311,8 +311,8 @@ public static UUID random(@NonNull Random random) { * parallel computations, such as when using the ForkJoin framework. Note that {@link * SplittableRandom} instances are not thread-safe. */ - @NonNull - public static UUID random(@NonNull SplittableRandom random) { + @Nonnull + public static UUID random(@Nonnull SplittableRandom random) { byte[] data = toBytes(random.nextLong(), random.nextLong()); return buildUuid(data, 4); } @@ -329,8 +329,8 @@ public static UUID random(@NonNull SplittableRandom random) { * @throws IllegalStateException if the {@link MessageDigest} algorithm for version 3 (MD5) is not * available on this platform. */ - @NonNull - public static UUID nameBased(@NonNull UUID namespace, @NonNull String name) { + @Nonnull + public static UUID nameBased(@Nonnull UUID namespace, @Nonnull String name) { Objects.requireNonNull(name, "name cannot be null"); return nameBased(namespace, name.getBytes(StandardCharsets.UTF_8)); } @@ -345,8 +345,8 @@ public static UUID nameBased(@NonNull UUID namespace, @NonNull String name) { * @throws IllegalStateException if the {@link MessageDigest} algorithm for version 3 (MD5) is not * available on this platform. */ - @NonNull - public static UUID nameBased(@NonNull UUID namespace, @NonNull byte[] name) { + @Nonnull + public static UUID nameBased(@Nonnull UUID namespace, @Nonnull byte[] name) { return nameBased(namespace, name, 3); } @@ -365,8 +365,8 @@ public static UUID nameBased(@NonNull UUID namespace, @NonNull byte[] name) { * @throws IllegalStateException if the {@link MessageDigest} algorithm for the desired version is * not available on this platform. */ - @NonNull - public static UUID nameBased(@NonNull UUID namespace, @NonNull String name, int version) { + @Nonnull + public static UUID nameBased(@Nonnull UUID namespace, @Nonnull String name, int version) { Objects.requireNonNull(name, "name cannot be null"); return nameBased(namespace, name.getBytes(StandardCharsets.UTF_8), version); } @@ -384,8 +384,8 @@ public static UUID nameBased(@NonNull UUID namespace, @NonNull String name, int * @throws IllegalStateException if the {@link MessageDigest} algorithm for the desired version is * not available on this platform. */ - @NonNull - public static UUID nameBased(@NonNull UUID namespace, @NonNull byte[] name, int version) { + @Nonnull + public static UUID nameBased(@Nonnull UUID namespace, @Nonnull byte[] name, int version) { Objects.requireNonNull(namespace, "namespace cannot be null"); Objects.requireNonNull(name, "name cannot be null"); MessageDigest md = newMessageDigest(version); @@ -408,8 +408,8 @@ public static UUID nameBased(@NonNull UUID namespace, @NonNull byte[] name, int * @throws IllegalStateException if the {@link MessageDigest} algorithm for version 3 (MD5) is not * available on this platform. */ - @NonNull - public static UUID nameBased(@NonNull byte[] namespaceAndName) { + @Nonnull + public static UUID nameBased(@Nonnull byte[] namespaceAndName) { return nameBased(namespaceAndName, 3); } @@ -429,8 +429,8 @@ public static UUID nameBased(@NonNull byte[] namespaceAndName) { * @throws IllegalStateException if the {@link MessageDigest} algorithm for the desired version is * not available on this platform. */ - @NonNull - public static UUID nameBased(@NonNull byte[] namespaceAndName, int version) { + @Nonnull + public static UUID nameBased(@Nonnull byte[] namespaceAndName, int version) { Objects.requireNonNull(namespaceAndName, "namespaceAndName cannot be null"); if (namespaceAndName.length < 16) { throw new IllegalArgumentException("namespaceAndName must be at least 16 bytes long"); @@ -440,7 +440,7 @@ public static UUID nameBased(@NonNull byte[] namespaceAndName, int version) { return buildUuid(md.digest(), version); } - @NonNull + @Nonnull private static MessageDigest newMessageDigest(int version) { if (version != 3 && version != 5) { throw new IllegalArgumentException( @@ -454,8 +454,8 @@ private static MessageDigest newMessageDigest(int version) { } } - @NonNull - private static UUID buildUuid(@NonNull byte[] data, int version) { + @Nonnull + private static UUID buildUuid(@Nonnull byte[] data, int version) { // clear and set version data[6] &= (byte) 0x0f; data[6] |= (byte) (version << 4); @@ -520,7 +520,7 @@ private static byte[] toBytes(long msb, long lsb) { * consider invoking this method once from a thread that is allowed to block. Subsequent * invocations are guaranteed not to block. */ - @NonNull + @Nonnull public static UUID timeBased() { return new UUID(makeMsb(getCurrentTimestamp()), CLOCK_SEQ_AND_NODE.get()); } @@ -551,7 +551,7 @@ public static UUID timeBased() { * @param timestamp the Unix timestamp for which the created UUID must be a lower bound. * @return the smallest (for Cassandra {@code timeuuid} sorting) UUID of {@code timestamp}. */ - @NonNull + @Nonnull public static UUID startOf(long timestamp) { return new UUID(makeMsb(fromUnixTimestamp(timestamp)), MIN_CLOCK_SEQ_AND_NODE); } @@ -565,7 +565,7 @@ public static UUID startOf(long timestamp) { * @param timestamp the Unix timestamp for which the created UUID must be an upper bound. * @return the biggest (for Cassandra {@code timeuuid} sorting) UUID of {@code timestamp}. */ - @NonNull + @Nonnull public static UUID endOf(long timestamp) { long uuidTstamp = fromUnixTimestamp(timestamp + 1) - 1; return new UUID(makeMsb(uuidTstamp), MAX_CLOCK_SEQ_AND_NODE); @@ -584,7 +584,7 @@ public static UUID endOf(long timestamp) { * * @throws IllegalArgumentException if {@code uuid} is not a version 1 UUID. */ - public static long unixTimestamp(@NonNull UUID uuid) { + public static long unixTimestamp(@Nonnull UUID uuid) { if (uuid.version() != 1) { throw new IllegalArgumentException( String.format( diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/AsyncPagingIterableWrapper.java b/core/src/main/java/com/datastax/oss/driver/internal/core/AsyncPagingIterableWrapper.java index 055ab26909f..f48da47a9e8 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/AsyncPagingIterableWrapper.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/AsyncPagingIterableWrapper.java @@ -22,10 +22,10 @@ import com.datastax.oss.driver.api.core.cql.ColumnDefinitions; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.shaded.guava.common.collect.AbstractIterator; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Iterator; import java.util.concurrent.CompletionStage; import java.util.function.Function; +import javax.annotation.Nonnull; public class AsyncPagingIterableWrapper implements MappedAsyncPagingIterable { @@ -54,13 +54,13 @@ protected TargetT computeNext() { this.currentPage = () -> iterator; } - @NonNull + @Nonnull @Override public ColumnDefinitions getColumnDefinitions() { return source.getColumnDefinitions(); } - @NonNull + @Nonnull @Override public ExecutionInfo getExecutionInfo() { return source.getExecutionInfo(); @@ -71,7 +71,7 @@ public int remaining() { return source.remaining(); } - @NonNull + @Nonnull @Override public Iterable currentPage() { return currentPage; @@ -82,7 +82,7 @@ public boolean hasMorePages() { return source.hasMorePages(); } - @NonNull + @Nonnull @Override public CompletionStage> fetchNextPage() throws IllegalStateException { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/CqlIdentifiers.java b/core/src/main/java/com/datastax/oss/driver/internal/core/CqlIdentifiers.java index a00da0e4b1a..ea1d8f49bb0 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/CqlIdentifiers.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/CqlIdentifiers.java @@ -20,17 +20,17 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.function.Function; +import javax.annotation.Nonnull; public class CqlIdentifiers { - @NonNull + @Nonnull private static List wrap( - @NonNull Iterable in, @NonNull Function fn) { + @Nonnull Iterable in, @Nonnull Function fn) { Objects.requireNonNull(in, "Input Iterable must not be null"); Objects.requireNonNull(fn, "CqlIdentifier conversion function must not be null"); @@ -41,19 +41,19 @@ private static List wrap( return builder.build(); } - @NonNull - public static List wrap(@NonNull Iterable in) { + @Nonnull + public static List wrap(@Nonnull Iterable in) { return wrap(in, CqlIdentifier::fromCql); } - @NonNull - public static List wrapInternal(@NonNull Iterable in) { + @Nonnull + public static List wrapInternal(@Nonnull Iterable in) { return wrap(in, CqlIdentifier::fromInternal); } - @NonNull + @Nonnull private static Map wrapKeys( - @NonNull Map in, @NonNull Function fn) { + @Nonnull Map in, @Nonnull Function fn) { Objects.requireNonNull(in, "Input Map must not be null"); Objects.requireNonNull(fn, "CqlIdentifier conversion function must not be null"); ImmutableMap.Builder builder = ImmutableMap.builder(); @@ -63,13 +63,13 @@ private static Map wrapKeys( return builder.build(); } - @NonNull - public static Map wrapKeys(@NonNull Map in) { + @Nonnull + public static Map wrapKeys(@Nonnull Map in) { return wrapKeys(in, CqlIdentifier::fromCql); } - @NonNull - public static Map wrapKeysInternal(@NonNull Map in) { + @Nonnull + public static Map wrapKeysInternal(@Nonnull Map in) { return wrapKeys(in, CqlIdentifier::fromInternal); } } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/DefaultMavenCoordinates.java b/core/src/main/java/com/datastax/oss/driver/internal/core/DefaultMavenCoordinates.java index 8280ae8fec5..db64a70302e 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/DefaultMavenCoordinates.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/DefaultMavenCoordinates.java @@ -19,7 +19,6 @@ import com.datastax.oss.driver.api.core.MavenCoordinates; import com.datastax.oss.driver.api.core.Version; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.buffer.ByteBuf; import java.io.IOException; import java.io.InputStreamReader; @@ -27,6 +26,7 @@ import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.Properties; +import javax.annotation.Nonnull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -73,25 +73,25 @@ public DefaultMavenCoordinates(String name, String groupId, String artifactId, V this.version = version; } - @NonNull + @Nonnull @Override public String getName() { return name; } - @NonNull + @Nonnull @Override public String getGroupId() { return groupId; } - @NonNull + @Nonnull @Override public String getArtifactId() { return artifactId; } - @NonNull + @Nonnull @Override public Version getVersion() { return version; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/PagingIterableWrapper.java b/core/src/main/java/com/datastax/oss/driver/internal/core/PagingIterableWrapper.java index 1f79f673d02..e0167f2ed8a 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/PagingIterableWrapper.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/PagingIterableWrapper.java @@ -22,11 +22,11 @@ import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.internal.core.cql.PagingIterableSpliterator; import com.datastax.oss.driver.shaded.guava.common.collect.AbstractIterator; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Iterator; import java.util.List; import java.util.Spliterator; import java.util.function.Function; +import javax.annotation.Nonnull; public class PagingIterableWrapper implements PagingIterable { @@ -42,8 +42,8 @@ public class PagingIterableWrapper implements PagingIterable source, - @NonNull Function elementMapper) { + @Nonnull PagingIterable source, + @Nonnull Function elementMapper) { this(source, elementMapper, false); } @@ -57,8 +57,8 @@ public PagingIterableWrapper( * @param sized Whether this iterable has a known size or not. */ public PagingIterableWrapper( - @NonNull PagingIterable source, - @NonNull Function elementMapper, + @Nonnull PagingIterable source, + @Nonnull Function elementMapper, boolean sized) { this.source = source; this.sized = sized; @@ -74,13 +74,13 @@ protected TargetT computeNext() { }; } - @NonNull + @Nonnull @Override public ColumnDefinitions getColumnDefinitions() { return source.getColumnDefinitions(); } - @NonNull + @Nonnull @Override public List getExecutionInfos() { return source.getExecutionInfos(); @@ -101,13 +101,13 @@ public boolean wasApplied() { return source.wasApplied(); } - @NonNull + @Nonnull @Override public Iterator iterator() { return iterator; } - @NonNull + @Nonnull @Override public Spliterator spliterator() { PagingIterableSpliterator.Builder builder = PagingIterableSpliterator.builder(this); @@ -117,7 +117,7 @@ public Spliterator spliterator() { return builder.build(); } - @NonNull + @Nonnull @Override public PagingIterable map( Function elementMapper) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/addresstranslation/Ec2MultiRegionAddressTranslator.java b/core/src/main/java/com/datastax/oss/driver/internal/core/addresstranslation/Ec2MultiRegionAddressTranslator.java index 88e6cdb3bb2..c93cb40e8f0 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/addresstranslation/Ec2MultiRegionAddressTranslator.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/addresstranslation/Ec2MultiRegionAddressTranslator.java @@ -21,11 +21,11 @@ import com.datastax.oss.driver.api.core.context.DriverContext; import com.datastax.oss.driver.internal.core.util.Loggers; import com.datastax.oss.driver.shaded.guava.common.annotations.VisibleForTesting; -import edu.umd.cs.findbugs.annotations.NonNull; import java.net.InetAddress; import java.net.InetSocketAddress; import java.util.Enumeration; import java.util.Hashtable; +import javax.annotation.Nonnull; import javax.naming.Context; import javax.naming.NamingEnumeration; import javax.naming.NamingException; @@ -62,7 +62,7 @@ public class Ec2MultiRegionAddressTranslator implements AddressTranslator { private final String logPrefix; public Ec2MultiRegionAddressTranslator( - @SuppressWarnings("unused") @NonNull DriverContext context) { + @SuppressWarnings("unused") @Nonnull DriverContext context) { this.logPrefix = context.getSessionName(); @SuppressWarnings("JdkObsolete") Hashtable env = new Hashtable<>(); @@ -75,14 +75,14 @@ public Ec2MultiRegionAddressTranslator( } @VisibleForTesting - Ec2MultiRegionAddressTranslator(@NonNull DirContext ctx) { + Ec2MultiRegionAddressTranslator(@Nonnull DirContext ctx) { this.logPrefix = "test"; this.ctx = ctx; } - @NonNull + @Nonnull @Override - public InetSocketAddress translate(@NonNull InetSocketAddress socketAddress) { + public InetSocketAddress translate(@Nonnull InetSocketAddress socketAddress) { InetAddress address = socketAddress.getAddress(); try { // InetAddress#getHostName() is supposed to perform a reverse DNS lookup, but for some reason diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/addresstranslation/FixedHostNameAddressTranslator.java b/core/src/main/java/com/datastax/oss/driver/internal/core/addresstranslation/FixedHostNameAddressTranslator.java index 4fb9782f566..27596ef1715 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/addresstranslation/FixedHostNameAddressTranslator.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/addresstranslation/FixedHostNameAddressTranslator.java @@ -20,8 +20,8 @@ import com.datastax.oss.driver.api.core.addresstranslation.AddressTranslator; import com.datastax.oss.driver.api.core.config.DriverOption; import com.datastax.oss.driver.api.core.context.DriverContext; -import edu.umd.cs.findbugs.annotations.NonNull; import java.net.InetSocketAddress; +import javax.annotation.Nonnull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,7 +42,7 @@ public class FixedHostNameAddressTranslator implements AddressTranslator { public static DriverOption ADDRESS_TRANSLATOR_ADVERTISED_HOSTNAME_OPTION = new DriverOption() { - @NonNull + @Nonnull @Override public String getPath() { return ADDRESS_TRANSLATOR_ADVERTISED_HOSTNAME; @@ -52,7 +52,7 @@ public String getPath() { private final String advertisedHostname; private final String logPrefix; - public FixedHostNameAddressTranslator(@NonNull DriverContext context) { + public FixedHostNameAddressTranslator(@Nonnull DriverContext context) { logPrefix = context.getSessionName(); advertisedHostname = context @@ -61,9 +61,9 @@ public FixedHostNameAddressTranslator(@NonNull DriverContext context) { .getString(ADDRESS_TRANSLATOR_ADVERTISED_HOSTNAME_OPTION); } - @NonNull + @Nonnull @Override - public InetSocketAddress translate(@NonNull InetSocketAddress address) { + public InetSocketAddress translate(@Nonnull InetSocketAddress address) { final int port = address.getPort(); LOG.debug("[{}] Resolved {}:{} to {}:{}", logPrefix, address, port, advertisedHostname, port); return new InetSocketAddress(advertisedHostname, port); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/addresstranslation/PassThroughAddressTranslator.java b/core/src/main/java/com/datastax/oss/driver/internal/core/addresstranslation/PassThroughAddressTranslator.java index 0922821be8c..7a2b480be8a 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/addresstranslation/PassThroughAddressTranslator.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/addresstranslation/PassThroughAddressTranslator.java @@ -19,8 +19,8 @@ import com.datastax.oss.driver.api.core.addresstranslation.AddressTranslator; import com.datastax.oss.driver.api.core.context.DriverContext; -import edu.umd.cs.findbugs.annotations.NonNull; import java.net.InetSocketAddress; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; /** @@ -46,9 +46,9 @@ public PassThroughAddressTranslator(@SuppressWarnings("unused") DriverContext co // nothing to do } - @NonNull + @Nonnull @Override - public InetSocketAddress translate(@NonNull InetSocketAddress address) { + public InetSocketAddress translate(@Nonnull InetSocketAddress address) { return address; } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/adminrequest/AdminResult.java b/core/src/main/java/com/datastax/oss/driver/internal/core/adminrequest/AdminResult.java index 686cc05c6b0..cc41012cac9 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/adminrequest/AdminResult.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/adminrequest/AdminResult.java @@ -23,13 +23,13 @@ import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; import com.datastax.oss.protocol.internal.response.result.ColumnSpec; import com.datastax.oss.protocol.internal.response.result.Rows; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Queue; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; import net.jcip.annotations.NotThreadSafe; @NotThreadSafe // wraps a mutable queue @@ -57,7 +57,7 @@ public AdminResult( } /** This consumes the result's data and can be called only once. */ - @NonNull + @Nonnull @Override public Iterator iterator() { return new AbstractIterator() { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/adminrequest/AdminRow.java b/core/src/main/java/com/datastax/oss/driver/internal/core/adminrequest/AdminRow.java index 6e32ea845fb..c0c608e589b 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/adminrequest/AdminRow.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/adminrequest/AdminRow.java @@ -23,13 +23,13 @@ import com.datastax.oss.driver.shaded.guava.common.annotations.VisibleForTesting; import com.datastax.oss.protocol.internal.ProtocolConstants; import com.datastax.oss.protocol.internal.response.result.ColumnSpec; -import edu.umd.cs.findbugs.annotations.Nullable; import java.net.InetAddress; import java.nio.ByteBuffer; import java.util.List; import java.util.Map; import java.util.Set; import java.util.UUID; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; @Immutable diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/adminrequest/ThrottledAdminRequestHandler.java b/core/src/main/java/com/datastax/oss/driver/internal/core/adminrequest/ThrottledAdminRequestHandler.java index 40ab21b759a..db8dc1ef6d1 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/adminrequest/ThrottledAdminRequestHandler.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/adminrequest/ThrottledAdminRequestHandler.java @@ -32,12 +32,12 @@ import com.datastax.oss.protocol.internal.response.Result; import com.datastax.oss.protocol.internal.response.result.Prepared; import com.datastax.oss.protocol.internal.response.result.Rows; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.time.Duration; import java.util.Map; import java.util.concurrent.CompletionStage; import java.util.concurrent.TimeUnit; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -150,7 +150,7 @@ public void onThrottleReady(boolean wasDelayed) { } @Override - public void onThrottleFailure(@NonNull RequestThrottlingException error) { + public void onThrottleFailure(@Nonnull RequestThrottlingException error) { metricUpdater.incrementCounter(DefaultSessionMetric.THROTTLING_ERRORS, null); setFinalError(error); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/auth/PlainTextAuthProvider.java b/core/src/main/java/com/datastax/oss/driver/internal/core/auth/PlainTextAuthProvider.java index f2dfdf14171..25e2b9f4bbc 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/auth/PlainTextAuthProvider.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/auth/PlainTextAuthProvider.java @@ -24,7 +24,7 @@ import com.datastax.oss.driver.api.core.config.DriverExecutionProfile; import com.datastax.oss.driver.api.core.context.DriverContext; import com.datastax.oss.driver.api.core.metadata.EndPoint; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; /** @@ -64,10 +64,10 @@ public PlainTextAuthProvider(DriverContext context) { this.config = context.getConfig().getDefaultProfile(); } - @NonNull + @Nonnull @Override protected Credentials getCredentials( - @NonNull EndPoint endPoint, @NonNull String serverAuthenticator) { + @Nonnull EndPoint endPoint, @Nonnull String serverAuthenticator) { // It's not valid to use the PlainTextAuthProvider without a username or password, error out // early here AuthUtils.validateConfigPresent( diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/config/DerivedExecutionProfile.java b/core/src/main/java/com/datastax/oss/driver/internal/core/config/DerivedExecutionProfile.java index 39c37d78c10..3a49a6718c3 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/config/DerivedExecutionProfile.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/config/DerivedExecutionProfile.java @@ -21,13 +21,13 @@ import com.datastax.oss.driver.api.core.config.DriverOption; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableSortedSet; -import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; import java.util.AbstractMap; import java.util.List; import java.util.Map; import java.util.SortedSet; import java.util.function.BiFunction; +import javax.annotation.Nonnull; public class DerivedExecutionProfile implements DriverExecutionProfile { @@ -65,14 +65,14 @@ public DerivedExecutionProfile( this.overrides = overrides; } - @NonNull + @Nonnull @Override public String getName() { return baseProfile.getName(); } @Override - public boolean isDefined(@NonNull DriverOption option) { + public boolean isDefined(@Nonnull DriverOption option) { if (overrides.containsKey(option)) { return overrides.get(option) != NO_VALUE; } else { @@ -81,94 +81,94 @@ public boolean isDefined(@NonNull DriverOption option) { } @Override - public boolean getBoolean(@NonNull DriverOption option) { + public boolean getBoolean(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getBoolean); } - @NonNull + @Nonnull @Override - public List getBooleanList(@NonNull DriverOption option) { + public List getBooleanList(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getBooleanList); } @Override - public int getInt(@NonNull DriverOption option) { + public int getInt(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getInt); } - @NonNull + @Nonnull @Override - public List getIntList(@NonNull DriverOption option) { + public List getIntList(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getIntList); } @Override - public long getLong(@NonNull DriverOption option) { + public long getLong(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getLong); } - @NonNull + @Nonnull @Override - public List getLongList(@NonNull DriverOption option) { + public List getLongList(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getLongList); } @Override - public double getDouble(@NonNull DriverOption option) { + public double getDouble(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getDouble); } - @NonNull + @Nonnull @Override - public List getDoubleList(@NonNull DriverOption option) { + public List getDoubleList(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getDoubleList); } - @NonNull + @Nonnull @Override - public String getString(@NonNull DriverOption option) { + public String getString(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getString); } - @NonNull + @Nonnull @Override - public List getStringList(@NonNull DriverOption option) { + public List getStringList(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getStringList); } - @NonNull + @Nonnull @Override - public Map getStringMap(@NonNull DriverOption option) { + public Map getStringMap(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getStringMap); } @Override - public long getBytes(@NonNull DriverOption option) { + public long getBytes(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getBytes); } - @NonNull + @Nonnull @Override public List getBytesList(DriverOption option) { return get(option, DriverExecutionProfile::getBytesList); } - @NonNull + @Nonnull @Override - public Duration getDuration(@NonNull DriverOption option) { + public Duration getDuration(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getDuration); } - @NonNull + @Nonnull @Override - public List getDurationList(@NonNull DriverOption option) { + public List getDurationList(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getDurationList); } - @NonNull + @Nonnull @SuppressWarnings("unchecked") private ValueT get( - @NonNull DriverOption option, + @Nonnull DriverOption option, BiFunction getter) { Object value = overrides.get(option); if (value == null) { @@ -180,7 +180,7 @@ private ValueT get( return (ValueT) value; } - @NonNull + @Nonnull @Override public SortedSet> entrySet() { ImmutableSortedSet.Builder> builder = diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/config/DriverOptionConfigBuilder.java b/core/src/main/java/com/datastax/oss/driver/internal/core/config/DriverOptionConfigBuilder.java index 5775fcbe507..238f5ea12e7 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/config/DriverOptionConfigBuilder.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/config/DriverOptionConfigBuilder.java @@ -18,81 +18,81 @@ package com.datastax.oss.driver.internal.core.config; import com.datastax.oss.driver.api.core.config.DriverOption; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.time.Duration; import java.util.List; import java.util.Map; +import javax.annotation.CheckReturnValue; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** @see com.datastax.oss.driver.internal.core.config.typesafe.DefaultDriverConfigLoaderBuilder */ @Deprecated public interface DriverOptionConfigBuilder { - @NonNull + @Nonnull @CheckReturnValue - default SelfT withBoolean(@NonNull DriverOption option, boolean value) { + default SelfT withBoolean(@Nonnull DriverOption option, boolean value) { return with(option, value); } - @NonNull + @Nonnull @CheckReturnValue - default SelfT withBooleanList(@NonNull DriverOption option, @NonNull List value) { + default SelfT withBooleanList(@Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } - @NonNull + @Nonnull @CheckReturnValue - default SelfT withInt(@NonNull DriverOption option, int value) { + default SelfT withInt(@Nonnull DriverOption option, int value) { return with(option, value); } - @NonNull + @Nonnull @CheckReturnValue - default SelfT withIntList(@NonNull DriverOption option, @NonNull List value) { + default SelfT withIntList(@Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } - @NonNull + @Nonnull @CheckReturnValue - default SelfT withLong(@NonNull DriverOption option, long value) { + default SelfT withLong(@Nonnull DriverOption option, long value) { return with(option, value); } - @NonNull + @Nonnull @CheckReturnValue - default SelfT withLongList(@NonNull DriverOption option, @NonNull List value) { + default SelfT withLongList(@Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } - @NonNull + @Nonnull @CheckReturnValue - default SelfT withDouble(@NonNull DriverOption option, double value) { + default SelfT withDouble(@Nonnull DriverOption option, double value) { return with(option, value); } - @NonNull + @Nonnull @CheckReturnValue - default SelfT withDoubleList(@NonNull DriverOption option, @NonNull List value) { + default SelfT withDoubleList(@Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } - @NonNull + @Nonnull @CheckReturnValue - default SelfT withString(@NonNull DriverOption option, @NonNull String value) { + default SelfT withString(@Nonnull DriverOption option, @Nonnull String value) { return with(option, value); } - @NonNull + @Nonnull @CheckReturnValue - default SelfT withStringList(@NonNull DriverOption option, @NonNull List value) { + default SelfT withStringList(@Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } @SuppressWarnings("unchecked") - @NonNull + @Nonnull @CheckReturnValue - default SelfT withStringMap(@NonNull DriverOption option, @NonNull Map value) { + default SelfT withStringMap(@Nonnull DriverOption option, @Nonnull Map value) { SelfT v = (SelfT) this; for (String key : value.keySet()) { v = (SelfT) v.with(option.getPath() + "." + key, value.get(key)); @@ -105,52 +105,52 @@ default SelfT withStringMap(@NonNull DriverOption option, @NonNull Map value) { + default SelfT withBytesList(@Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } - @NonNull + @Nonnull @CheckReturnValue - default SelfT withDuration(@NonNull DriverOption option, @NonNull Duration value) { + default SelfT withDuration(@Nonnull DriverOption option, @Nonnull Duration value) { return with(option, value); } - @NonNull + @Nonnull @CheckReturnValue - default SelfT withDurationList(@NonNull DriverOption option, @NonNull List value) { + default SelfT withDurationList(@Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } - @NonNull + @Nonnull @CheckReturnValue - default SelfT withClass(@NonNull DriverOption option, @NonNull Class value) { + default SelfT withClass(@Nonnull DriverOption option, @Nonnull Class value) { return with(option, value.getName()); } /** Unsets an option. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT without(@NonNull DriverOption option) { + default SelfT without(@Nonnull DriverOption option) { return with(option, null); } - @NonNull + @Nonnull @CheckReturnValue - default SelfT with(@NonNull DriverOption option, @Nullable Object value) { + default SelfT with(@Nonnull DriverOption option, @Nullable Object value) { return with(option.getPath(), value); } @@ -158,7 +158,7 @@ default SelfT with(@NonNull DriverOption option, @Nullable Object value) { * Provides a simple path to value mapping, all default methods invoke this method directly. It is * not recommended that it is used directly other than by these defaults. */ - @NonNull + @Nonnull @CheckReturnValue - SelfT with(@NonNull String path, @Nullable Object value); + SelfT with(@Nonnull String path, @Nullable Object value); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/config/cloud/CloudConfig.java b/core/src/main/java/com/datastax/oss/driver/internal/core/config/cloud/CloudConfig.java index 1a1076e9d78..92d357ac1c7 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/config/cloud/CloudConfig.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/config/cloud/CloudConfig.java @@ -20,9 +20,9 @@ import com.datastax.oss.driver.api.core.metadata.EndPoint; import com.datastax.oss.driver.api.core.ssl.SslEngineFactory; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; import java.net.InetSocketAddress; import java.util.List; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -34,32 +34,32 @@ public class CloudConfig { private final SslEngineFactory sslEngineFactory; CloudConfig( - @NonNull InetSocketAddress proxyAddress, - @NonNull List endPoints, - @NonNull String localDatacenter, - @NonNull SslEngineFactory sslEngineFactory) { + @Nonnull InetSocketAddress proxyAddress, + @Nonnull List endPoints, + @Nonnull String localDatacenter, + @Nonnull SslEngineFactory sslEngineFactory) { this.proxyAddress = proxyAddress; this.endPoints = ImmutableList.copyOf(endPoints); this.localDatacenter = localDatacenter; this.sslEngineFactory = sslEngineFactory; } - @NonNull + @Nonnull public InetSocketAddress getProxyAddress() { return proxyAddress; } - @NonNull + @Nonnull public List getEndPoints() { return endPoints; } - @NonNull + @Nonnull public String getLocalDatacenter() { return localDatacenter; } - @NonNull + @Nonnull public SslEngineFactory getSslEngineFactory() { return sslEngineFactory; } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/config/cloud/CloudConfigFactory.java b/core/src/main/java/com/datastax/oss/driver/internal/core/config/cloud/CloudConfigFactory.java index b6b2cccc466..40fda105337 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/config/cloud/CloudConfigFactory.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/config/cloud/CloudConfigFactory.java @@ -25,7 +25,6 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -47,6 +46,7 @@ import java.util.Objects; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import javax.annotation.Nonnull; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; @@ -68,8 +68,8 @@ public class CloudConfigFactory { * @throws IOException If the Cloud configuration cannot be read. * @throws GeneralSecurityException If the Cloud SSL context cannot be created. */ - @NonNull - public CloudConfig createCloudConfig(@NonNull URL cloudConfigUrl) + @Nonnull + public CloudConfig createCloudConfig(@Nonnull URL cloudConfigUrl) throws IOException, GeneralSecurityException { Objects.requireNonNull(cloudConfigUrl, "cloudConfigUrl cannot be null"); return createCloudConfig(cloudConfigUrl.openStream()); @@ -85,8 +85,8 @@ public CloudConfig createCloudConfig(@NonNull URL cloudConfigUrl) * @throws IOException If the Cloud configuration cannot be read. * @throws GeneralSecurityException If the Cloud SSL context cannot be created. */ - @NonNull - public CloudConfig createCloudConfig(@NonNull InputStream cloudConfig) + @Nonnull + public CloudConfig createCloudConfig(@Nonnull InputStream cloudConfig) throws IOException, GeneralSecurityException { Objects.requireNonNull(cloudConfig, "cloudConfig cannot be null"); JsonNode configJson = null; @@ -143,7 +143,7 @@ public CloudConfig createCloudConfig(@NonNull InputStream cloudConfig) return new CloudConfig(sniProxyAddress, endPoints, localDatacenter, sslEngineFactory); } - @NonNull + @Nonnull protected char[] getKeyStorePassword(JsonNode configFile) { if (configFile.has("keyStorePassword")) { return configFile.get("keyStorePassword").asText().toCharArray(); @@ -152,7 +152,7 @@ protected char[] getKeyStorePassword(JsonNode configFile) { } } - @NonNull + @Nonnull protected char[] getTrustStorePassword(JsonNode configFile) { if (configFile.has("trustStorePassword")) { return configFile.get("trustStorePassword").asText().toCharArray(); @@ -161,7 +161,7 @@ protected char[] getTrustStorePassword(JsonNode configFile) { } } - @NonNull + @Nonnull protected URL getMetadataServiceUrl(JsonNode configFile) throws MalformedURLException { if (configFile.has("host")) { String metadataServiceHost = configFile.get("host").asText(); @@ -183,12 +183,12 @@ protected void validateIfBundleContainsUsernamePassword(JsonNode configFile) { } } - @NonNull + @Nonnull protected SSLContext createSslContext( - @NonNull ByteArrayInputStream keyStoreInputStream, - @NonNull char[] keyStorePassword, - @NonNull ByteArrayInputStream trustStoreInputStream, - @NonNull char[] trustStorePassword) + @Nonnull ByteArrayInputStream keyStoreInputStream, + @Nonnull char[] keyStorePassword, + @Nonnull ByteArrayInputStream trustStoreInputStream, + @Nonnull char[] trustStorePassword) throws IOException, GeneralSecurityException { KeyManagerFactory kmf = createKeyManagerFactory(keyStoreInputStream, keyStorePassword); TrustManagerFactory tmf = createTrustManagerFactory(trustStoreInputStream, trustStorePassword); @@ -197,9 +197,9 @@ protected SSLContext createSslContext( return sslContext; } - @NonNull + @Nonnull protected KeyManagerFactory createKeyManagerFactory( - @NonNull InputStream keyStoreInputStream, @NonNull char[] keyStorePassword) + @Nonnull InputStream keyStoreInputStream, @Nonnull char[] keyStorePassword) throws IOException, GeneralSecurityException { KeyStore ks = KeyStore.getInstance("JKS"); ks.load(keyStoreInputStream, keyStorePassword); @@ -209,9 +209,9 @@ protected KeyManagerFactory createKeyManagerFactory( return kmf; } - @NonNull + @Nonnull protected TrustManagerFactory createTrustManagerFactory( - @NonNull InputStream trustStoreInputStream, @NonNull char[] trustStorePassword) + @Nonnull InputStream trustStoreInputStream, @Nonnull char[] trustStorePassword) throws IOException, GeneralSecurityException { KeyStore ts = KeyStore.getInstance("JKS"); ts.load(trustStoreInputStream, trustStorePassword); @@ -222,9 +222,9 @@ protected TrustManagerFactory createTrustManagerFactory( return tmf; } - @NonNull + @Nonnull protected BufferedReader fetchProxyMetadata( - @NonNull URL metadataServiceUrl, @NonNull SSLContext sslContext) throws IOException { + @Nonnull URL metadataServiceUrl, @Nonnull SSLContext sslContext) throws IOException { try { HttpsURLConnection connection = (HttpsURLConnection) metadataServiceUrl.openConnection(); connection.setSSLSocketFactory(sslContext.getSocketFactory()); @@ -243,8 +243,8 @@ protected BufferedReader fetchProxyMetadata( } } - @NonNull - protected String getLocalDatacenter(@NonNull JsonNode proxyMetadata) { + @Nonnull + protected String getLocalDatacenter(@Nonnull JsonNode proxyMetadata) { JsonNode contactInfo = getContactInfo(proxyMetadata); if (contactInfo.has("local_dc")) { return contactInfo.get("local_dc").asText(); @@ -253,8 +253,8 @@ protected String getLocalDatacenter(@NonNull JsonNode proxyMetadata) { } } - @NonNull - protected InetSocketAddress getSniProxyAddress(@NonNull JsonNode proxyMetadata) { + @Nonnull + protected InetSocketAddress getSniProxyAddress(@Nonnull JsonNode proxyMetadata) { JsonNode contactInfo = getContactInfo(proxyMetadata); if (contactInfo.has("sni_proxy_address")) { HostAndPort sniProxyHostAndPort = @@ -270,9 +270,9 @@ protected InetSocketAddress getSniProxyAddress(@NonNull JsonNode proxyMetadata) } } - @NonNull + @Nonnull protected List getEndPoints( - @NonNull JsonNode proxyMetadata, @NonNull InetSocketAddress sniProxyAddress) { + @Nonnull JsonNode proxyMetadata, @Nonnull InetSocketAddress sniProxyAddress) { JsonNode contactInfo = getContactInfo(proxyMetadata); if (contactInfo.has("contact_points")) { List endPoints = new ArrayList<>(); @@ -286,8 +286,8 @@ protected List getEndPoints( } } - @NonNull - protected JsonNode getContactInfo(@NonNull JsonNode proxyMetadata) { + @Nonnull + protected JsonNode getContactInfo(@Nonnull JsonNode proxyMetadata) { if (proxyMetadata.has("contact_info")) { return proxyMetadata.get("contact_info"); } else { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/config/composite/CompositeDriverConfig.java b/core/src/main/java/com/datastax/oss/driver/internal/core/config/composite/CompositeDriverConfig.java index 9a74d00df4f..5f30ae62661 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/config/composite/CompositeDriverConfig.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/config/composite/CompositeDriverConfig.java @@ -20,11 +20,11 @@ import com.datastax.oss.driver.api.core.config.DriverConfig; import com.datastax.oss.driver.api.core.config.DriverExecutionProfile; import com.datastax.oss.driver.shaded.guava.common.collect.Sets; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collections; import java.util.Map; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; +import javax.annotation.Nonnull; public class CompositeDriverConfig implements DriverConfig { @@ -33,14 +33,14 @@ public class CompositeDriverConfig implements DriverConfig { private final Map profiles = new ConcurrentHashMap<>(); public CompositeDriverConfig( - @NonNull DriverConfig primaryConfig, @NonNull DriverConfig fallbackConfig) { + @Nonnull DriverConfig primaryConfig, @Nonnull DriverConfig fallbackConfig) { this.primaryConfig = Objects.requireNonNull(primaryConfig); this.fallbackConfig = Objects.requireNonNull(fallbackConfig); } - @NonNull + @Nonnull @Override - public DriverExecutionProfile getProfile(@NonNull String profileName) { + public DriverExecutionProfile getProfile(@Nonnull String profileName) { return profiles.compute( profileName, (k, v) -> @@ -49,7 +49,7 @@ public DriverExecutionProfile getProfile(@NonNull String profileName) { : v.refresh()); } - @NonNull + @Nonnull @Override public Map getProfiles() { // The map is updated lazily, if we want all the profiles we need to fetch them explicitly diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/config/composite/CompositeDriverConfigLoader.java b/core/src/main/java/com/datastax/oss/driver/internal/core/config/composite/CompositeDriverConfigLoader.java index 23baf458c85..982a96b7e1d 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/config/composite/CompositeDriverConfigLoader.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/config/composite/CompositeDriverConfigLoader.java @@ -21,10 +21,10 @@ import com.datastax.oss.driver.api.core.config.DriverConfigLoader; import com.datastax.oss.driver.api.core.context.DriverContext; import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; public class CompositeDriverConfigLoader implements DriverConfigLoader { @@ -32,13 +32,13 @@ public class CompositeDriverConfigLoader implements DriverConfigLoader { private final DriverConfigLoader fallbackConfigLoader; public CompositeDriverConfigLoader( - @NonNull DriverConfigLoader primaryConfigLoader, - @NonNull DriverConfigLoader fallbackConfigLoader) { + @Nonnull DriverConfigLoader primaryConfigLoader, + @Nonnull DriverConfigLoader fallbackConfigLoader) { this.primaryConfigLoader = Objects.requireNonNull(primaryConfigLoader); this.fallbackConfigLoader = Objects.requireNonNull(fallbackConfigLoader); } - @NonNull + @Nonnull @Override public DriverConfig getInitialConfig() { DriverConfig primaryConfig = primaryConfigLoader.getInitialConfig(); @@ -47,12 +47,12 @@ public DriverConfig getInitialConfig() { } @Override - public void onDriverInit(@NonNull DriverContext context) { + public void onDriverInit(@Nonnull DriverContext context) { fallbackConfigLoader.onDriverInit(context); primaryConfigLoader.onDriverInit(context); } - @NonNull + @Nonnull @Override public CompletionStage reload() { if (!primaryConfigLoader.supportsReloading() && !fallbackConfigLoader.supportsReloading()) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/config/composite/CompositeDriverExecutionProfile.java b/core/src/main/java/com/datastax/oss/driver/internal/core/config/composite/CompositeDriverExecutionProfile.java index 147d9e0bdb4..e4f0afc0dc0 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/config/composite/CompositeDriverExecutionProfile.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/config/composite/CompositeDriverExecutionProfile.java @@ -22,8 +22,6 @@ import com.datastax.oss.driver.api.core.config.DriverOption; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableSortedSet; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.time.Duration; import java.util.List; import java.util.Map; @@ -31,6 +29,8 @@ import java.util.SortedSet; import java.util.TreeSet; import java.util.function.BiFunction; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class CompositeDriverExecutionProfile implements DriverExecutionProfile { @@ -42,9 +42,9 @@ public class CompositeDriverExecutionProfile implements DriverExecutionProfile { @Nullable private volatile DriverExecutionProfile fallbackProfile; public CompositeDriverExecutionProfile( - @NonNull DriverConfig primaryConfig, - @NonNull DriverConfig fallbackConfig, - @NonNull String profileName) { + @Nonnull DriverConfig primaryConfig, + @Nonnull DriverConfig fallbackConfig, + @Nonnull String profileName) { this.primaryConfig = Objects.requireNonNull(primaryConfig); this.fallbackConfig = Objects.requireNonNull(fallbackConfig); this.profileName = Objects.requireNonNull(profileName); @@ -84,14 +84,14 @@ private CompositeDriverExecutionProfile refreshInternal() { return this; } - @NonNull + @Nonnull @Override public String getName() { return profileName; } @Override - public boolean isDefined(@NonNull DriverOption option) { + public boolean isDefined(@Nonnull DriverOption option) { DriverExecutionProfile primaryProfile = this.primaryProfile; if (primaryProfile != null && primaryProfile.isDefined(option)) { return true; @@ -102,92 +102,92 @@ public boolean isDefined(@NonNull DriverOption option) { } @Override - public boolean getBoolean(@NonNull DriverOption option) { + public boolean getBoolean(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getBoolean); } - @NonNull + @Nonnull @Override - public List getBooleanList(@NonNull DriverOption option) { + public List getBooleanList(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getBooleanList); } @Override - public int getInt(@NonNull DriverOption option) { + public int getInt(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getInt); } - @NonNull + @Nonnull @Override - public List getIntList(@NonNull DriverOption option) { + public List getIntList(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getIntList); } @Override - public long getLong(@NonNull DriverOption option) { + public long getLong(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getLong); } - @NonNull + @Nonnull @Override - public List getLongList(@NonNull DriverOption option) { + public List getLongList(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getLongList); } @Override - public double getDouble(@NonNull DriverOption option) { + public double getDouble(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getDouble); } - @NonNull + @Nonnull @Override - public List getDoubleList(@NonNull DriverOption option) { + public List getDoubleList(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getDoubleList); } - @NonNull + @Nonnull @Override - public String getString(@NonNull DriverOption option) { + public String getString(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getString); } - @NonNull + @Nonnull @Override - public List getStringList(@NonNull DriverOption option) { + public List getStringList(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getStringList); } - @NonNull + @Nonnull @Override - public Map getStringMap(@NonNull DriverOption option) { + public Map getStringMap(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getStringMap); } @Override - public long getBytes(@NonNull DriverOption option) { + public long getBytes(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getBytes); } - @NonNull + @Nonnull @Override public List getBytesList(DriverOption option) { return get(option, DriverExecutionProfile::getBytesList); } - @NonNull + @Nonnull @Override - public Duration getDuration(@NonNull DriverOption option) { + public Duration getDuration(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getDuration); } - @NonNull + @Nonnull @Override - public List getDurationList(@NonNull DriverOption option) { + public List getDurationList(@Nonnull DriverOption option) { return get(option, DriverExecutionProfile::getDurationList); } private ValueT get( - @NonNull DriverOption option, + @Nonnull DriverOption option, BiFunction getter) { DriverExecutionProfile primaryProfile = this.primaryProfile; if (primaryProfile != null && primaryProfile.isDefined(option)) { @@ -202,7 +202,7 @@ private ValueT get( } } - @NonNull + @Nonnull @Override public SortedSet> entrySet() { DriverExecutionProfile primaryProfile = this.primaryProfile; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/config/map/MapBasedDriverConfig.java b/core/src/main/java/com/datastax/oss/driver/internal/core/config/map/MapBasedDriverConfig.java index 74adbf120ca..4c5c7b2cf4e 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/config/map/MapBasedDriverConfig.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/config/map/MapBasedDriverConfig.java @@ -20,10 +20,10 @@ import com.datastax.oss.driver.api.core.config.DriverConfig; import com.datastax.oss.driver.api.core.config.DriverExecutionProfile; import com.datastax.oss.driver.api.core.config.DriverOption; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collections; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import javax.annotation.Nonnull; /** @see MapBasedDriverConfigLoader */ public class MapBasedDriverConfig implements DriverConfig { @@ -40,13 +40,13 @@ public MapBasedDriverConfig(Map> optionsMap) { createMissingProfiles(); } - @NonNull + @Nonnull @Override - public DriverExecutionProfile getProfile(@NonNull String profileName) { + public DriverExecutionProfile getProfile(@Nonnull String profileName) { return profiles.computeIfAbsent(profileName, this::newProfile); } - @NonNull + @Nonnull @Override public Map getProfiles() { // Refresh in case profiles were added to the backing map diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/config/map/MapBasedDriverConfigLoader.java b/core/src/main/java/com/datastax/oss/driver/internal/core/config/map/MapBasedDriverConfigLoader.java index 14f959e5dc0..b1ade96bccf 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/config/map/MapBasedDriverConfigLoader.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/config/map/MapBasedDriverConfigLoader.java @@ -25,32 +25,32 @@ import com.datastax.oss.driver.internal.core.config.ConfigChangeEvent; import com.datastax.oss.driver.internal.core.context.EventBus; import com.datastax.oss.driver.internal.core.context.InternalDriverContext; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.function.Consumer; +import javax.annotation.Nonnull; public class MapBasedDriverConfigLoader implements DriverConfigLoader, Consumer { - @NonNull private final OptionsMap source; - @NonNull private final Map> rawMap; + @Nonnull private final OptionsMap source; + @Nonnull private final Map> rawMap; private volatile EventBus eventBus; public MapBasedDriverConfigLoader( - @NonNull OptionsMap source, @NonNull Map> rawMap) { + @Nonnull OptionsMap source, @Nonnull Map> rawMap) { this.source = source; this.rawMap = rawMap; } - @NonNull + @Nonnull @Override public DriverConfig getInitialConfig() { return new MapBasedDriverConfig(rawMap); } @Override - public void onDriverInit(@NonNull DriverContext context) { + public void onDriverInit(@Nonnull DriverContext context) { eventBus = ((InternalDriverContext) context).getEventBus(); source.addChangeListener(this); } @@ -61,7 +61,7 @@ public void accept(OptionsMap map) { eventBus.fire(ConfigChangeEvent.INSTANCE); } - @NonNull + @Nonnull @Override public CompletionStage reload() { return CompletableFuture.completedFuture(true); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/config/map/MapBasedDriverExecutionProfile.java b/core/src/main/java/com/datastax/oss/driver/internal/core/config/map/MapBasedDriverExecutionProfile.java index 4234befd94b..f04dd2d329b 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/config/map/MapBasedDriverExecutionProfile.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/config/map/MapBasedDriverExecutionProfile.java @@ -22,13 +22,13 @@ import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableSortedSet; -import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; import java.util.AbstractMap; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.SortedSet; +import javax.annotation.Nonnull; /** @see MapBasedDriverConfigLoader */ public class MapBasedDriverExecutionProfile implements DriverExecutionProfile { @@ -62,22 +62,22 @@ public MapBasedDriverExecutionProfile( this.defaultProfile = defaultProfile; } - @NonNull + @Nonnull @Override public String getName() { return profileName; } @Override - public boolean isDefined(@NonNull DriverOption option) { + public boolean isDefined(@Nonnull DriverOption option) { return profile.containsKey(option) || defaultProfile.containsKey(option); } // Driver options don't encode the type, everything relies on the user putting the right types in // the backing map, so no point in trying to type-check. @SuppressWarnings({"unchecked", "TypeParameterUnusedInFormals"}) - @NonNull - private T get(@NonNull DriverOption option) { + @Nonnull + private T get(@Nonnull DriverOption option) { Object value = profile.getOrDefault(option, defaultProfile.get(option)); if (value == null) { throw new IllegalArgumentException("Missing configuration option " + option.getPath()); @@ -86,91 +86,91 @@ private T get(@NonNull DriverOption option) { } @Override - public boolean getBoolean(@NonNull DriverOption option) { + public boolean getBoolean(@Nonnull DriverOption option) { return get(option); } - @NonNull + @Nonnull @Override - public List getBooleanList(@NonNull DriverOption option) { + public List getBooleanList(@Nonnull DriverOption option) { return get(option); } @Override - public int getInt(@NonNull DriverOption option) { + public int getInt(@Nonnull DriverOption option) { return get(option); } - @NonNull + @Nonnull @Override - public List getIntList(@NonNull DriverOption option) { + public List getIntList(@Nonnull DriverOption option) { return get(option); } @Override - public long getLong(@NonNull DriverOption option) { + public long getLong(@Nonnull DriverOption option) { return get(option); } - @NonNull + @Nonnull @Override - public List getLongList(@NonNull DriverOption option) { + public List getLongList(@Nonnull DriverOption option) { return get(option); } @Override - public double getDouble(@NonNull DriverOption option) { + public double getDouble(@Nonnull DriverOption option) { return get(option); } - @NonNull + @Nonnull @Override - public List getDoubleList(@NonNull DriverOption option) { + public List getDoubleList(@Nonnull DriverOption option) { return get(option); } - @NonNull + @Nonnull @Override - public String getString(@NonNull DriverOption option) { + public String getString(@Nonnull DriverOption option) { return get(option); } - @NonNull + @Nonnull @Override - public List getStringList(@NonNull DriverOption option) { + public List getStringList(@Nonnull DriverOption option) { return get(option); } - @NonNull + @Nonnull @Override - public Map getStringMap(@NonNull DriverOption option) { + public Map getStringMap(@Nonnull DriverOption option) { return get(option); } @Override - public long getBytes(@NonNull DriverOption option) { + public long getBytes(@Nonnull DriverOption option) { return get(option); } - @NonNull + @Nonnull @Override public List getBytesList(DriverOption option) { return get(option); } - @NonNull + @Nonnull @Override - public Duration getDuration(@NonNull DriverOption option) { + public Duration getDuration(@Nonnull DriverOption option) { return get(option); } - @NonNull + @Nonnull @Override - public List getDurationList(@NonNull DriverOption option) { + public List getDurationList(@Nonnull DriverOption option) { return get(option); } - @NonNull + @Nonnull @Override public SortedSet> entrySet() { ImmutableSortedSet.Builder> builder = diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/DefaultDriverConfigLoader.java b/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/DefaultDriverConfigLoader.java index f1bfbea8249..a84abb208d1 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/DefaultDriverConfigLoader.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/DefaultDriverConfigLoader.java @@ -33,7 +33,6 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import com.typesafe.config.ConfigParseOptions; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.util.concurrent.EventExecutor; import io.netty.util.concurrent.ScheduledFuture; import java.io.File; @@ -44,6 +43,7 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -71,9 +71,9 @@ public class DefaultDriverConfigLoader implements DriverConfigLoader { .getConfig(DEFAULT_ROOT_PATH); }; - @NonNull + @Nonnull public static DefaultDriverConfigLoader fromClasspath( - @NonNull String resourceBaseName, @NonNull ClassLoader appClassLoader) { + @Nonnull String resourceBaseName, @Nonnull ClassLoader appClassLoader) { return new DefaultDriverConfigLoader( () -> { ConfigFactory.invalidateCaches(); @@ -89,8 +89,8 @@ public static DefaultDriverConfigLoader fromClasspath( }); } - @NonNull - public static DriverConfigLoader fromFile(@NonNull File file) { + @Nonnull + public static DriverConfigLoader fromFile(@Nonnull File file) { return new DefaultDriverConfigLoader( () -> { ConfigFactory.invalidateCaches(); @@ -103,8 +103,8 @@ public static DriverConfigLoader fromFile(@NonNull File file) { }); } - @NonNull - public static DriverConfigLoader fromUrl(@NonNull URL url) { + @Nonnull + public static DriverConfigLoader fromUrl(@Nonnull URL url) { return new DefaultDriverConfigLoader( () -> { ConfigFactory.invalidateCaches(); @@ -117,8 +117,8 @@ public static DriverConfigLoader fromUrl(@NonNull URL url) { }); } - @NonNull - public static DefaultDriverConfigLoader fromString(@NonNull String contents) { + @Nonnull + public static DefaultDriverConfigLoader fromString(@Nonnull String contents) { return new DefaultDriverConfigLoader( () -> { ConfigFactory.invalidateCaches(); @@ -160,7 +160,7 @@ public DefaultDriverConfigLoader() { * loader}. This constructor enables config reloading (that is, {@link #supportsReloading} will * return true). */ - public DefaultDriverConfigLoader(@NonNull ClassLoader appClassLoader) { + public DefaultDriverConfigLoader(@Nonnull ClassLoader appClassLoader) { this( () -> { ConfigFactory.invalidateCaches(); @@ -180,7 +180,7 @@ public DefaultDriverConfigLoader(@NonNull ClassLoader appClassLoader) { * @param configSupplier A supplier for the Typesafe {@link Config}; it will be invoked once when * this object is instantiated, and at each reload attempt, if reloading is enabled. */ - public DefaultDriverConfigLoader(@NonNull Supplier configSupplier) { + public DefaultDriverConfigLoader(@Nonnull Supplier configSupplier) { this(configSupplier, true); } @@ -193,24 +193,24 @@ public DefaultDriverConfigLoader(@NonNull Supplier configSupplier) { * @param supportsReloading Whether config reloading should be enabled or not. */ public DefaultDriverConfigLoader( - @NonNull Supplier configSupplier, boolean supportsReloading) { + @Nonnull Supplier configSupplier, boolean supportsReloading) { this.configSupplier = configSupplier; this.driverConfig = new TypesafeDriverConfig(configSupplier.get()); this.supportsReloading = supportsReloading; } - @NonNull + @Nonnull @Override public DriverConfig getInitialConfig() { return driverConfig; } @Override - public void onDriverInit(@NonNull DriverContext driverContext) { + public void onDriverInit(@Nonnull DriverContext driverContext) { this.singleThreaded = new SingleThreaded((InternalDriverContext) driverContext); } - @NonNull + @Nonnull @Override public final CompletionStage reload() { if (supportsReloading) { @@ -230,7 +230,7 @@ public final boolean supportsReloading() { } /** For internal use only, this leaks a Typesafe config type. */ - @NonNull + @Nonnull public Supplier getConfigSupplier() { return configSupplier; } @@ -269,7 +269,7 @@ public void close() { * DriverConfigLoader#programmaticBuilder()} instead. */ @Deprecated - @NonNull + @Nonnull public static DefaultDriverConfigLoaderBuilder builder() { return new DefaultDriverConfigLoaderBuilder(); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/DefaultDriverConfigLoaderBuilder.java b/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/DefaultDriverConfigLoaderBuilder.java index 3096fd85ffb..f18a7e463c0 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/DefaultDriverConfigLoaderBuilder.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/DefaultDriverConfigLoaderBuilder.java @@ -22,9 +22,9 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import com.typesafe.config.ConfigValueFactory; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.NotThreadSafe; /** @@ -44,15 +44,15 @@ public class DefaultDriverConfigLoaderBuilder * @return a new {@link ProfileBuilder} to provide programmatic configuration at a profile level. * @see #withProfile(String, Profile) */ - @NonNull + @Nonnull public static ProfileBuilder profileBuilder() { return new ProfileBuilder(); } /** Adds configuration for a profile constructed using {@link #profileBuilder()} by name. */ - @NonNull + @Nonnull public DefaultDriverConfigLoaderBuilder withProfile( - @NonNull String profileName, @NonNull Profile profile) { + @Nonnull String profileName, @Nonnull Profile profile) { String prefix = "profiles." + profileName + "."; for (Map.Entry entry : profile.values.entrySet()) { this.with(prefix + entry.getKey(), entry.getValue()); @@ -64,7 +64,7 @@ public DefaultDriverConfigLoaderBuilder withProfile( * @return constructed {@link DriverConfigLoader} using the configuration passed into this * builder. */ - @NonNull + @Nonnull public DriverConfigLoader build() { // fallback on the default config supplier (config file) return new DefaultDriverConfigLoader( @@ -80,9 +80,9 @@ protected Config buildConfig() { return config; } - @NonNull + @Nonnull @Override - public DefaultDriverConfigLoaderBuilder with(@NonNull String path, @Nullable Object value) { + public DefaultDriverConfigLoaderBuilder with(@Nonnull String path, @Nullable Object value) { values.put(path, value); return this; } @@ -98,14 +98,14 @@ public static final class ProfileBuilder private ProfileBuilder() {} - @NonNull + @Nonnull @Override - public ProfileBuilder with(@NonNull String path, @Nullable Object value) { + public ProfileBuilder with(@Nonnull String path, @Nullable Object value) { values.put(path, value); return this; } - @NonNull + @Nonnull public Profile build() { return new Profile(values.build()); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/DefaultProgrammaticDriverConfigLoaderBuilder.java b/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/DefaultProgrammaticDriverConfigLoaderBuilder.java index 2a7f6379362..79819fcde4c 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/DefaultProgrammaticDriverConfigLoaderBuilder.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/DefaultProgrammaticDriverConfigLoaderBuilder.java @@ -25,14 +25,14 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import com.typesafe.config.ConfigValueFactory; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.time.Duration; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.function.Supplier; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.NotThreadSafe; @NotThreadSafe @@ -75,7 +75,7 @@ public DefaultProgrammaticDriverConfigLoaderBuilder() { * located using the provided {@link ClassLoader} instead of {@linkplain * Thread#getContextClassLoader() the current thread's context class loader}. */ - public DefaultProgrammaticDriverConfigLoaderBuilder(@NonNull ClassLoader appClassLoader) { + public DefaultProgrammaticDriverConfigLoaderBuilder(@Nonnull ClassLoader appClassLoader) { this( () -> ConfigFactory.defaultApplication(appClassLoader) @@ -94,17 +94,17 @@ public DefaultProgrammaticDriverConfigLoaderBuilder(@NonNull ClassLoader appClas * DefaultDriverConfigLoader#DEFAULT_ROOT_PATH}. Cannot be null but can be empty. */ public DefaultProgrammaticDriverConfigLoaderBuilder( - @NonNull Supplier fallbackSupplier, @NonNull String rootPath) { + @Nonnull Supplier fallbackSupplier, @Nonnull String rootPath) { this.fallbackSupplier = fallbackSupplier; this.rootPath = rootPath; } private ProgrammaticDriverConfigLoaderBuilder with( - @NonNull DriverOption option, @Nullable Object value) { + @Nonnull DriverOption option, @Nullable Object value) { return with(option.getPath(), value); } - private ProgrammaticDriverConfigLoaderBuilder with(@NonNull String path, @Nullable Object value) { + private ProgrammaticDriverConfigLoaderBuilder with(@Nonnull String path, @Nullable Object value) { if (!DriverExecutionProfile.DEFAULT_NAME.equals(currentProfileName)) { path = "profiles." + currentProfileName + "." + path; } @@ -115,132 +115,132 @@ private ProgrammaticDriverConfigLoaderBuilder with(@NonNull String path, @Nullab return this; } - @NonNull + @Nonnull @Override - public ProgrammaticDriverConfigLoaderBuilder startProfile(@NonNull String profileName) { + public ProgrammaticDriverConfigLoaderBuilder startProfile(@Nonnull String profileName) { currentProfileName = Objects.requireNonNull(profileName); return this; } - @NonNull + @Nonnull @Override public ProgrammaticDriverConfigLoaderBuilder endProfile() { currentProfileName = DriverExecutionProfile.DEFAULT_NAME; return this; } - @NonNull + @Nonnull @Override public ProgrammaticDriverConfigLoaderBuilder withBoolean( - @NonNull DriverOption option, boolean value) { + @Nonnull DriverOption option, boolean value) { return with(option, value); } - @NonNull + @Nonnull @Override public ProgrammaticDriverConfigLoaderBuilder withBooleanList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } - @NonNull + @Nonnull @Override - public ProgrammaticDriverConfigLoaderBuilder withInt(@NonNull DriverOption option, int value) { + public ProgrammaticDriverConfigLoaderBuilder withInt(@Nonnull DriverOption option, int value) { return with(option, value); } - @NonNull + @Nonnull @Override public ProgrammaticDriverConfigLoaderBuilder withIntList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } - @NonNull + @Nonnull @Override - public ProgrammaticDriverConfigLoaderBuilder withLong(@NonNull DriverOption option, long value) { + public ProgrammaticDriverConfigLoaderBuilder withLong(@Nonnull DriverOption option, long value) { return with(option, value); } - @NonNull + @Nonnull @Override public ProgrammaticDriverConfigLoaderBuilder withLongList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } - @NonNull + @Nonnull @Override public ProgrammaticDriverConfigLoaderBuilder withDouble( - @NonNull DriverOption option, double value) { + @Nonnull DriverOption option, double value) { return with(option, value); } - @NonNull + @Nonnull @Override public ProgrammaticDriverConfigLoaderBuilder withDoubleList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } - @NonNull + @Nonnull @Override public ProgrammaticDriverConfigLoaderBuilder withString( - @NonNull DriverOption option, @NonNull String value) { + @Nonnull DriverOption option, @Nonnull String value) { return with(option, value); } - @NonNull + @Nonnull @Override public ProgrammaticDriverConfigLoaderBuilder withStringList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } - @NonNull + @Nonnull @Override public ProgrammaticDriverConfigLoaderBuilder withStringMap( - @NonNull DriverOption option, @NonNull Map value) { + @Nonnull DriverOption option, @Nonnull Map value) { for (String key : value.keySet()) { this.with(option.getPath() + "." + key, value.get(key)); } return this; } - @NonNull + @Nonnull @Override - public ProgrammaticDriverConfigLoaderBuilder withBytes(@NonNull DriverOption option, long value) { + public ProgrammaticDriverConfigLoaderBuilder withBytes(@Nonnull DriverOption option, long value) { return with(option, value); } - @NonNull + @Nonnull @Override public ProgrammaticDriverConfigLoaderBuilder withBytesList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } - @NonNull + @Nonnull @Override public ProgrammaticDriverConfigLoaderBuilder withDuration( - @NonNull DriverOption option, @NonNull Duration value) { + @Nonnull DriverOption option, @Nonnull Duration value) { return with(option, value); } - @NonNull + @Nonnull @Override public ProgrammaticDriverConfigLoaderBuilder withDurationList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } - @NonNull + @Nonnull @Override - public ProgrammaticDriverConfigLoaderBuilder without(@NonNull DriverOption option) { + public ProgrammaticDriverConfigLoaderBuilder without(@Nonnull DriverOption option) { return with(option, null); } - @NonNull + @Nonnull @Override public DriverConfigLoader build() { return new DefaultDriverConfigLoader( diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/TypesafeDriverConfig.java b/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/TypesafeDriverConfig.java index e1d8c779f2c..d9e1b578623 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/TypesafeDriverConfig.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/TypesafeDriverConfig.java @@ -30,11 +30,11 @@ import com.typesafe.config.ConfigOriginFactory; import com.typesafe.config.ConfigValue; import com.typesafe.config.ConfigValueFactory; -import edu.umd.cs.findbugs.annotations.NonNull; import java.net.URL; import java.util.Map; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -146,9 +146,9 @@ public DriverExecutionProfile getDefaultProfile() { return defaultProfile; } - @NonNull + @Nonnull @Override - public DriverExecutionProfile getProfile(@NonNull String profileName) { + public DriverExecutionProfile getProfile(@Nonnull String profileName) { if (profileName.equals(DriverExecutionProfile.DEFAULT_NAME)) { return defaultProfile; } @@ -159,7 +159,7 @@ public DriverExecutionProfile getProfile(@NonNull String profileName) { String.format("Unknown profile '%s'. Check your configuration.", profileName))); } - @NonNull + @Nonnull @Override public Map getProfiles() { return profiles; @@ -174,7 +174,7 @@ public DriverExecutionProfile getProfile(@NonNull String profileName) { * is invoked multiple times, the last value for each option will be used. Note that it is * currently not possible to use {@code null} as a value. */ - public void overrideDefaults(@NonNull Map overrides) { + public void overrideDefaults(@Nonnull Map overrides) { defaultOverrides.putAll(overrides); reload(lastLoadedConfig); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/TypesafeDriverExecutionProfile.java b/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/TypesafeDriverExecutionProfile.java index b7dd5abe42e..325904e3c44 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/TypesafeDriverExecutionProfile.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/TypesafeDriverExecutionProfile.java @@ -27,8 +27,6 @@ import com.typesafe.config.ConfigValue; import com.typesafe.config.ConfigValueFactory; import com.typesafe.config.ConfigValueType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.time.Duration; import java.util.AbstractMap; import java.util.Collections; @@ -39,6 +37,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.function.Function; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -56,135 +56,135 @@ public abstract class TypesafeDriverExecutionProfile implements DriverExecutionP protected final ConcurrentMap cache = new ConcurrentHashMap<>(); @Override - public boolean isDefined(@NonNull DriverOption option) { + public boolean isDefined(@Nonnull DriverOption option) { return getEffectiveOptions().hasPath(option.getPath()); } @Override - public boolean getBoolean(@NonNull DriverOption option) { + public boolean getBoolean(@Nonnull DriverOption option) { return getCached(option.getPath(), getEffectiveOptions()::getBoolean); } // We override `with*` methods because they can be implemented a bit better with Typesafe config - @NonNull + @Nonnull @Override - public DriverExecutionProfile withBoolean(@NonNull DriverOption option, boolean value) { + public DriverExecutionProfile withBoolean(@Nonnull DriverOption option, boolean value) { return with(option, value); } - @NonNull + @Nonnull @Override - public List getBooleanList(@NonNull DriverOption option) { + public List getBooleanList(@Nonnull DriverOption option) { return getCached(option.getPath(), getEffectiveOptions()::getBooleanList); } - @NonNull + @Nonnull @Override public DriverExecutionProfile withBooleanList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } @Override - public int getInt(@NonNull DriverOption option) { + public int getInt(@Nonnull DriverOption option) { return getCached(option.getPath(), getEffectiveOptions()::getInt); } - @NonNull + @Nonnull @Override - public DriverExecutionProfile withInt(@NonNull DriverOption option, int value) { + public DriverExecutionProfile withInt(@Nonnull DriverOption option, int value) { return with(option, value); } - @NonNull + @Nonnull @Override - public List getIntList(@NonNull DriverOption option) { + public List getIntList(@Nonnull DriverOption option) { return getCached(option.getPath(), getEffectiveOptions()::getIntList); } - @NonNull + @Nonnull @Override public DriverExecutionProfile withIntList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } @Override - public long getLong(@NonNull DriverOption option) { + public long getLong(@Nonnull DriverOption option) { return getCached(option.getPath(), getEffectiveOptions()::getLong); } - @NonNull + @Nonnull @Override - public DriverExecutionProfile withLong(@NonNull DriverOption option, long value) { + public DriverExecutionProfile withLong(@Nonnull DriverOption option, long value) { return with(option, value); } - @NonNull + @Nonnull @Override - public List getLongList(@NonNull DriverOption option) { + public List getLongList(@Nonnull DriverOption option) { return getCached(option.getPath(), getEffectiveOptions()::getLongList); } - @NonNull + @Nonnull @Override public DriverExecutionProfile withLongList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } @Override - public double getDouble(@NonNull DriverOption option) { + public double getDouble(@Nonnull DriverOption option) { return getCached(option.getPath(), getEffectiveOptions()::getDouble); } - @NonNull + @Nonnull @Override - public DriverExecutionProfile withDouble(@NonNull DriverOption option, double value) { + public DriverExecutionProfile withDouble(@Nonnull DriverOption option, double value) { return with(option, value); } - @NonNull + @Nonnull @Override - public List getDoubleList(@NonNull DriverOption option) { + public List getDoubleList(@Nonnull DriverOption option) { return getCached(option.getPath(), getEffectiveOptions()::getDoubleList); } - @NonNull + @Nonnull @Override public DriverExecutionProfile withDoubleList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } - @NonNull + @Nonnull @Override - public String getString(@NonNull DriverOption option) { + public String getString(@Nonnull DriverOption option) { return getCached(option.getPath(), getEffectiveOptions()::getString); } - @NonNull + @Nonnull @Override - public DriverExecutionProfile withString(@NonNull DriverOption option, @NonNull String value) { + public DriverExecutionProfile withString(@Nonnull DriverOption option, @Nonnull String value) { return with(option, value); } - @NonNull + @Nonnull @Override - public List getStringList(@NonNull DriverOption option) { + public List getStringList(@Nonnull DriverOption option) { return getCached(option.getPath(), getEffectiveOptions()::getStringList); } - @NonNull + @Nonnull @Override public DriverExecutionProfile withStringList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } - @NonNull + @Nonnull @Override - public Map getStringMap(@NonNull DriverOption option) { + public Map getStringMap(@Nonnull DriverOption option) { Config subConfig = getCached(option.getPath(), getEffectiveOptions()::getConfig); ImmutableMap.Builder builder = ImmutableMap.builder(); for (Map.Entry entry : subConfig.entrySet()) { @@ -195,10 +195,10 @@ public Map getStringMap(@NonNull DriverOption option) { return builder.build(); } - @NonNull + @Nonnull @Override public DriverExecutionProfile withStringMap( - @NonNull DriverOption option, @NonNull Map map) { + @Nonnull DriverOption option, @Nonnull Map map) { Base base = getBaseProfile(); // Add the new option to any already derived options Config newAdded = getAddedOptions(); @@ -213,69 +213,69 @@ public DriverExecutionProfile withStringMap( } @Override - public long getBytes(@NonNull DriverOption option) { + public long getBytes(@Nonnull DriverOption option) { return getCached(option.getPath(), getEffectiveOptions()::getBytes); } - @NonNull + @Nonnull @Override - public DriverExecutionProfile withBytes(@NonNull DriverOption option, long value) { + public DriverExecutionProfile withBytes(@Nonnull DriverOption option, long value) { return with(option, value); } - @NonNull + @Nonnull @Override public List getBytesList(DriverOption option) { return getCached(option.getPath(), getEffectiveOptions()::getBytesList); } - @NonNull + @Nonnull @Override public DriverExecutionProfile withBytesList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } - @NonNull + @Nonnull @Override - public Duration getDuration(@NonNull DriverOption option) { + public Duration getDuration(@Nonnull DriverOption option) { return getCached(option.getPath(), getEffectiveOptions()::getDuration); } - @NonNull + @Nonnull @Override public DriverExecutionProfile withDuration( - @NonNull DriverOption option, @NonNull Duration value) { + @Nonnull DriverOption option, @Nonnull Duration value) { return with(option, value); } - @NonNull + @Nonnull @Override - public List getDurationList(@NonNull DriverOption option) { + public List getDurationList(@Nonnull DriverOption option) { return getCached(option.getPath(), getEffectiveOptions()::getDurationList); } - @NonNull + @Nonnull @Override public DriverExecutionProfile withDurationList( - @NonNull DriverOption option, @NonNull List value) { + @Nonnull DriverOption option, @Nonnull List value) { return with(option, value); } - @NonNull + @Nonnull @Override - public DriverExecutionProfile without(@NonNull DriverOption option) { + public DriverExecutionProfile without(@Nonnull DriverOption option) { return with(option, null); } - @NonNull + @Nonnull @Override - public Object getComparisonKey(@NonNull DriverOption option) { + public Object getComparisonKey(@Nonnull DriverOption option) { // This method has a default implementation in the interface, but here we can do it in one line: return getEffectiveOptions().getConfig(option.getPath()); } - @NonNull + @Nonnull @Override public SortedSet> entrySet() { ImmutableSortedSet.Builder> builder = @@ -294,7 +294,7 @@ private T getCached(String path, Function compute) { return t; } - private DriverExecutionProfile with(@NonNull DriverOption option, @Nullable Object value) { + private DriverExecutionProfile with(@Nonnull DriverOption option, @Nullable Object value) { Base base = getBaseProfile(); // Add the new option to any already derived options Config newAdded = @@ -317,7 +317,7 @@ static class Base extends TypesafeDriverExecutionProfile { this.options = options; } - @NonNull + @Nonnull @Override public String getName() { return name; @@ -389,7 +389,7 @@ void refresh() { this.cache.clear(); } - @NonNull + @Nonnull @Override public String getName() { return baseProfile.getName(); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/connection/ConstantReconnectionPolicy.java b/core/src/main/java/com/datastax/oss/driver/internal/core/connection/ConstantReconnectionPolicy.java index 03edb38f8d4..a3385fc69ca 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/connection/ConstantReconnectionPolicy.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/connection/ConstantReconnectionPolicy.java @@ -22,8 +22,8 @@ import com.datastax.oss.driver.api.core.connection.ReconnectionPolicy; import com.datastax.oss.driver.api.core.context.DriverContext; import com.datastax.oss.driver.api.core.metadata.Node; -import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; +import javax.annotation.Nonnull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -67,14 +67,14 @@ public ConstantReconnectionPolicy(DriverContext context) { this.schedule = () -> delay; } - @NonNull + @Nonnull @Override - public ReconnectionSchedule newNodeSchedule(@NonNull Node node) { + public ReconnectionSchedule newNodeSchedule(@Nonnull Node node) { LOG.debug("[{}] Creating new schedule for {}", logPrefix, node); return schedule; } - @NonNull + @Nonnull @Override public ReconnectionSchedule newControlConnectionSchedule( @SuppressWarnings("ignored") boolean isInitialConnection) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/connection/ExponentialReconnectionPolicy.java b/core/src/main/java/com/datastax/oss/driver/internal/core/connection/ExponentialReconnectionPolicy.java index 5fa04cb63d6..b7bc780d042 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/connection/ExponentialReconnectionPolicy.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/connection/ExponentialReconnectionPolicy.java @@ -23,9 +23,9 @@ import com.datastax.oss.driver.api.core.context.DriverContext; import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; -import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; import java.util.concurrent.ThreadLocalRandom; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -117,14 +117,14 @@ public long getMaxDelayMs() { return maxDelayMs; } - @NonNull + @Nonnull @Override - public ReconnectionSchedule newNodeSchedule(@NonNull Node node) { + public ReconnectionSchedule newNodeSchedule(@Nonnull Node node) { LOG.debug("[{}] Creating new schedule for {}", logPrefix, node); return new ExponentialSchedule(); } - @NonNull + @Nonnull @Override public ReconnectionSchedule newControlConnectionSchedule( @SuppressWarnings("ignored") boolean isInitialConnection) { @@ -141,7 +141,7 @@ private class ExponentialSchedule implements ReconnectionSchedule { private int attempts; - @NonNull + @Nonnull @Override public Duration nextDelay() { long delay = (attempts > maxAttempts) ? maxDelayMs : calculateDelayWithJitter(); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/context/DefaultDriverContext.java b/core/src/main/java/com/datastax/oss/driver/internal/core/context/DefaultDriverContext.java index a24b632f640..2c787ad67c8 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/context/DefaultDriverContext.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/context/DefaultDriverContext.java @@ -101,8 +101,6 @@ import com.datastax.oss.protocol.internal.ProtocolV5ClientCodecs; import com.datastax.oss.protocol.internal.ProtocolV6ClientCodecs; import com.datastax.oss.protocol.internal.SegmentCodec; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import io.netty.buffer.ByteBuf; import java.net.InetSocketAddress; import java.util.ArrayList; @@ -113,6 +111,8 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Predicate; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -733,241 +733,241 @@ protected List buildLifecycleListeners() { } } - @NonNull + @Nonnull @Override public String getSessionName() { return sessionName; } - @NonNull + @Nonnull @Override public DriverConfig getConfig() { return config; } - @NonNull + @Nonnull @Override public DriverConfigLoader getConfigLoader() { return configLoader; } - @NonNull + @Nonnull @Override public Map getLoadBalancingPolicies() { return loadBalancingPoliciesRef.get(); } - @NonNull + @Nonnull @Override public Map getRetryPolicies() { return retryPoliciesRef.get(); } - @NonNull + @Nonnull @Override public Map getSpeculativeExecutionPolicies() { return speculativeExecutionPoliciesRef.get(); } - @NonNull + @Nonnull @Override public TimestampGenerator getTimestampGenerator() { return timestampGeneratorRef.get(); } - @NonNull + @Nonnull @Override public ReconnectionPolicy getReconnectionPolicy() { return reconnectionPolicyRef.get(); } - @NonNull + @Nonnull @Override public AddressTranslator getAddressTranslator() { return addressTranslatorRef.get(); } - @NonNull + @Nonnull @Override public Optional getAuthProvider() { return authProviderRef.get(); } - @NonNull + @Nonnull @Override public Optional getSslEngineFactory() { return sslEngineFactoryRef.get(); } - @NonNull + @Nonnull @Override public EventBus getEventBus() { return eventBusRef.get(); } - @NonNull + @Nonnull @Override public Compressor getCompressor() { return compressorRef.get(); } - @NonNull + @Nonnull @Override public PrimitiveCodec getPrimitiveCodec() { return primitiveCodecRef.get(); } - @NonNull + @Nonnull @Override public FrameCodec getFrameCodec() { return frameCodecRef.get(); } - @NonNull + @Nonnull @Override public SegmentCodec getSegmentCodec() { return segmentCodecRef.get(); } - @NonNull + @Nonnull @Override public ProtocolVersionRegistry getProtocolVersionRegistry() { return protocolVersionRegistryRef.get(); } - @NonNull + @Nonnull @Override public ConsistencyLevelRegistry getConsistencyLevelRegistry() { return consistencyLevelRegistryRef.get(); } - @NonNull + @Nonnull @Override public WriteTypeRegistry getWriteTypeRegistry() { return writeTypeRegistryRef.get(); } - @NonNull + @Nonnull @Override public NettyOptions getNettyOptions() { return nettyOptionsRef.get(); } - @NonNull + @Nonnull @Override public WriteCoalescer getWriteCoalescer() { return writeCoalescerRef.get(); } - @NonNull + @Nonnull @Override public Optional getSslHandlerFactory() { return sslHandlerFactoryRef.get(); } - @NonNull + @Nonnull @Override public ChannelFactory getChannelFactory() { return channelFactoryRef.get(); } - @NonNull + @Nonnull @Override public ChannelPoolFactory getChannelPoolFactory() { return channelPoolFactory; } - @NonNull + @Nonnull @Override public TopologyMonitor getTopologyMonitor() { return topologyMonitorRef.get(); } - @NonNull + @Nonnull @Override public MetadataManager getMetadataManager() { return metadataManagerRef.get(); } - @NonNull + @Nonnull @Override public LoadBalancingPolicyWrapper getLoadBalancingPolicyWrapper() { return loadBalancingPolicyWrapperRef.get(); } - @NonNull + @Nonnull @Override public ControlConnection getControlConnection() { return controlConnectionRef.get(); } - @NonNull + @Nonnull @Override public RequestProcessorRegistry getRequestProcessorRegistry() { return requestProcessorRegistryRef.get(); } - @NonNull + @Nonnull @Override public SchemaQueriesFactory getSchemaQueriesFactory() { return schemaQueriesFactoryRef.get(); } - @NonNull + @Nonnull @Override public SchemaParserFactory getSchemaParserFactory() { return schemaParserFactoryRef.get(); } - @NonNull + @Nonnull @Override public TokenFactoryRegistry getTokenFactoryRegistry() { return tokenFactoryRegistryRef.get(); } - @NonNull + @Nonnull @Override public ReplicationStrategyFactory getReplicationStrategyFactory() { return replicationStrategyFactoryRef.get(); } - @NonNull + @Nonnull @Override public PoolManager getPoolManager() { return poolManagerRef.get(); } - @NonNull + @Nonnull @Override public MetricsFactory getMetricsFactory() { return metricsFactoryRef.get(); } - @NonNull + @Nonnull @Override public MetricIdGenerator getMetricIdGenerator() { return metricIdGeneratorRef.get(); } - @NonNull + @Nonnull @Override public RequestThrottler getRequestThrottler() { return requestThrottlerRef.get(); } - @NonNull + @Nonnull @Override public NodeStateListener getNodeStateListener() { return nodeStateListenerRef.get(); } - @NonNull + @Nonnull @Override public SchemaChangeListener getSchemaChangeListener() { return schemaChangeListenerRef.get(); } - @NonNull + @Nonnull @Override public RequestTracker getRequestTracker() { return requestTrackerRef.get(); @@ -975,20 +975,20 @@ public RequestTracker getRequestTracker() { @Nullable @Override - public String getLocalDatacenter(@NonNull String profileName) { + public String getLocalDatacenter(@Nonnull String profileName) { return localDatacentersFromBuilder.get(profileName); } @Nullable @Override @Deprecated - public Predicate getNodeFilter(@NonNull String profileName) { + public Predicate getNodeFilter(@Nonnull String profileName) { return nodeFiltersFromBuilder.get(profileName); } @Nullable @Override - public NodeDistanceEvaluator getNodeDistanceEvaluator(@NonNull String profileName) { + public NodeDistanceEvaluator getNodeDistanceEvaluator(@Nonnull String profileName) { return nodeDistanceEvaluatorsFromBuilder.get(profileName); } @@ -998,19 +998,19 @@ public ClassLoader getClassLoader() { return classLoader; } - @NonNull + @Nonnull @Override public CodecRegistry getCodecRegistry() { return codecRegistry; } - @NonNull + @Nonnull @Override public ProtocolVersion getProtocolVersion() { return getChannelFactory().getProtocolVersion(); } - @NonNull + @Nonnull @Override public Map getStartupOptions() { return startupOptionsRef.get(); @@ -1020,13 +1020,13 @@ protected RequestLogFormatter buildRequestLogFormatter() { return new RequestLogFormatter(this); } - @NonNull + @Nonnull @Override public RequestLogFormatter getRequestLogFormatter() { return requestLogFormatterRef.get(); } - @NonNull + @Nonnull @Override public List getLifecycleListeners() { return lifecycleListenersRef.get(); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/context/InternalDriverContext.java b/core/src/main/java/com/datastax/oss/driver/internal/core/context/InternalDriverContext.java index 81349b0c665..6f69a2d5299 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/context/InternalDriverContext.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/context/InternalDriverContext.java @@ -45,91 +45,91 @@ import com.datastax.oss.protocol.internal.FrameCodec; import com.datastax.oss.protocol.internal.PrimitiveCodec; import com.datastax.oss.protocol.internal.SegmentCodec; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import io.netty.buffer.ByteBuf; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.function.Predicate; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** Extends the driver context with additional components that are not exposed by our public API. */ public interface InternalDriverContext extends DriverContext { - @NonNull + @Nonnull EventBus getEventBus(); - @NonNull + @Nonnull Compressor getCompressor(); - @NonNull + @Nonnull PrimitiveCodec getPrimitiveCodec(); - @NonNull + @Nonnull FrameCodec getFrameCodec(); - @NonNull + @Nonnull SegmentCodec getSegmentCodec(); - @NonNull + @Nonnull ProtocolVersionRegistry getProtocolVersionRegistry(); - @NonNull + @Nonnull ConsistencyLevelRegistry getConsistencyLevelRegistry(); - @NonNull + @Nonnull WriteTypeRegistry getWriteTypeRegistry(); - @NonNull + @Nonnull NettyOptions getNettyOptions(); - @NonNull + @Nonnull WriteCoalescer getWriteCoalescer(); - @NonNull + @Nonnull Optional getSslHandlerFactory(); - @NonNull + @Nonnull ChannelFactory getChannelFactory(); - @NonNull + @Nonnull ChannelPoolFactory getChannelPoolFactory(); - @NonNull + @Nonnull TopologyMonitor getTopologyMonitor(); - @NonNull + @Nonnull MetadataManager getMetadataManager(); - @NonNull + @Nonnull LoadBalancingPolicyWrapper getLoadBalancingPolicyWrapper(); - @NonNull + @Nonnull ControlConnection getControlConnection(); - @NonNull + @Nonnull RequestProcessorRegistry getRequestProcessorRegistry(); - @NonNull + @Nonnull SchemaQueriesFactory getSchemaQueriesFactory(); - @NonNull + @Nonnull SchemaParserFactory getSchemaParserFactory(); - @NonNull + @Nonnull TokenFactoryRegistry getTokenFactoryRegistry(); - @NonNull + @Nonnull ReplicationStrategyFactory getReplicationStrategyFactory(); - @NonNull + @Nonnull PoolManager getPoolManager(); - @NonNull + @Nonnull MetricsFactory getMetricsFactory(); - @NonNull + @Nonnull MetricIdGenerator getMetricIdGenerator(); /** @@ -138,7 +138,7 @@ public interface InternalDriverContext extends DriverContext { * return {@code null}. */ @Nullable - String getLocalDatacenter(@NonNull String profileName); + String getLocalDatacenter(@Nonnull String profileName); /** * This is the filter from {@link SessionBuilder#withNodeFilter(String, Predicate)}. If the filter @@ -149,7 +149,7 @@ public interface InternalDriverContext extends DriverContext { */ @Nullable @Deprecated - Predicate getNodeFilter(@NonNull String profileName); + Predicate getNodeFilter(@Nonnull String profileName); /** * This is the node distance evaluator from {@link @@ -158,7 +158,7 @@ public interface InternalDriverContext extends DriverContext { * null}. */ @Nullable - NodeDistanceEvaluator getNodeDistanceEvaluator(@NonNull String profileName); + NodeDistanceEvaluator getNodeDistanceEvaluator(@Nonnull String profileName); /** * The {@link ClassLoader} to use to reflectively load class names defined in configuration. If @@ -173,7 +173,7 @@ public interface InternalDriverContext extends DriverContext { * construct a {@link com.datastax.oss.protocol.internal.request.Startup} instance when * initializing the native protocol handshake. */ - @NonNull + @Nonnull Map getStartupOptions(); /** @@ -186,7 +186,7 @@ public interface InternalDriverContext extends DriverContext { *

    Note that the driver assumes that the returned list is constant; there is no way to add * listeners dynamically. */ - @NonNull + @Nonnull default List getLifecycleListeners() { return Collections.emptyList(); } @@ -197,7 +197,7 @@ default List getLifecycleListeners() { *

    The {@link RequestLogFormatter} instance returned here will use the settings in * advanced.request-tracker when formatting requests. */ - @NonNull + @Nonnull RequestLogFormatter getRequestLogFormatter(); /** diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/context/StartupOptionsBuilder.java b/core/src/main/java/com/datastax/oss/driver/internal/core/context/StartupOptionsBuilder.java index 684d6b01b9c..f93cfba60a8 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/context/StartupOptionsBuilder.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/context/StartupOptionsBuilder.java @@ -23,9 +23,9 @@ import com.datastax.oss.driver.api.core.uuid.Uuids; import com.datastax.oss.protocol.internal.request.Startup; import com.datastax.oss.protocol.internal.util.collection.NullAllowingImmutableMap; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Map; import java.util.UUID; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; @Immutable diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/control/ControlConnection.java b/core/src/main/java/com/datastax/oss/driver/internal/core/control/ControlConnection.java index 5ee9c6e7810..5d9b8f50210 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/control/ControlConnection.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/control/ControlConnection.java @@ -48,7 +48,6 @@ import com.datastax.oss.protocol.internal.response.event.SchemaChangeEvent; import com.datastax.oss.protocol.internal.response.event.StatusChangeEvent; import com.datastax.oss.protocol.internal.response.event.TopologyChangeEvent; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.util.concurrent.EventExecutor; import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; @@ -61,6 +60,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.function.Consumer; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -153,20 +153,20 @@ public void reconnectNow() { RunOrSchedule.on(adminExecutor, singleThreaded::reconnectNow); } - @NonNull + @Nonnull @Override public CompletionStage closeFuture() { return singleThreaded.closeFuture; } - @NonNull + @Nonnull @Override public CompletionStage closeAsync() { // Control queries are never critical, so there is no graceful close. return forceCloseAsync(); } - @NonNull + @Nonnull @Override public CompletionStage forceCloseAsync() { RunOrSchedule.on(adminExecutor, singleThreaded::forceClose); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlPrepareAsyncProcessor.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlPrepareAsyncProcessor.java index ffbc8ee046a..83ad6864522 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlPrepareAsyncProcessor.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlPrepareAsyncProcessor.java @@ -38,13 +38,13 @@ import com.datastax.oss.driver.shaded.guava.common.cache.CacheBuilder; import com.datastax.oss.driver.shaded.guava.common.collect.Iterables; import com.datastax.oss.protocol.internal.ProtocolConstants; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.util.concurrent.EventExecutor; import java.util.Map; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutionException; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,7 +61,7 @@ public CqlPrepareAsyncProcessor() { this(Optional.empty()); } - public CqlPrepareAsyncProcessor(@NonNull Optional context) { + public CqlPrepareAsyncProcessor(@Nonnull Optional context) { this(CacheBuilder.newBuilder().weakValues().build(), context); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlPrepareHandler.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlPrepareHandler.java index 6faa8eee59f..27ee1520de3 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlPrepareHandler.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlPrepareHandler.java @@ -54,7 +54,6 @@ import com.datastax.oss.protocol.internal.request.Prepare; import com.datastax.oss.protocol.internal.response.Error; import com.datastax.oss.protocol.internal.response.result.Prepared; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.util.Timeout; import io.netty.util.Timer; import io.netty.util.concurrent.Future; @@ -71,6 +70,7 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -210,7 +210,7 @@ private void sendRequest(PrepareRequest request, Node node, int retryCount) { } } - @NonNull + @Nonnull private Prepare toPrepareMessage(PrepareRequest request) { ProtocolVersion protocolVersion = context.getProtocolVersion(); ProtocolVersionRegistry registry = context.getProtocolVersionRegistry(); @@ -312,7 +312,7 @@ private CompletionStage prepareOnOtherNode(PrepareRequest request, Node no } @Override - public void onThrottleFailure(@NonNull RequestThrottlingException error) { + public void onThrottleFailure(@Nonnull RequestThrottlingException error) { DriverExecutionProfile executionProfile = Conversions.resolveExecutionProfile(initialRequest, context); session diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlRequestHandler.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlRequestHandler.java index e7e334d57d8..b2962f3d7ac 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlRequestHandler.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlRequestHandler.java @@ -71,7 +71,6 @@ import com.datastax.oss.protocol.internal.response.result.SetKeyspace; import com.datastax.oss.protocol.internal.response.result.Void; import com.datastax.oss.protocol.internal.util.Bytes; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.handler.codec.EncoderException; import io.netty.util.Timeout; import io.netty.util.Timer; @@ -89,6 +88,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -422,7 +422,7 @@ private ExecutionInfo buildExecutionInfo( } @Override - public void onThrottleFailure(@NonNull RequestThrottlingException error) { + public void onThrottleFailure(@Nonnull RequestThrottlingException error) { DriverExecutionProfile executionProfile = Conversions.resolveExecutionProfile(initialStatement, context); sessionMetricUpdater.incrementCounter( diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultAsyncResultSet.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultAsyncResultSet.java index 243e9aeb775..915252f1f3b 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultAsyncResultSet.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultAsyncResultSet.java @@ -26,12 +26,12 @@ import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.internal.core.context.InternalDriverContext; import com.datastax.oss.driver.internal.core.util.CountingIterator; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.util.Collections; import java.util.List; import java.util.Queue; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; import net.jcip.annotations.NotThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -67,19 +67,19 @@ protected Row computeNext() { this.currentPage = () -> iterator; } - @NonNull + @Nonnull @Override public ColumnDefinitions getColumnDefinitions() { return definitions; } - @NonNull + @Nonnull @Override public ExecutionInfo getExecutionInfo() { return executionInfo; } - @NonNull + @Nonnull @Override public Iterable currentPage() { return currentPage; @@ -95,7 +95,7 @@ public boolean hasMorePages() { return executionInfo.getPagingState() != null; } - @NonNull + @Nonnull @Override public CompletionStage fetchNextPage() throws IllegalStateException { ByteBuffer nextState = executionInfo.getPagingState(); @@ -128,19 +128,19 @@ public boolean wasApplied() { static AsyncResultSet empty(final ExecutionInfo executionInfo) { return new AsyncResultSet() { - @NonNull + @Nonnull @Override public ColumnDefinitions getColumnDefinitions() { return EmptyColumnDefinitions.INSTANCE; } - @NonNull + @Nonnull @Override public ExecutionInfo getExecutionInfo() { return executionInfo; } - @NonNull + @Nonnull @Override public Iterable currentPage() { return Collections.emptyList(); @@ -156,7 +156,7 @@ public boolean hasMorePages() { return false; } - @NonNull + @Nonnull @Override public CompletionStage fetchNextPage() throws IllegalStateException { throw new IllegalStateException( diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultBatchStatement.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultBatchStatement.java index 38b6cf242a1..66b6be256d8 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultBatchStatement.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultBatchStatement.java @@ -28,13 +28,13 @@ import com.datastax.oss.driver.api.core.metadata.token.Token; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; import com.datastax.oss.driver.shaded.guava.common.collect.Iterables; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.time.Duration; import java.util.Iterator; import java.util.List; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; @Immutable @@ -101,15 +101,15 @@ public DefaultBatchStatement( this.nowInSeconds = nowInSeconds; } - @NonNull + @Nonnull @Override public BatchType getBatchType() { return batchType; } - @NonNull + @Nonnull @Override - public BatchStatement setBatchType(@NonNull BatchType newBatchType) { + public BatchStatement setBatchType(@Nonnull BatchType newBatchType) { return new DefaultBatchStatement( newBatchType, statements, @@ -132,7 +132,7 @@ public BatchStatement setBatchType(@NonNull BatchType newBatchType) { nowInSeconds); } - @NonNull + @Nonnull @Override public BatchStatement setKeyspace(@Nullable CqlIdentifier newKeyspace) { return new DefaultBatchStatement( @@ -157,9 +157,9 @@ public BatchStatement setKeyspace(@Nullable CqlIdentifier newKeyspace) { nowInSeconds); } - @NonNull + @Nonnull @Override - public BatchStatement add(@NonNull BatchableStatement statement) { + public BatchStatement add(@Nonnull BatchableStatement statement) { if (statements.size() >= 0xFFFF) { throw new IllegalStateException( "Batch statement cannot contain more than " + 0xFFFF + " statements."); @@ -187,9 +187,9 @@ public BatchStatement add(@NonNull BatchableStatement statement) { } } - @NonNull + @Nonnull @Override - public BatchStatement addAll(@NonNull Iterable> newStatements) { + public BatchStatement addAll(@Nonnull Iterable> newStatements) { if (statements.size() + Iterables.size(newStatements) > 0xFFFF) { throw new IllegalStateException( "Batch statement cannot contain more than " + 0xFFFF + " statements."); @@ -225,7 +225,7 @@ public int size() { return statements.size(); } - @NonNull + @Nonnull @Override public BatchStatement clear() { return new DefaultBatchStatement( @@ -250,7 +250,7 @@ public BatchStatement clear() { nowInSeconds); } - @NonNull + @Nonnull @Override public Iterator> iterator() { return statements.iterator(); @@ -261,7 +261,7 @@ public ByteBuffer getPagingState() { return pagingState; } - @NonNull + @Nonnull @Override public BatchStatement setPagingState(ByteBuffer newPagingState) { return new DefaultBatchStatement( @@ -291,7 +291,7 @@ public int getPageSize() { return pageSize; } - @NonNull + @Nonnull @Override public BatchStatement setPageSize(int newPageSize) { return new DefaultBatchStatement( @@ -322,7 +322,7 @@ public ConsistencyLevel getConsistencyLevel() { return consistencyLevel; } - @NonNull + @Nonnull @Override public BatchStatement setConsistencyLevel(@Nullable ConsistencyLevel newConsistencyLevel) { return new DefaultBatchStatement( @@ -353,7 +353,7 @@ public ConsistencyLevel getSerialConsistencyLevel() { return serialConsistencyLevel; } - @NonNull + @Nonnull @Override public BatchStatement setSerialConsistencyLevel( @Nullable ConsistencyLevel newSerialConsistencyLevel) { @@ -384,7 +384,7 @@ public String getExecutionProfileName() { return executionProfileName; } - @NonNull + @Nonnull @Override public BatchStatement setExecutionProfileName(@Nullable String newConfigProfileName) { return new DefaultBatchStatement( @@ -414,7 +414,7 @@ public DriverExecutionProfile getExecutionProfile() { return executionProfile; } - @NonNull + @Nonnull @Override public DefaultBatchStatement setExecutionProfile(@Nullable DriverExecutionProfile newProfile) { return new DefaultBatchStatement( @@ -468,7 +468,7 @@ public CqlIdentifier getRoutingKeyspace() { return null; } - @NonNull + @Nonnull @Override public BatchStatement setRoutingKeyspace(CqlIdentifier newRoutingKeyspace) { return new DefaultBatchStatement( @@ -493,7 +493,7 @@ public BatchStatement setRoutingKeyspace(CqlIdentifier newRoutingKeyspace) { nowInSeconds); } - @NonNull + @Nonnull @Override public BatchStatement setNode(@Nullable Node newNode) { return new DefaultBatchStatement( @@ -539,7 +539,7 @@ public ByteBuffer getRoutingKey() { return null; } - @NonNull + @Nonnull @Override public BatchStatement setRoutingKey(ByteBuffer newRoutingKey) { return new DefaultBatchStatement( @@ -579,7 +579,7 @@ public Token getRoutingToken() { return null; } - @NonNull + @Nonnull @Override public BatchStatement setRoutingToken(Token newRoutingToken) { return new DefaultBatchStatement( @@ -604,15 +604,15 @@ public BatchStatement setRoutingToken(Token newRoutingToken) { nowInSeconds); } - @NonNull + @Nonnull @Override public Map getCustomPayload() { return customPayload; } - @NonNull + @Nonnull @Override - public DefaultBatchStatement setCustomPayload(@NonNull Map newCustomPayload) { + public DefaultBatchStatement setCustomPayload(@Nonnull Map newCustomPayload) { return new DefaultBatchStatement( batchType, statements, @@ -646,7 +646,7 @@ public Duration getTimeout() { return null; } - @NonNull + @Nonnull @Override public DefaultBatchStatement setIdempotent(Boolean newIdempotence) { return new DefaultBatchStatement( @@ -676,7 +676,7 @@ public boolean isTracing() { return tracing; } - @NonNull + @Nonnull @Override public BatchStatement setTracing(boolean newTracing) { return new DefaultBatchStatement( @@ -706,7 +706,7 @@ public long getQueryTimestamp() { return timestamp; } - @NonNull + @Nonnull @Override public BatchStatement setQueryTimestamp(long newTimestamp) { return new DefaultBatchStatement( @@ -731,7 +731,7 @@ public BatchStatement setQueryTimestamp(long newTimestamp) { nowInSeconds); } - @NonNull + @Nonnull @Override public BatchStatement setTimeout(@Nullable Duration newTimeout) { return new DefaultBatchStatement( @@ -761,7 +761,7 @@ public int getNowInSeconds() { return nowInSeconds; } - @NonNull + @Nonnull @Override public BatchStatement setNowInSeconds(int newNowInSeconds) { return new DefaultBatchStatement( diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultBoundStatement.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultBoundStatement.java index fb6b8fd7b27..c0ebdd383d0 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultBoundStatement.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultBoundStatement.java @@ -29,13 +29,13 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry; import com.datastax.oss.driver.internal.core.util.RoutingKey; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.time.Duration; import java.util.Arrays; import java.util.List; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; @Immutable @@ -113,15 +113,15 @@ public int size() { return variableDefinitions.size(); } - @NonNull + @Nonnull @Override public DataType getType(int i) { return variableDefinitions.get(i).getType(); } - @NonNull + @Nonnull @Override - public List allIndicesOf(@NonNull CqlIdentifier id) { + public List allIndicesOf(@Nonnull CqlIdentifier id) { List indices = variableDefinitions.allIndicesOf(id); if (indices.isEmpty()) { throw new IllegalArgumentException(id + " is not a variable in this bound statement"); @@ -130,7 +130,7 @@ public List allIndicesOf(@NonNull CqlIdentifier id) { } @Override - public int firstIndexOf(@NonNull CqlIdentifier id) { + public int firstIndexOf(@Nonnull CqlIdentifier id) { int indexOf = variableDefinitions.firstIndexOf(id); if (indexOf == -1) { throw new IllegalArgumentException(id + " is not a variable in this bound statement"); @@ -138,9 +138,9 @@ public int firstIndexOf(@NonNull CqlIdentifier id) { return indexOf; } - @NonNull + @Nonnull @Override - public List allIndicesOf(@NonNull String name) { + public List allIndicesOf(@Nonnull String name) { List indices = variableDefinitions.allIndicesOf(name); if (indices.isEmpty()) { throw new IllegalArgumentException(name + " is not a variable in this bound statement"); @@ -149,7 +149,7 @@ public List allIndicesOf(@NonNull String name) { } @Override - public int firstIndexOf(@NonNull String name) { + public int firstIndexOf(@Nonnull String name) { int indexOf = variableDefinitions.firstIndexOf(name); if (indexOf == -1) { throw new IllegalArgumentException(name + " is not a variable in this bound statement"); @@ -157,13 +157,13 @@ public int firstIndexOf(@NonNull String name) { return indexOf; } - @NonNull + @Nonnull @Override public CodecRegistry codecRegistry() { return codecRegistry; } - @NonNull + @Nonnull @Override public ProtocolVersion protocolVersion() { return protocolVersion; @@ -174,7 +174,7 @@ public ByteBuffer getBytesUnsafe(int i) { return values[i]; } - @NonNull + @Nonnull @Override public BoundStatement setBytesUnsafe(int i, ByteBuffer v) { ByteBuffer[] newValues = Arrays.copyOf(values, values.length); @@ -203,13 +203,13 @@ public BoundStatement setBytesUnsafe(int i, ByteBuffer v) { nowInSeconds); } - @NonNull + @Nonnull @Override public PreparedStatement getPreparedStatement() { return preparedStatement; } - @NonNull + @Nonnull @Override public List getValues() { return Arrays.asList(values); @@ -220,7 +220,7 @@ public String getExecutionProfileName() { return executionProfileName; } - @NonNull + @Nonnull @Override public BoundStatement setExecutionProfileName(@Nullable String newConfigProfileName) { return new DefaultBoundStatement( @@ -252,7 +252,7 @@ public DriverExecutionProfile getExecutionProfile() { return executionProfile; } - @NonNull + @Nonnull @Override public BoundStatement setExecutionProfile(@Nullable DriverExecutionProfile newProfile) { return new DefaultBoundStatement( @@ -291,7 +291,7 @@ public CqlIdentifier getRoutingKeyspace() { } } - @NonNull + @Nonnull @Override public BoundStatement setRoutingKeyspace(@Nullable CqlIdentifier newRoutingKeyspace) { return new DefaultBoundStatement( @@ -318,7 +318,7 @@ public BoundStatement setRoutingKeyspace(@Nullable CqlIdentifier newRoutingKeysp nowInSeconds); } - @NonNull + @Nonnull @Override public BoundStatement setNode(@Nullable Node newNode) { return new DefaultBoundStatement( @@ -377,7 +377,7 @@ public ByteBuffer getRoutingKey() { } } - @NonNull + @Nonnull @Override public BoundStatement setRoutingKey(@Nullable ByteBuffer newRoutingKey) { return new DefaultBoundStatement( @@ -409,7 +409,7 @@ public Token getRoutingToken() { return routingToken; } - @NonNull + @Nonnull @Override public BoundStatement setRoutingToken(@Nullable Token newRoutingToken) { return new DefaultBoundStatement( @@ -436,15 +436,15 @@ public BoundStatement setRoutingToken(@Nullable Token newRoutingToken) { nowInSeconds); } - @NonNull + @Nonnull @Override public Map getCustomPayload() { return customPayload; } - @NonNull + @Nonnull @Override - public BoundStatement setCustomPayload(@NonNull Map newCustomPayload) { + public BoundStatement setCustomPayload(@Nonnull Map newCustomPayload) { return new DefaultBoundStatement( preparedStatement, variableDefinitions, @@ -474,7 +474,7 @@ public Boolean isIdempotent() { return idempotent; } - @NonNull + @Nonnull @Override public BoundStatement setIdempotent(@Nullable Boolean newIdempotence) { return new DefaultBoundStatement( @@ -506,7 +506,7 @@ public boolean isTracing() { return tracing; } - @NonNull + @Nonnull @Override public BoundStatement setTracing(boolean newTracing) { return new DefaultBoundStatement( @@ -538,7 +538,7 @@ public long getQueryTimestamp() { return timestamp; } - @NonNull + @Nonnull @Override public BoundStatement setQueryTimestamp(long newTimestamp) { return new DefaultBoundStatement( @@ -571,7 +571,7 @@ public Duration getTimeout() { return timeout; } - @NonNull + @Nonnull @Override public BoundStatement setTimeout(@Nullable Duration newTimeout) { return new DefaultBoundStatement( @@ -603,7 +603,7 @@ public ByteBuffer getPagingState() { return pagingState; } - @NonNull + @Nonnull @Override public BoundStatement setPagingState(@Nullable ByteBuffer newPagingState) { return new DefaultBoundStatement( @@ -635,7 +635,7 @@ public int getPageSize() { return pageSize; } - @NonNull + @Nonnull @Override public BoundStatement setPageSize(int newPageSize) { return new DefaultBoundStatement( @@ -668,7 +668,7 @@ public ConsistencyLevel getConsistencyLevel() { return consistencyLevel; } - @NonNull + @Nonnull @Override public BoundStatement setConsistencyLevel(@Nullable ConsistencyLevel newConsistencyLevel) { return new DefaultBoundStatement( @@ -701,7 +701,7 @@ public ConsistencyLevel getSerialConsistencyLevel() { return serialConsistencyLevel; } - @NonNull + @Nonnull @Override public BoundStatement setSerialConsistencyLevel( @Nullable ConsistencyLevel newSerialConsistencyLevel) { @@ -734,7 +734,7 @@ public int getNowInSeconds() { return nowInSeconds; } - @NonNull + @Nonnull @Override public BoundStatement setNowInSeconds(int newNowInSeconds) { return new DefaultBoundStatement( diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultColumnDefinition.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultColumnDefinition.java index e003637c07f..318af840159 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultColumnDefinition.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultColumnDefinition.java @@ -23,8 +23,8 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.internal.core.type.DataTypeHelper; import com.datastax.oss.protocol.internal.response.result.ColumnSpec; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.Serializable; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -43,32 +43,32 @@ public class DefaultColumnDefinition implements ColumnDefinition, Serializable { /** @param spec the raw data decoded by the protocol layer */ public DefaultColumnDefinition( - @NonNull ColumnSpec spec, @NonNull AttachmentPoint attachmentPoint) { + @Nonnull ColumnSpec spec, @Nonnull AttachmentPoint attachmentPoint) { this.keyspace = CqlIdentifier.fromInternal(spec.ksName); this.table = CqlIdentifier.fromInternal(spec.tableName); this.name = CqlIdentifier.fromInternal(spec.name); this.type = DataTypeHelper.fromProtocolSpec(spec.type, attachmentPoint); } - @NonNull + @Nonnull @Override public CqlIdentifier getKeyspace() { return keyspace; } - @NonNull + @Nonnull @Override public CqlIdentifier getTable() { return table; } - @NonNull + @Nonnull @Override public CqlIdentifier getName() { return name; } - @NonNull + @Nonnull @Override public DataType getType() { return type; @@ -80,7 +80,7 @@ public boolean isDetached() { } @Override - public void attach(@NonNull AttachmentPoint attachmentPoint) { + public void attach(@Nonnull AttachmentPoint attachmentPoint) { type.attach(attachmentPoint); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultColumnDefinitions.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultColumnDefinitions.java index 58304cb4f67..2461777723d 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultColumnDefinitions.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultColumnDefinitions.java @@ -22,13 +22,13 @@ import com.datastax.oss.driver.api.core.cql.ColumnDefinitions; import com.datastax.oss.driver.api.core.detach.AttachmentPoint; import com.datastax.oss.driver.internal.core.data.IdentifierIndex; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -54,47 +54,47 @@ public int size() { return definitions.size(); } - @NonNull + @Nonnull @Override public ColumnDefinition get(int i) { return definitions.get(i); } - @NonNull + @Nonnull @Override public Iterator iterator() { return definitions.iterator(); } @Override - public boolean contains(@NonNull String name) { + public boolean contains(@Nonnull String name) { return index.firstIndexOf(name) >= 0; } @Override - public boolean contains(@NonNull CqlIdentifier id) { + public boolean contains(@Nonnull CqlIdentifier id) { return index.firstIndexOf(id) >= 0; } - @NonNull + @Nonnull @Override - public List allIndicesOf(@NonNull String name) { + public List allIndicesOf(@Nonnull String name) { return index.allIndicesOf(name); } @Override - public int firstIndexOf(@NonNull String name) { + public int firstIndexOf(@Nonnull String name) { return index.firstIndexOf(name); } - @NonNull + @Nonnull @Override - public List allIndicesOf(@NonNull CqlIdentifier id) { + public List allIndicesOf(@Nonnull CqlIdentifier id) { return index.allIndicesOf(id); } @Override - public int firstIndexOf(@NonNull CqlIdentifier id) { + public int firstIndexOf(@Nonnull CqlIdentifier id) { return index.firstIndexOf(id); } @@ -104,7 +104,7 @@ public boolean isDetached() { } @Override - public void attach(@NonNull AttachmentPoint attachmentPoint) { + public void attach(@Nonnull AttachmentPoint attachmentPoint) { for (ColumnDefinition definition : definitions) { definition.attach(attachmentPoint); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultExecutionInfo.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultExecutionInfo.java index 3ab57ddc598..f648b1015b4 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultExecutionInfo.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultExecutionInfo.java @@ -28,14 +28,14 @@ import com.datastax.oss.driver.internal.core.session.DefaultSession; import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures; import com.datastax.oss.protocol.internal.Frame; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.UUID; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; @Immutable @@ -89,14 +89,14 @@ public DefaultExecutionInfo( this.executionProfile = executionProfile; } - @NonNull + @Nonnull @Override @Deprecated public Statement getStatement() { return (Statement) request; } - @NonNull + @Nonnull @Override public Request getRequest() { return request; @@ -118,7 +118,7 @@ public int getSuccessfulExecutionIndex() { return successfulExecutionIndex; } - @NonNull + @Nonnull @Override public List> getErrors() { // Assume this method will be called 0 or 1 time, so we create the unmodifiable wrapper on @@ -146,13 +146,13 @@ public PagingState getSafePagingState() { } } - @NonNull + @Nonnull @Override public List getWarnings() { return warnings; } - @NonNull + @Nonnull @Override public Map getIncomingPayload() { return customPayload; @@ -169,7 +169,7 @@ public UUID getTracingId() { return tracingId; } - @NonNull + @Nonnull @Override public CompletionStage getQueryTraceAsync() { if (tracingId == null) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultPagingState.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultPagingState.java index 71243285e3e..70922667c65 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultPagingState.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultPagingState.java @@ -26,13 +26,13 @@ import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.internal.core.data.ValuesHelper; import com.datastax.oss.protocol.internal.util.Bytes; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class DefaultPagingState implements PagingState { @@ -101,14 +101,14 @@ public String toString() { } @Override - public boolean matches(@NonNull Statement statement, @Nullable Session session) { + public boolean matches(@Nonnull Statement statement, @Nullable Session session) { AttachmentPoint attachmentPoint = (session == null) ? AttachmentPoint.NONE : session.getContext(); byte[] actual = hash(statement, rawPagingState, attachmentPoint); return Arrays.equals(actual, hash); } - @NonNull + @Nonnull @Override public ByteBuffer getRawPagingState() { return rawPagingState; @@ -117,9 +117,9 @@ public ByteBuffer getRawPagingState() { // Hashes a statement's query string and parameters. We also include the paging state itself in // the hash computation, to make the serialized form a bit more resistant to manual tampering. private static byte[] hash( - @NonNull Statement statement, + @Nonnull Statement statement, ByteBuffer rawPagingState, - @NonNull AttachmentPoint attachmentPoint) { + @Nonnull AttachmentPoint attachmentPoint) { // Batch statements don't have paging, the driver should never call this method for one assert !(statement instanceof BatchStatement); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultPrepareRequest.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultPrepareRequest.java index 7f87dbe5b51..95781c26548 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultPrepareRequest.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultPrepareRequest.java @@ -25,11 +25,11 @@ import com.datastax.oss.driver.api.core.cql.SimpleStatement; import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.metadata.token.Token; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.time.Duration; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; /** @@ -62,7 +62,7 @@ public DefaultPrepareRequest(String query) { this.statement = SimpleStatement.newInstance(query); } - @NonNull + @Nonnull @Override public String getQuery() { return statement.getQuery(); @@ -105,7 +105,7 @@ public Token getRoutingToken() { return null; } - @NonNull + @Nonnull @Override public Map getCustomPayload() { return statement.getCustomPayload(); @@ -149,7 +149,7 @@ public Token getRoutingTokenForBoundStatements() { return statement.getRoutingToken(); } - @NonNull + @Nonnull @Override public Map getCustomPayloadForBoundStatements() { return statement.getCustomPayload(); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultPreparedStatement.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultPreparedStatement.java index e45e1e5add0..8f2a43e80de 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultPreparedStatement.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultPreparedStatement.java @@ -30,11 +30,11 @@ import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry; import com.datastax.oss.driver.internal.core.data.ValuesHelper; import com.datastax.oss.driver.internal.core.session.RepreparePayload; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.time.Duration; import java.util.List; import java.util.Map; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -111,25 +111,25 @@ public DefaultPreparedStatement( this.protocolVersion = protocolVersion; } - @NonNull + @Nonnull @Override public ByteBuffer getId() { return id; } - @NonNull + @Nonnull @Override public String getQuery() { return repreparePayload.query; } - @NonNull + @Nonnull @Override public ColumnDefinitions getVariableDefinitions() { return variableDefinitions; } - @NonNull + @Nonnull @Override public List getPartitionKeyIndices() { return partitionKeyIndices; @@ -140,7 +140,7 @@ public ByteBuffer getResultMetadataId() { return resultMetadata.resultMetadataId; } - @NonNull + @Nonnull @Override public ColumnDefinitions getResultSetDefinitions() { return resultMetadata.resultSetDefinitions; @@ -148,13 +148,13 @@ public ColumnDefinitions getResultSetDefinitions() { @Override public void setResultMetadata( - @NonNull ByteBuffer newResultMetadataId, @NonNull ColumnDefinitions newResultSetDefinitions) { + @Nonnull ByteBuffer newResultMetadataId, @Nonnull ColumnDefinitions newResultSetDefinitions) { this.resultMetadata = new ResultMetadata(newResultMetadataId, newResultSetDefinitions); } - @NonNull + @Nonnull @Override - public BoundStatement bind(@NonNull Object... values) { + public BoundStatement bind(@Nonnull Object... values) { return new DefaultBoundStatement( this, variableDefinitions, @@ -180,9 +180,9 @@ public BoundStatement bind(@NonNull Object... values) { Statement.NO_NOW_IN_SECONDS); } - @NonNull + @Nonnull @Override - public BoundStatementBuilder boundStatementBuilder(@NonNull Object... values) { + public BoundStatementBuilder boundStatementBuilder(@Nonnull Object... values) { return new BoundStatementBuilder( this, variableDefinitions, diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultQueryTrace.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultQueryTrace.java index db95cc408b6..80f66a6dd87 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultQueryTrace.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultQueryTrace.java @@ -19,12 +19,12 @@ import com.datastax.oss.driver.api.core.cql.QueryTrace; import com.datastax.oss.driver.api.core.cql.TraceEvent; -import edu.umd.cs.findbugs.annotations.NonNull; import java.net.InetAddress; import java.net.InetSocketAddress; import java.util.List; import java.util.Map; import java.util.UUID; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -55,13 +55,13 @@ public DefaultQueryTrace( this.events = events; } - @NonNull + @Nonnull @Override public UUID getTracingId() { return tracingId; } - @NonNull + @Nonnull @Override public String getRequestType() { return requestType; @@ -72,20 +72,20 @@ public int getDurationMicros() { return durationMicros; } - @NonNull + @Nonnull @Override @Deprecated public InetAddress getCoordinator() { return coordinator.getAddress(); } - @NonNull + @Nonnull @Override public InetSocketAddress getCoordinatorAddress() { return coordinator; } - @NonNull + @Nonnull @Override public Map getParameters() { return parameters; @@ -96,7 +96,7 @@ public long getStartedAt() { return startedAt; } - @NonNull + @Nonnull @Override public List getEvents() { return events; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultRow.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultRow.java index d6bf39ab9c0..d8c98c6cd63 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultRow.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultRow.java @@ -25,14 +25,14 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry; import com.datastax.oss.protocol.internal.util.Bytes; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.Serializable; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; @Immutable @@ -53,7 +53,7 @@ public DefaultRow(ColumnDefinitions definitions, List data) { this(definitions, data, AttachmentPoint.NONE); } - @NonNull + @Nonnull @Override public ColumnDefinitions getColumnDefinitions() { return definitions; @@ -64,15 +64,15 @@ public int size() { return definitions.size(); } - @NonNull + @Nonnull @Override public DataType getType(int i) { return definitions.get(i).getType(); } - @NonNull + @Nonnull @Override - public List allIndicesOf(@NonNull CqlIdentifier id) { + public List allIndicesOf(@Nonnull CqlIdentifier id) { List indices = definitions.allIndicesOf(id); if (indices.isEmpty()) { throw new IllegalArgumentException(id + " is not a column in this row"); @@ -81,7 +81,7 @@ public List allIndicesOf(@NonNull CqlIdentifier id) { } @Override - public int firstIndexOf(@NonNull CqlIdentifier id) { + public int firstIndexOf(@Nonnull CqlIdentifier id) { int indexOf = definitions.firstIndexOf(id); if (indexOf == -1) { throw new IllegalArgumentException(id + " is not a column in this row"); @@ -89,15 +89,15 @@ public int firstIndexOf(@NonNull CqlIdentifier id) { return indexOf; } - @NonNull + @Nonnull @Override - public DataType getType(@NonNull CqlIdentifier id) { + public DataType getType(@Nonnull CqlIdentifier id) { return definitions.get(firstIndexOf(id)).getType(); } - @NonNull + @Nonnull @Override - public List allIndicesOf(@NonNull String name) { + public List allIndicesOf(@Nonnull String name) { List indices = definitions.allIndicesOf(name); if (indices.isEmpty()) { throw new IllegalArgumentException(name + " is not a column in this row"); @@ -106,7 +106,7 @@ public List allIndicesOf(@NonNull String name) { } @Override - public int firstIndexOf(@NonNull String name) { + public int firstIndexOf(@Nonnull String name) { int indexOf = definitions.firstIndexOf(name); if (indexOf == -1) { throw new IllegalArgumentException(name + " is not a column in this row"); @@ -114,19 +114,19 @@ public int firstIndexOf(@NonNull String name) { return indexOf; } - @NonNull + @Nonnull @Override - public DataType getType(@NonNull String name) { + public DataType getType(@Nonnull String name) { return definitions.get(firstIndexOf(name)).getType(); } - @NonNull + @Nonnull @Override public CodecRegistry codecRegistry() { return attachmentPoint.getCodecRegistry(); } - @NonNull + @Nonnull @Override public ProtocolVersion protocolVersion() { return attachmentPoint.getProtocolVersion(); @@ -138,7 +138,7 @@ public boolean isDetached() { } @Override - public void attach(@NonNull AttachmentPoint attachmentPoint) { + public void attach(@Nonnull AttachmentPoint attachmentPoint) { this.attachmentPoint = attachmentPoint; this.definitions.attach(attachmentPoint); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultSimpleStatement.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultSimpleStatement.java index c763860479e..f4b7f627482 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultSimpleStatement.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultSimpleStatement.java @@ -25,13 +25,13 @@ import com.datastax.oss.driver.api.core.metadata.token.Token; import com.datastax.oss.protocol.internal.util.collection.NullAllowingImmutableList; import com.datastax.oss.protocol.internal.util.collection.NullAllowingImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.time.Duration; import java.util.List; import java.util.Map; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; @Immutable @@ -106,15 +106,15 @@ public DefaultSimpleStatement( this.nowInSeconds = nowInSeconds; } - @NonNull + @Nonnull @Override public String getQuery() { return query; } - @NonNull + @Nonnull @Override - public SimpleStatement setQuery(@NonNull String newQuery) { + public SimpleStatement setQuery(@Nonnull String newQuery) { return new DefaultSimpleStatement( newQuery, positionalValues, @@ -138,15 +138,15 @@ public SimpleStatement setQuery(@NonNull String newQuery) { nowInSeconds); } - @NonNull + @Nonnull @Override public List getPositionalValues() { return positionalValues; } - @NonNull + @Nonnull @Override - public SimpleStatement setPositionalValues(@NonNull List newPositionalValues) { + public SimpleStatement setPositionalValues(@Nonnull List newPositionalValues) { return new DefaultSimpleStatement( query, newPositionalValues, @@ -170,15 +170,15 @@ public SimpleStatement setPositionalValues(@NonNull List newPositionalVa nowInSeconds); } - @NonNull + @Nonnull @Override public Map getNamedValues() { return namedValues; } - @NonNull + @Nonnull @Override - public SimpleStatement setNamedValuesWithIds(@NonNull Map newNamedValues) { + public SimpleStatement setNamedValuesWithIds(@Nonnull Map newNamedValues) { return new DefaultSimpleStatement( query, positionalValues, @@ -208,7 +208,7 @@ public String getExecutionProfileName() { return executionProfileName; } - @NonNull + @Nonnull @Override public SimpleStatement setExecutionProfileName(@Nullable String newConfigProfileName) { return new DefaultSimpleStatement( @@ -240,7 +240,7 @@ public DriverExecutionProfile getExecutionProfile() { return executionProfile; } - @NonNull + @Nonnull @Override public SimpleStatement setExecutionProfile(@Nullable DriverExecutionProfile newProfile) { return new DefaultSimpleStatement( @@ -272,7 +272,7 @@ public CqlIdentifier getKeyspace() { return keyspace; } - @NonNull + @Nonnull @Override public SimpleStatement setKeyspace(@Nullable CqlIdentifier newKeyspace) { return new DefaultSimpleStatement( @@ -304,7 +304,7 @@ public CqlIdentifier getRoutingKeyspace() { return routingKeyspace; } - @NonNull + @Nonnull @Override public SimpleStatement setRoutingKeyspace(@Nullable CqlIdentifier newRoutingKeyspace) { return new DefaultSimpleStatement( @@ -330,7 +330,7 @@ public SimpleStatement setRoutingKeyspace(@Nullable CqlIdentifier newRoutingKeys nowInSeconds); } - @NonNull + @Nonnull @Override public SimpleStatement setNode(@Nullable Node newNode) { return new DefaultSimpleStatement( @@ -368,7 +368,7 @@ public ByteBuffer getRoutingKey() { return routingKey; } - @NonNull + @Nonnull @Override public SimpleStatement setRoutingKey(@Nullable ByteBuffer newRoutingKey) { return new DefaultSimpleStatement( @@ -400,7 +400,7 @@ public Token getRoutingToken() { return routingToken; } - @NonNull + @Nonnull @Override public SimpleStatement setRoutingToken(@Nullable Token newRoutingToken) { return new DefaultSimpleStatement( @@ -426,15 +426,15 @@ public SimpleStatement setRoutingToken(@Nullable Token newRoutingToken) { nowInSeconds); } - @NonNull + @Nonnull @Override public Map getCustomPayload() { return customPayload; } - @NonNull + @Nonnull @Override - public SimpleStatement setCustomPayload(@NonNull Map newCustomPayload) { + public SimpleStatement setCustomPayload(@Nonnull Map newCustomPayload) { return new DefaultSimpleStatement( query, positionalValues, @@ -464,7 +464,7 @@ public Boolean isIdempotent() { return idempotent; } - @NonNull + @Nonnull @Override public SimpleStatement setIdempotent(@Nullable Boolean newIdempotence) { return new DefaultSimpleStatement( @@ -495,7 +495,7 @@ public boolean isTracing() { return tracing; } - @NonNull + @Nonnull @Override public SimpleStatement setTracing(boolean newTracing) { return new DefaultSimpleStatement( @@ -526,7 +526,7 @@ public long getQueryTimestamp() { return timestamp; } - @NonNull + @Nonnull @Override public SimpleStatement setQueryTimestamp(long newTimestamp) { return new DefaultSimpleStatement( @@ -558,7 +558,7 @@ public Duration getTimeout() { return timeout; } - @NonNull + @Nonnull @Override public SimpleStatement setTimeout(@Nullable Duration newTimeout) { return new DefaultSimpleStatement( @@ -590,7 +590,7 @@ public ByteBuffer getPagingState() { return pagingState; } - @NonNull + @Nonnull @Override public SimpleStatement setPagingState(@Nullable ByteBuffer newPagingState) { return new DefaultSimpleStatement( @@ -621,7 +621,7 @@ public int getPageSize() { return pageSize; } - @NonNull + @Nonnull @Override public SimpleStatement setPageSize(int newPageSize) { return new DefaultSimpleStatement( @@ -653,7 +653,7 @@ public ConsistencyLevel getConsistencyLevel() { return consistencyLevel; } - @NonNull + @Nonnull @Override public SimpleStatement setConsistencyLevel(@Nullable ConsistencyLevel newConsistencyLevel) { return new DefaultSimpleStatement( @@ -685,7 +685,7 @@ public ConsistencyLevel getSerialConsistencyLevel() { return serialConsistencyLevel; } - @NonNull + @Nonnull @Override public SimpleStatement setSerialConsistencyLevel( @Nullable ConsistencyLevel newSerialConsistencyLevel) { @@ -717,7 +717,7 @@ public int getNowInSeconds() { return nowInSeconds; } - @NonNull + @Nonnull @Override public SimpleStatement setNowInSeconds(int newNowInSeconds) { return new DefaultSimpleStatement( diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/EmptyColumnDefinitions.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/EmptyColumnDefinitions.java index 53cfee98b3e..f8f0d6c2de6 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/EmptyColumnDefinitions.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/EmptyColumnDefinitions.java @@ -21,10 +21,10 @@ import com.datastax.oss.driver.api.core.cql.ColumnDefinition; import com.datastax.oss.driver.api.core.cql.ColumnDefinitions; import com.datastax.oss.driver.api.core.detach.AttachmentPoint; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collections; import java.util.Iterator; import java.util.List; +import javax.annotation.Nonnull; /** * The singleton that represents no column definitions (implemented as an enum which provides the @@ -38,41 +38,41 @@ public int size() { return 0; } - @NonNull + @Nonnull @Override public ColumnDefinition get(int i) { throw new ArrayIndexOutOfBoundsException(); } @Override - public boolean contains(@NonNull String name) { + public boolean contains(@Nonnull String name) { return false; } @Override - public boolean contains(@NonNull CqlIdentifier id) { + public boolean contains(@Nonnull CqlIdentifier id) { return false; } - @NonNull + @Nonnull @Override - public List allIndicesOf(@NonNull String name) { + public List allIndicesOf(@Nonnull String name) { return Collections.emptyList(); } @Override - public int firstIndexOf(@NonNull String name) { + public int firstIndexOf(@Nonnull String name) { return -1; } - @NonNull + @Nonnull @Override - public List allIndicesOf(@NonNull CqlIdentifier id) { + public List allIndicesOf(@Nonnull CqlIdentifier id) { return Collections.emptyList(); } @Override - public int firstIndexOf(@NonNull CqlIdentifier id) { + public int firstIndexOf(@Nonnull CqlIdentifier id) { return -1; } @@ -82,7 +82,7 @@ public boolean isDetached() { } @Override - public void attach(@NonNull AttachmentPoint attachmentPoint) {} + public void attach(@Nonnull AttachmentPoint attachmentPoint) {} @Override public Iterator iterator() { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/MultiPageResultSet.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/MultiPageResultSet.java index 2115a127dc6..cd85ee1d409 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/MultiPageResultSet.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/MultiPageResultSet.java @@ -25,10 +25,10 @@ import com.datastax.oss.driver.internal.core.util.CountingIterator; import com.datastax.oss.driver.internal.core.util.concurrent.BlockingOperation; import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import javax.annotation.Nonnull; import net.jcip.annotations.NotThreadSafe; @NotThreadSafe @@ -38,20 +38,20 @@ public class MultiPageResultSet implements ResultSet { private final List executionInfos = new ArrayList<>(); private ColumnDefinitions columnDefinitions; - public MultiPageResultSet(@NonNull AsyncResultSet firstPage) { + public MultiPageResultSet(@Nonnull AsyncResultSet firstPage) { assert firstPage.hasMorePages(); this.iterator = new RowIterator(firstPage); this.executionInfos.add(firstPage.getExecutionInfo()); this.columnDefinitions = firstPage.getColumnDefinitions(); } - @NonNull + @Nonnull @Override public ColumnDefinitions getColumnDefinitions() { return columnDefinitions; } - @NonNull + @Nonnull @Override public List getExecutionInfos() { return executionInfos; @@ -67,7 +67,7 @@ public int getAvailableWithoutFetching() { return iterator.remaining(); } - @NonNull + @Nonnull @Override public Iterator iterator() { return iterator; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/PagingIterableSpliterator.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/PagingIterableSpliterator.java index 742699d2c1e..9b26b740580 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/PagingIterableSpliterator.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/PagingIterableSpliterator.java @@ -19,12 +19,12 @@ import com.datastax.oss.driver.api.core.PagingIterable; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Objects; import java.util.Spliterator; import java.util.Spliterators; import java.util.function.Consumer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.NotThreadSafe; /** @@ -36,8 +36,8 @@ @NotThreadSafe public class PagingIterableSpliterator implements Spliterator { - @NonNull - public static Builder builder(@NonNull PagingIterable iterable) { + @Nonnull + public static Builder builder(@Nonnull PagingIterable iterable) { return new Builder<>(iterable); } @@ -55,12 +55,12 @@ public static Builder builder(@NonNull PagingIterable iterable) { + public PagingIterableSpliterator(@Nonnull PagingIterable iterable) { this(iterable, Long.MAX_VALUE, DEFAULT_CHUNK_SIZE); } private PagingIterableSpliterator( - @NonNull PagingIterable iterable, long estimatedSize, int chunkSize) { + @Nonnull PagingIterable iterable, long estimatedSize, int chunkSize) { this.iterable = Objects.requireNonNull(iterable, "iterable cannot be null"); this.estimatedSize = estimatedSize; this.chunkSize = chunkSize; @@ -136,25 +136,25 @@ public static class Builder { private long estimatedSize = Long.MAX_VALUE; private int chunkSize = DEFAULT_CHUNK_SIZE; - Builder(@NonNull PagingIterable iterable) { + Builder(@Nonnull PagingIterable iterable) { this.iterable = iterable; } - @NonNull + @Nonnull public Builder withEstimatedSize(long estimatedSize) { Preconditions.checkArgument(estimatedSize >= 0, "estimatedSize must be >= 0"); this.estimatedSize = estimatedSize; return this; } - @NonNull + @Nonnull public Builder withChunkSize(int chunkSize) { Preconditions.checkArgument(chunkSize > 0, "chunkSize must be > 0"); this.chunkSize = chunkSize; return this; } - @NonNull + @Nonnull public PagingIterableSpliterator build() { return new PagingIterableSpliterator<>(iterable, estimatedSize, chunkSize); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/SinglePageResultSet.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/SinglePageResultSet.java index eb33da3f430..e92e2408b69 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/SinglePageResultSet.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/SinglePageResultSet.java @@ -25,11 +25,11 @@ import com.datastax.oss.driver.api.core.cql.Row; import com.datastax.oss.driver.internal.core.PagingIterableWrapper; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Iterator; import java.util.List; import java.util.Spliterator; import java.util.function.Function; +import javax.annotation.Nonnull; import net.jcip.annotations.NotThreadSafe; @NotThreadSafe @@ -41,19 +41,19 @@ public SinglePageResultSet(AsyncResultSet onlyPage) { assert !onlyPage.hasMorePages(); } - @NonNull + @Nonnull @Override public ColumnDefinitions getColumnDefinitions() { return onlyPage.getColumnDefinitions(); } - @NonNull + @Nonnull @Override public ExecutionInfo getExecutionInfo() { return onlyPage.getExecutionInfo(); } - @NonNull + @Nonnull @Override public List getExecutionInfos() { // Assuming this will be called 0 or 1 time, avoid creating the list if it's 0. @@ -70,13 +70,13 @@ public int getAvailableWithoutFetching() { return onlyPage.remaining(); } - @NonNull + @Nonnull @Override public Iterator iterator() { return onlyPage.currentPage().iterator(); } - @NonNull + @Nonnull @Override public Spliterator spliterator() { return PagingIterableSpliterator.builder(this) @@ -84,7 +84,7 @@ public Spliterator spliterator() { .build(); } - @NonNull + @Nonnull @Override public PagingIterable map( Function elementMapper) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/data/DefaultTupleValue.java b/core/src/main/java/com/datastax/oss/driver/internal/core/data/DefaultTupleValue.java index 77cfa759237..e8b9f91b389 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/data/DefaultTupleValue.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/data/DefaultTupleValue.java @@ -24,13 +24,13 @@ import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; import com.datastax.oss.protocol.internal.util.Bytes; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.Serializable; import java.nio.ByteBuffer; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.NotThreadSafe; /** @@ -44,11 +44,11 @@ public class DefaultTupleValue implements TupleValue, Serializable { private final TupleType type; private final ByteBuffer[] values; - public DefaultTupleValue(@NonNull TupleType type) { + public DefaultTupleValue(@Nonnull TupleType type) { this(type, new ByteBuffer[type.getComponentTypes().size()]); } - public DefaultTupleValue(@NonNull TupleType type, @NonNull Object... values) { + public DefaultTupleValue(@Nonnull TupleType type, @Nonnull Object... values) { this( type, ValuesHelper.encodeValues( @@ -64,7 +64,7 @@ private DefaultTupleValue(TupleType type, ByteBuffer[] values) { this.values = values; } - @NonNull + @Nonnull @Override public TupleType getType() { return type; @@ -80,26 +80,26 @@ public ByteBuffer getBytesUnsafe(int i) { return values[i]; } - @NonNull + @Nonnull @Override public TupleValue setBytesUnsafe(int i, @Nullable ByteBuffer v) { values[i] = v; return this; } - @NonNull + @Nonnull @Override public DataType getType(int i) { return type.getComponentTypes().get(i); } - @NonNull + @Nonnull @Override public CodecRegistry codecRegistry() { return type.getAttachmentPoint().getCodecRegistry(); } - @NonNull + @Nonnull @Override public ProtocolVersion protocolVersion() { return type.getAttachmentPoint().getProtocolVersion(); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/data/DefaultUdtValue.java b/core/src/main/java/com/datastax/oss/driver/internal/core/data/DefaultUdtValue.java index c9bf986fcc8..8ec060b282a 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/data/DefaultUdtValue.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/data/DefaultUdtValue.java @@ -25,14 +25,14 @@ import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; import com.datastax.oss.protocol.internal.util.Bytes; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.Serializable; import java.nio.ByteBuffer; import java.util.List; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.NotThreadSafe; /** @@ -47,11 +47,11 @@ public class DefaultUdtValue implements UdtValue, Serializable { private final UserDefinedType type; private final ByteBuffer[] values; - public DefaultUdtValue(@NonNull UserDefinedType type) { + public DefaultUdtValue(@Nonnull UserDefinedType type) { this(type, new ByteBuffer[type.getFieldTypes().size()]); } - public DefaultUdtValue(@NonNull UserDefinedType type, @NonNull Object... values) { + public DefaultUdtValue(@Nonnull UserDefinedType type, @Nonnull Object... values) { this( type, ValuesHelper.encodeValues( @@ -67,7 +67,7 @@ private DefaultUdtValue(UserDefinedType type, ByteBuffer[] values) { this.values = values; } - @NonNull + @Nonnull @Override public UserDefinedType getType() { return type; @@ -78,9 +78,9 @@ public int size() { return values.length; } - @NonNull + @Nonnull @Override - public List allIndicesOf(@NonNull CqlIdentifier id) { + public List allIndicesOf(@Nonnull CqlIdentifier id) { List indices = type.allIndicesOf(id); if (indices.isEmpty()) { throw new IllegalArgumentException(id + " is not a field in this UDT"); @@ -89,7 +89,7 @@ public List allIndicesOf(@NonNull CqlIdentifier id) { } @Override - public int firstIndexOf(@NonNull CqlIdentifier id) { + public int firstIndexOf(@Nonnull CqlIdentifier id) { int indexOf = type.firstIndexOf(id); if (indexOf == -1) { throw new IllegalArgumentException(id + " is not a field in this UDT"); @@ -97,9 +97,9 @@ public int firstIndexOf(@NonNull CqlIdentifier id) { return indexOf; } - @NonNull + @Nonnull @Override - public List allIndicesOf(@NonNull String name) { + public List allIndicesOf(@Nonnull String name) { List indices = type.allIndicesOf(name); if (indices.isEmpty()) { throw new IllegalArgumentException(name + " is not a field in this UDT"); @@ -108,7 +108,7 @@ public List allIndicesOf(@NonNull String name) { } @Override - public int firstIndexOf(@NonNull String name) { + public int firstIndexOf(@Nonnull String name) { int indexOf = type.firstIndexOf(name); if (indexOf == -1) { throw new IllegalArgumentException(name + " is not a field in this UDT"); @@ -116,7 +116,7 @@ public int firstIndexOf(@NonNull String name) { return indexOf; } - @NonNull + @Nonnull @Override public DataType getType(int i) { return type.getFieldTypes().get(i); @@ -127,20 +127,20 @@ public ByteBuffer getBytesUnsafe(int i) { return values[i]; } - @NonNull + @Nonnull @Override public UdtValue setBytesUnsafe(int i, @Nullable ByteBuffer v) { values[i] = v; return this; } - @NonNull + @Nonnull @Override public CodecRegistry codecRegistry() { return type.getAttachmentPoint().getCodecRegistry(); } - @NonNull + @Nonnull @Override public ProtocolVersion protocolVersion() { return type.getAttachmentPoint().getProtocolVersion(); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/BasicLoadBalancingPolicy.java b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/BasicLoadBalancingPolicy.java index b1adec3f143..e7145926a76 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/BasicLoadBalancingPolicy.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/BasicLoadBalancingPolicy.java @@ -45,8 +45,6 @@ import com.datastax.oss.driver.internal.core.util.collection.QueryPlan; import com.datastax.oss.driver.internal.core.util.collection.SimpleQueryPlan; import com.datastax.oss.driver.shaded.guava.common.base.Predicates; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.util.Collections; import java.util.Map; @@ -57,6 +55,8 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.IntUnaryOperator; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -102,9 +102,9 @@ public class BasicLoadBalancingPolicy implements LoadBalancingPolicy { protected static final IntUnaryOperator INCREMENT = i -> (i == Integer.MAX_VALUE) ? 0 : i + 1; private static final Object[] EMPTY_NODES = new Object[0]; - @NonNull protected final InternalDriverContext context; - @NonNull protected final DriverExecutionProfile profile; - @NonNull protected final String logPrefix; + @Nonnull protected final InternalDriverContext context; + @Nonnull protected final DriverExecutionProfile profile; + @Nonnull protected final String logPrefix; protected final AtomicInteger roundRobinAmount = new AtomicInteger(); @@ -118,7 +118,7 @@ public class BasicLoadBalancingPolicy implements LoadBalancingPolicy { private volatile String localDc; private volatile NodeSet liveNodes; - public BasicLoadBalancingPolicy(@NonNull DriverContext context, @NonNull String profileName) { + public BasicLoadBalancingPolicy(@Nonnull DriverContext context, @Nonnull String profileName) { this.context = (InternalDriverContext) context; profile = context.getConfig().getProfile(profileName); logPrefix = context.getSessionName() + "|" + profileName; @@ -155,7 +155,7 @@ protected NodeSet getLiveNodes() { } @Override - public void init(@NonNull Map nodes, @NonNull DistanceReporter distanceReporter) { + public void init(@Nonnull Map nodes, @Nonnull DistanceReporter distanceReporter) { this.distanceReporter = distanceReporter; localDc = discoverLocalDc(nodes).orElse(null); nodeDistanceEvaluator = createNodeDistanceEvaluator(localDc, nodes); @@ -197,8 +197,8 @@ public void init(@NonNull Map nodes, @NonNull DistanceReporter dista * @throws IllegalStateException if the local datacenter could not be discovered, and this policy * cannot operate without it. */ - @NonNull - protected Optional discoverLocalDc(@NonNull Map nodes) { + @Nonnull + protected Optional discoverLocalDc(@Nonnull Map nodes) { return new OptionalLocalDcHelper(context, profile, logPrefix).discoverLocalDc(nodes); } @@ -215,14 +215,14 @@ protected Optional discoverLocalDc(@NonNull Map nodes) { * implementors need to inspect the cluster topology to create the evaluator. * @return the distance evaluator to use. */ - @NonNull + @Nonnull protected NodeDistanceEvaluator createNodeDistanceEvaluator( - @Nullable String localDc, @NonNull Map nodes) { + @Nullable String localDc, @Nonnull Map nodes) { return new DefaultNodeDistanceEvaluatorHelper(context, profile, logPrefix) .createNodeDistanceEvaluator(localDc, nodes); } - @NonNull + @Nonnull @Override public Queue newQueryPlan(@Nullable Request request, @Nullable Session session) { // Take a snapshot since the set is concurrent: @@ -259,7 +259,7 @@ public Queue newQueryPlan(@Nullable Request request, @Nullable Session ses return maybeAddDcFailover(request, plan); } - @NonNull + @Nonnull protected Set getReplicas(@Nullable Request request, @Nullable Session session) { if (request == null || session == null) { return Collections.emptySet(); @@ -305,8 +305,8 @@ protected Set getReplicas(@Nullable Request request, @Nullable Session ses : tokenMap.getReplicas(keyspace, key); } - @NonNull - protected Queue maybeAddDcFailover(@Nullable Request request, @NonNull Queue local) { + @Nonnull + protected Queue maybeAddDcFailover(@Nullable Request request, @Nonnull Queue local) { if (maxNodesPerRemoteDc <= 0 || localDc == null) { return local; } @@ -349,7 +349,7 @@ protected void shuffleHead(Object[] currentNodes, int headLength) { } @Override - public void onAdd(@NonNull Node node) { + public void onAdd(@Nonnull Node node) { NodeDistance distance = computeNodeDistance(node); // Setting to a non-ignored distance triggers the session to open a pool, which will in turn // set the node UP when the first channel gets opened, then #onUp will be called, and the @@ -359,7 +359,7 @@ public void onAdd(@NonNull Node node) { } @Override - public void onUp(@NonNull Node node) { + public void onUp(@Nonnull Node node) { NodeDistance distance = computeNodeDistance(node); if (node.getDistance() != distance) { distanceReporter.setDistance(node, distance); @@ -370,14 +370,14 @@ public void onUp(@NonNull Node node) { } @Override - public void onDown(@NonNull Node node) { + public void onDown(@Nonnull Node node) { if (liveNodes.remove(node)) { LOG.debug("[{}] {} went DOWN, removed from live set", logPrefix, node); } } @Override - public void onRemove(@NonNull Node node) { + public void onRemove(@Nonnull Node node) { if (liveNodes.remove(node)) { LOG.debug("[{}] {} was removed, removed from live set", logPrefix, node); } @@ -389,7 +389,7 @@ public void onRemove(@NonNull Node node) { *

    This method is called during {@linkplain #init(Map, DistanceReporter) initialization}, when * a node {@linkplain #onAdd(Node) is added}, and when a node {@linkplain #onUp(Node) is back UP}. */ - protected NodeDistance computeNodeDistance(@NonNull Node node) { + protected NodeDistance computeNodeDistance(@Nonnull Node node) { // We interrogate the custom evaluator every time since it could be dynamic // and change its verdict between two invocations of this method. NodeDistance distance = nodeDistanceEvaluator.evaluateDistance(node, localDc); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/DcInferringLoadBalancingPolicy.java b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/DcInferringLoadBalancingPolicy.java index 1d978091c9d..a3498b3bbde 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/DcInferringLoadBalancingPolicy.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/DcInferringLoadBalancingPolicy.java @@ -22,10 +22,10 @@ import com.datastax.oss.driver.api.core.loadbalancing.LoadBalancingPolicy; import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.internal.core.loadbalancing.helper.InferringLocalDcHelper; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; import java.util.Optional; import java.util.UUID; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; /** @@ -71,13 +71,13 @@ public class DcInferringLoadBalancingPolicy extends DefaultLoadBalancingPolicy { public DcInferringLoadBalancingPolicy( - @NonNull DriverContext context, @NonNull String profileName) { + @Nonnull DriverContext context, @Nonnull String profileName) { super(context, profileName); } - @NonNull + @Nonnull @Override - protected Optional discoverLocalDc(@NonNull Map nodes) { + protected Optional discoverLocalDc(@Nonnull Map nodes) { return new InferringLocalDcHelper(context, profile, logPrefix).discoverLocalDc(nodes); } } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicy.java b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicy.java index 47edcdfe53e..7b461a43179 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicy.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicy.java @@ -33,8 +33,6 @@ import com.datastax.oss.driver.internal.core.util.ArrayUtils; import com.datastax.oss.driver.internal.core.util.collection.QueryPlan; import com.datastax.oss.driver.internal.core.util.collection.SimpleQueryPlan; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.BitSet; import java.util.Map; import java.util.Optional; @@ -44,6 +42,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicLongArray; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -100,13 +100,13 @@ public class DefaultLoadBalancingPolicy extends BasicLoadBalancingPolicy impleme protected final Map upTimes = new ConcurrentHashMap<>(); private final boolean avoidSlowReplicas; - public DefaultLoadBalancingPolicy(@NonNull DriverContext context, @NonNull String profileName) { + public DefaultLoadBalancingPolicy(@Nonnull DriverContext context, @Nonnull String profileName) { super(context, profileName); this.avoidSlowReplicas = profile.getBoolean(DefaultDriverOption.LOAD_BALANCING_POLICY_SLOW_AVOIDANCE, true); } - @NonNull + @Nonnull @Override public Optional getRequestTracker() { if (avoidSlowReplicas) { @@ -116,13 +116,13 @@ public Optional getRequestTracker() { } } - @NonNull + @Nonnull @Override - protected Optional discoverLocalDc(@NonNull Map nodes) { + protected Optional discoverLocalDc(@Nonnull Map nodes) { return new MandatoryLocalDcHelper(context, profile, logPrefix).discoverLocalDc(nodes); } - @NonNull + @Nonnull @Override public Queue newQueryPlan(@Nullable Request request, @Nullable Session session) { if (!avoidSlowReplicas) { @@ -236,22 +236,22 @@ > getInFlight((Node) currentNodes[1], session)) { @Override public void onNodeSuccess( - @NonNull Request request, + @Nonnull Request request, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, - @NonNull Node node, - @NonNull String logPrefix) { + @Nonnull DriverExecutionProfile executionProfile, + @Nonnull Node node, + @Nonnull String logPrefix) { updateResponseTimes(node); } @Override public void onNodeError( - @NonNull Request request, - @NonNull Throwable error, + @Nonnull Request request, + @Nonnull Throwable error, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, - @NonNull Node node, - @NonNull String logPrefix) { + @Nonnull DriverExecutionProfile executionProfile, + @Nonnull Node node, + @Nonnull String logPrefix) { updateResponseTimes(node); } @@ -265,15 +265,15 @@ protected int diceRoll1d4() { return ThreadLocalRandom.current().nextInt(4); } - protected boolean isUnhealthy(@NonNull Node node, @NonNull Session session, long now) { + protected boolean isUnhealthy(@Nonnull Node node, @Nonnull Session session, long now) { return isBusy(node, session) && isResponseRateInsufficient(node, now); } - protected boolean isBusy(@NonNull Node node, @NonNull Session session) { + protected boolean isBusy(@Nonnull Node node, @Nonnull Session session) { return getInFlight(node, session) >= MAX_IN_FLIGHT_THRESHOLD; } - protected boolean isResponseRateInsufficient(@NonNull Node node, long now) { + protected boolean isResponseRateInsufficient(@Nonnull Node node, long now) { // response rate is considered insufficient when less than 2 responses were obtained in // the past interval delimited by RESPONSE_COUNT_RESET_INTERVAL_NANOS. if (responseTimes.containsKey(node)) { @@ -287,7 +287,7 @@ protected boolean isResponseRateInsufficient(@NonNull Node node, long now) { return true; } - protected void updateResponseTimes(@NonNull Node node) { + protected void updateResponseTimes(@Nonnull Node node) { responseTimes.compute( node, (n, array) -> { @@ -310,7 +310,7 @@ protected void updateResponseTimes(@NonNull Node node) { }); } - protected int getInFlight(@NonNull Node node, @NonNull Session session) { + protected int getInFlight(@Nonnull Node node, @Nonnull Session session) { // The cast will always succeed because there's no way to replace the internal session impl ChannelPool pool = ((DefaultSession) session).getPools().get(node); // Note: getInFlight() includes orphaned ids, which is what we want as we need to account diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/DefaultNodeDistanceEvaluatorHelper.java b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/DefaultNodeDistanceEvaluatorHelper.java index 537497b83c8..a86018b99e2 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/DefaultNodeDistanceEvaluatorHelper.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/DefaultNodeDistanceEvaluatorHelper.java @@ -24,11 +24,11 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.internal.core.context.InternalDriverContext; import com.datastax.oss.driver.internal.core.util.Reflection; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Map; import java.util.UUID; import java.util.function.Predicate; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,23 +45,23 @@ public class DefaultNodeDistanceEvaluatorHelper implements NodeDistanceEvaluator private static final Logger LOG = LoggerFactory.getLogger(DefaultNodeDistanceEvaluatorHelper.class); - @NonNull protected final InternalDriverContext context; - @NonNull protected final DriverExecutionProfile profile; - @NonNull protected final String logPrefix; + @Nonnull protected final InternalDriverContext context; + @Nonnull protected final DriverExecutionProfile profile; + @Nonnull protected final String logPrefix; public DefaultNodeDistanceEvaluatorHelper( - @NonNull InternalDriverContext context, - @NonNull DriverExecutionProfile profile, - @NonNull String logPrefix) { + @Nonnull InternalDriverContext context, + @Nonnull DriverExecutionProfile profile, + @Nonnull String logPrefix) { this.context = context; this.profile = profile; this.logPrefix = logPrefix; } - @NonNull + @Nonnull @Override public NodeDistanceEvaluator createNodeDistanceEvaluator( - @Nullable String localDc, @NonNull Map nodes) { + @Nullable String localDc, @Nonnull Map nodes) { NodeDistanceEvaluator nodeDistanceEvaluatorFromConfig = nodeDistanceEvaluatorFromConfig(); return (node, dc) -> { NodeDistance distance = nodeDistanceEvaluatorFromConfig.evaluateDistance(node, dc); @@ -74,7 +74,7 @@ public NodeDistanceEvaluator createNodeDistanceEvaluator( }; } - @NonNull + @Nonnull protected NodeDistanceEvaluator nodeDistanceEvaluatorFromConfig() { NodeDistanceEvaluator evaluator = context.getNodeDistanceEvaluator(profile.getName()); if (evaluator != null) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/InferringLocalDcHelper.java b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/InferringLocalDcHelper.java index 8608b855e8d..26f7a7acbfb 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/InferringLocalDcHelper.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/InferringLocalDcHelper.java @@ -24,12 +24,12 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.internal.core.context.InternalDriverContext; import com.datastax.oss.driver.internal.core.metadata.DefaultNode; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.HashSet; import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.UUID; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; /** @@ -44,16 +44,16 @@ public class InferringLocalDcHelper extends OptionalLocalDcHelper { public InferringLocalDcHelper( - @NonNull InternalDriverContext context, - @NonNull DriverExecutionProfile profile, - @NonNull String logPrefix) { + @Nonnull InternalDriverContext context, + @Nonnull DriverExecutionProfile profile, + @Nonnull String logPrefix) { super(context, profile, logPrefix); } /** @return The local datacenter; always present. */ - @NonNull + @Nonnull @Override - public Optional discoverLocalDc(@NonNull Map nodes) { + public Optional discoverLocalDc(@Nonnull Map nodes) { Optional optionalLocalDc = super.discoverLocalDc(nodes); if (optionalLocalDc.isPresent()) { return optionalLocalDc; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/LocalDcHelper.java b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/LocalDcHelper.java index 183c7f90dec..d54102a6be6 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/LocalDcHelper.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/LocalDcHelper.java @@ -19,10 +19,10 @@ import com.datastax.oss.driver.api.core.loadbalancing.LoadBalancingPolicy; import com.datastax.oss.driver.api.core.metadata.Node; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; import java.util.Optional; import java.util.UUID; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; @FunctionalInterface @@ -45,6 +45,6 @@ public interface LocalDcHelper { * @throws IllegalStateException if the local datacenter could not be discovered, and this policy * cannot operate without it. */ - @NonNull - Optional discoverLocalDc(@NonNull Map nodes); + @Nonnull + Optional discoverLocalDc(@Nonnull Map nodes); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/MandatoryLocalDcHelper.java b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/MandatoryLocalDcHelper.java index 9a0e9a2d4ce..55cc08c930a 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/MandatoryLocalDcHelper.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/MandatoryLocalDcHelper.java @@ -22,11 +22,11 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.internal.core.context.InternalDriverContext; import com.datastax.oss.driver.internal.core.metadata.DefaultNode; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.UUID; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,16 +49,16 @@ public class MandatoryLocalDcHelper extends OptionalLocalDcHelper { private static final Logger LOG = LoggerFactory.getLogger(MandatoryLocalDcHelper.class); public MandatoryLocalDcHelper( - @NonNull InternalDriverContext context, - @NonNull DriverExecutionProfile profile, - @NonNull String logPrefix) { + @Nonnull InternalDriverContext context, + @Nonnull DriverExecutionProfile profile, + @Nonnull String logPrefix) { super(context, profile, logPrefix); } /** @return The local datacenter; always present. */ - @NonNull + @Nonnull @Override - public Optional discoverLocalDc(@NonNull Map nodes) { + public Optional discoverLocalDc(@Nonnull Map nodes) { Optional optionalLocalDc = super.discoverLocalDc(nodes); if (optionalLocalDc.isPresent()) { return optionalLocalDc; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/NodeDistanceEvaluatorHelper.java b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/NodeDistanceEvaluatorHelper.java index 61e094b318a..e75f1562177 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/NodeDistanceEvaluatorHelper.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/NodeDistanceEvaluatorHelper.java @@ -20,10 +20,10 @@ import com.datastax.oss.driver.api.core.loadbalancing.LoadBalancingPolicy; import com.datastax.oss.driver.api.core.loadbalancing.NodeDistanceEvaluator; import com.datastax.oss.driver.api.core.metadata.Node; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Map; import java.util.UUID; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @FunctionalInterface @@ -42,7 +42,7 @@ public interface NodeDistanceEvaluatorHelper { * implementors need to inspect the cluster topology to create the node distance evaluator. * @return the node distance evaluator to use. */ - @NonNull + @Nonnull NodeDistanceEvaluator createNodeDistanceEvaluator( - @Nullable String localDc, @NonNull Map nodes); + @Nullable String localDc, @Nonnull Map nodes); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/NodeFilterToDistanceEvaluatorAdapter.java b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/NodeFilterToDistanceEvaluatorAdapter.java index 902018fb7d4..3da60a3b73d 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/NodeFilterToDistanceEvaluatorAdapter.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/NodeFilterToDistanceEvaluatorAdapter.java @@ -20,21 +20,21 @@ import com.datastax.oss.driver.api.core.loadbalancing.NodeDistance; import com.datastax.oss.driver.api.core.loadbalancing.NodeDistanceEvaluator; import com.datastax.oss.driver.api.core.metadata.Node; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.function.Predicate; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class NodeFilterToDistanceEvaluatorAdapter implements NodeDistanceEvaluator { private final Predicate nodeFilter; - public NodeFilterToDistanceEvaluatorAdapter(@NonNull Predicate nodeFilter) { + public NodeFilterToDistanceEvaluatorAdapter(@Nonnull Predicate nodeFilter) { this.nodeFilter = nodeFilter; } @Nullable @Override - public NodeDistance evaluateDistance(@NonNull Node node, @Nullable String localDc) { + public NodeDistance evaluateDistance(@Nonnull Node node, @Nullable String localDc) { return nodeFilter.test(node) ? null : NodeDistance.IGNORED; } } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/OptionalLocalDcHelper.java b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/OptionalLocalDcHelper.java index d470f96c42c..6a0ed4b19df 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/OptionalLocalDcHelper.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/helper/OptionalLocalDcHelper.java @@ -21,7 +21,6 @@ import com.datastax.oss.driver.api.core.config.DriverExecutionProfile; import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.internal.core.context.InternalDriverContext; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; @@ -31,6 +30,7 @@ import java.util.Set; import java.util.TreeSet; import java.util.UUID; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,14 +45,14 @@ public class OptionalLocalDcHelper implements LocalDcHelper { private static final Logger LOG = LoggerFactory.getLogger(OptionalLocalDcHelper.class); - @NonNull protected final InternalDriverContext context; - @NonNull protected final DriverExecutionProfile profile; - @NonNull protected final String logPrefix; + @Nonnull protected final InternalDriverContext context; + @Nonnull protected final DriverExecutionProfile profile; + @Nonnull protected final String logPrefix; public OptionalLocalDcHelper( - @NonNull InternalDriverContext context, - @NonNull DriverExecutionProfile profile, - @NonNull String logPrefix) { + @Nonnull InternalDriverContext context, + @Nonnull DriverExecutionProfile profile, + @Nonnull String logPrefix) { this.context = context; this.profile = profile; this.logPrefix = logPrefix; @@ -63,8 +63,8 @@ public OptionalLocalDcHelper( * configuration; {@link Optional#empty empty} if none found. */ @Override - @NonNull - public Optional discoverLocalDc(@NonNull Map nodes) { + @Nonnull + public Optional discoverLocalDc(@Nonnull Map nodes) { String localDc = context.getLocalDatacenter(profile.getName()); if (localDc != null) { LOG.debug("[{}] Local DC set programmatically: {}", logPrefix, localDc); @@ -92,7 +92,7 @@ public Optional discoverLocalDc(@NonNull Map nodes) { * @param contactPoints The contact points provided when creating the session. */ protected void checkLocalDatacenterCompatibility( - @NonNull String localDc, Set contactPoints) { + @Nonnull String localDc, Set contactPoints) { if (profile.getName().equals(DriverExecutionProfile.DEFAULT_NAME)) { Set badContactPoints = new LinkedHashSet<>(); for (Node node : contactPoints) { @@ -115,7 +115,7 @@ protected void checkLocalDatacenterCompatibility( * Formats the given nodes as a string detailing each contact point and its datacenter, for * informational purposes. */ - @NonNull + @Nonnull protected String formatNodesAndDcs(Iterable nodes) { List l = new ArrayList<>(); for (Node node : nodes) { @@ -128,7 +128,7 @@ protected String formatNodesAndDcs(Iterable nodes) { * Formats the given nodes as a string detailing each distinct datacenter, for informational * purposes. */ - @NonNull + @Nonnull protected String formatDcs(Iterable nodes) { List l = new ArrayList<>(); for (Node node : nodes) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/nodeset/DcAgnosticNodeSet.java b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/nodeset/DcAgnosticNodeSet.java index 2a6e79023de..20d831bd8d6 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/nodeset/DcAgnosticNodeSet.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/nodeset/DcAgnosticNodeSet.java @@ -18,11 +18,11 @@ package com.datastax.oss.driver.internal.core.loadbalancing.nodeset; import com.datastax.oss.driver.api.core.metadata.Node; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Collections; import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -31,17 +31,17 @@ public class DcAgnosticNodeSet implements NodeSet { private final Set nodes = new CopyOnWriteArraySet<>(); @Override - public boolean add(@NonNull Node node) { + public boolean add(@Nonnull Node node) { return nodes.add(node); } @Override - public boolean remove(@NonNull Node node) { + public boolean remove(@Nonnull Node node) { return nodes.remove(node); } @Override - @NonNull + @Nonnull public Set dc(@Nullable String dc) { return nodes; } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/nodeset/MultiDcNodeSet.java b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/nodeset/MultiDcNodeSet.java index 37f02bec878..4e73246c857 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/nodeset/MultiDcNodeSet.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/nodeset/MultiDcNodeSet.java @@ -18,14 +18,14 @@ package com.datastax.oss.driver.internal.core.loadbalancing.nodeset; import com.datastax.oss.driver.api.core.metadata.Node; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Collections; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.atomic.AtomicBoolean; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -36,7 +36,7 @@ public class MultiDcNodeSet implements NodeSet { private final Map> nodes = new ConcurrentHashMap<>(); @Override - public boolean add(@NonNull Node node) { + public boolean add(@Nonnull Node node) { AtomicBoolean added = new AtomicBoolean(); nodes.compute( getMapKey(node), @@ -56,7 +56,7 @@ public boolean add(@NonNull Node node) { } @Override - public boolean remove(@NonNull Node node) { + public boolean remove(@Nonnull Node node) { AtomicBoolean removed = new AtomicBoolean(); nodes.compute( getMapKey(node), @@ -72,7 +72,7 @@ public boolean remove(@NonNull Node node) { } @Override - @NonNull + @Nonnull public Set dc(@Nullable String dc) { return nodes.getOrDefault(getMapKey(dc), Collections.emptySet()); } @@ -82,12 +82,12 @@ public Set dcs() { return nodes.keySet(); } - @NonNull - private String getMapKey(@NonNull Node node) { + @Nonnull + private String getMapKey(@Nonnull Node node) { return getMapKey(node.getDatacenter()); } - @NonNull + @Nonnull private String getMapKey(@Nullable String dc) { return dc == null ? UNKNOWN_DC : dc; } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/nodeset/NodeSet.java b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/nodeset/NodeSet.java index 66460e16a7c..81aeb4d98aa 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/nodeset/NodeSet.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/nodeset/NodeSet.java @@ -18,9 +18,9 @@ package com.datastax.oss.driver.internal.core.loadbalancing.nodeset; import com.datastax.oss.driver.api.core.metadata.Node; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Set; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; /** @@ -40,7 +40,7 @@ public interface NodeSet { * @param node The node to add. * @return true if the node was added, false otherwise (because it was already present). */ - boolean add(@NonNull Node node); + boolean add(@Nonnull Node node); /** * Removes the node from the set. @@ -48,7 +48,7 @@ public interface NodeSet { * @param node The node to remove. * @return true if the node was removed, false otherwise (because it was not present). */ - boolean remove(@NonNull Node node); + boolean remove(@Nonnull Node node); /** * Returns the current nodes in the given datacenter. @@ -60,7 +60,7 @@ public interface NodeSet { * @param dc The datacenter name, or null if the datacenter name is not known, or irrelevant. * @return the current nodes in the given datacenter. */ - @NonNull + @Nonnull Set dc(@Nullable String dc); /** diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/nodeset/SingleDcNodeSet.java b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/nodeset/SingleDcNodeSet.java index 21c89d46927..b91674d813f 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/nodeset/SingleDcNodeSet.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/loadbalancing/nodeset/SingleDcNodeSet.java @@ -19,12 +19,12 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableSet; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Collections; import java.util.Objects; import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -35,13 +35,13 @@ public class SingleDcNodeSet implements NodeSet { private final String dc; private final Set dcs; - public SingleDcNodeSet(@NonNull String dc) { + public SingleDcNodeSet(@Nonnull String dc) { this.dc = dc; dcs = ImmutableSet.of(dc); } @Override - public boolean add(@NonNull Node node) { + public boolean add(@Nonnull Node node) { if (Objects.equals(node.getDatacenter(), dc)) { return nodes.add(node); } @@ -49,7 +49,7 @@ public boolean add(@NonNull Node node) { } @Override - public boolean remove(@NonNull Node node) { + public boolean remove(@Nonnull Node node) { if (Objects.equals(node.getDatacenter(), dc)) { return nodes.remove(node); } @@ -57,7 +57,7 @@ public boolean remove(@NonNull Node node) { } @Override - @NonNull + @Nonnull public Set dc(@Nullable String dc) { if (Objects.equals(this.dc, dc)) { return nodes; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/CloudTopologyMonitor.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/CloudTopologyMonitor.java index 021824a9b16..ca73b0651e4 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/CloudTopologyMonitor.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/CloudTopologyMonitor.java @@ -20,11 +20,11 @@ import com.datastax.oss.driver.api.core.metadata.EndPoint; import com.datastax.oss.driver.internal.core.adminrequest.AdminRow; import com.datastax.oss.driver.internal.core.context.InternalDriverContext; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.net.InetSocketAddress; import java.util.Objects; import java.util.UUID; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class CloudTopologyMonitor extends DefaultTopologyMonitor { @@ -35,12 +35,12 @@ public CloudTopologyMonitor(InternalDriverContext context, InetSocketAddress clo this.cloudProxyAddress = cloudProxyAddress; } - @NonNull + @Nonnull @Override protected EndPoint buildNodeEndPoint( - @NonNull AdminRow row, + @Nonnull AdminRow row, @Nullable InetSocketAddress broadcastRpcAddress, - @NonNull EndPoint localEndPoint) { + @Nonnull EndPoint localEndPoint) { UUID hostId = Objects.requireNonNull(row.getUuid("host_id")); return new SniEndPoint(cloudProxyAddress, hostId.toString()); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultEndPoint.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultEndPoint.java index 7ffbee8e4bb..af610f29180 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultEndPoint.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultEndPoint.java @@ -18,10 +18,10 @@ package com.datastax.oss.driver.internal.core.metadata; import com.datastax.oss.driver.api.core.metadata.EndPoint; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.Serializable; import java.net.InetSocketAddress; import java.util.Objects; +import javax.annotation.Nonnull; public class DefaultEndPoint implements EndPoint, Serializable { @@ -35,7 +35,7 @@ public DefaultEndPoint(InetSocketAddress address) { this.metricPrefix = buildMetricPrefix(address); } - @NonNull + @Nonnull @Override public InetSocketAddress resolve() { return address; @@ -71,7 +71,7 @@ public String toString() { return address.toString(); } - @NonNull + @Nonnull @Override public String asMetricPrefix() { return metricPrefix; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultMetadata.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultMetadata.java index 38f7e4a093e..0a3b1efe897 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultMetadata.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultMetadata.java @@ -29,12 +29,12 @@ import com.datastax.oss.driver.internal.core.util.Loggers; import com.datastax.oss.driver.internal.core.util.NanoTime; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Collections; import java.util.Map; import java.util.Optional; import java.util.UUID; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -66,25 +66,25 @@ protected DefaultMetadata( this.clusterName = clusterName; } - @NonNull + @Nonnull @Override public Map getNodes() { return nodes; } - @NonNull + @Nonnull @Override public Map getKeyspaces() { return keyspaces; } - @NonNull + @Nonnull @Override public Optional getTokenMap() { return Optional.ofNullable(tokenMap); } - @NonNull + @Nonnull @Override public Optional getClusterName() { return Optional.ofNullable(clusterName); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultNode.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultNode.java index 28f9e2de81c..01f06626d9c 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultNode.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultNode.java @@ -25,8 +25,6 @@ import com.datastax.oss.driver.internal.core.context.InternalDriverContext; import com.datastax.oss.driver.internal.core.metrics.NodeMetricUpdater; import com.datastax.oss.driver.internal.core.metrics.NoopNodeMetricUpdater; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.Serializable; import java.net.InetSocketAddress; import java.util.Collections; @@ -34,6 +32,8 @@ import java.util.Optional; import java.util.Set; import java.util.UUID; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; /** @@ -81,13 +81,13 @@ public DefaultNode(EndPoint endPoint, InternalDriverContext context) { this.upSinceMillis = -1; } - @NonNull + @Nonnull @Override public EndPoint getEndPoint() { return endPoint; } - public void setEndPoint(@NonNull EndPoint newEndPoint, @NonNull InternalDriverContext context) { + public void setEndPoint(@Nonnull EndPoint newEndPoint, @Nonnull InternalDriverContext context) { if (!newEndPoint.equals(endPoint)) { endPoint = newEndPoint; @@ -99,19 +99,19 @@ public void setEndPoint(@NonNull EndPoint newEndPoint, @NonNull InternalDriverCo } } - @NonNull + @Nonnull @Override public Optional getBroadcastRpcAddress() { return Optional.ofNullable(broadcastRpcAddress); } - @NonNull + @Nonnull @Override public Optional getBroadcastAddress() { return Optional.ofNullable(broadcastAddress); } - @NonNull + @Nonnull @Override public Optional getListenAddress() { return Optional.ofNullable(listenAddress); @@ -147,13 +147,13 @@ public UUID getSchemaVersion() { return schemaVersion; } - @NonNull + @Nonnull @Override public Map getExtras() { return extras; } - @NonNull + @Nonnull @Override public NodeState getState() { return state; @@ -174,7 +174,7 @@ public boolean isReconnecting() { return reconnections > 0; } - @NonNull + @Nonnull @Override public NodeDistance getDistance() { return distance; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultNodeInfo.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultNodeInfo.java index 8908f0be078..98967bd631d 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultNodeInfo.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultNodeInfo.java @@ -18,8 +18,6 @@ package com.datastax.oss.driver.internal.core.metadata; import com.datastax.oss.driver.api.core.metadata.EndPoint; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.net.InetSocketAddress; import java.util.Collections; import java.util.HashMap; @@ -27,6 +25,8 @@ import java.util.Optional; import java.util.Set; import java.util.UUID; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; import net.jcip.annotations.NotThreadSafe; @@ -64,25 +64,25 @@ private DefaultNodeInfo(Builder builder) { this.extras = (builder.extras == null) ? Collections.emptyMap() : builder.extras; } - @NonNull + @Nonnull @Override public EndPoint getEndPoint() { return endPoint; } - @NonNull + @Nonnull @Override public Optional getBroadcastRpcAddress() { return Optional.ofNullable(broadcastRpcAddress); } - @NonNull + @Nonnull @Override public Optional getBroadcastAddress() { return Optional.ofNullable(broadcastAddress); } - @NonNull + @Nonnull @Override public Optional getListenAddress() { return Optional.ofNullable(listenAddress); @@ -118,7 +118,7 @@ public Map getExtras() { return extras; } - @NonNull + @Nonnull @Override public UUID getHostId() { return hostId; @@ -144,7 +144,7 @@ public static class Builder { private UUID hostId; private UUID schemaVersion; - public Builder withEndPoint(@NonNull EndPoint endPoint) { + public Builder withEndPoint(@Nonnull EndPoint endPoint) { this.endPoint = endPoint; return this; } @@ -189,7 +189,7 @@ public Builder withTokens(@Nullable Set tokens) { return this; } - public Builder withHostId(@NonNull UUID hostId) { + public Builder withHostId(@Nonnull UUID hostId) { this.hostId = hostId; return this; } @@ -199,7 +199,7 @@ public Builder withSchemaVersion(@Nullable UUID schemaVersion) { return this; } - public Builder withExtra(@NonNull String key, @Nullable Object value) { + public Builder withExtra(@Nonnull String key, @Nullable Object value) { if (value != null) { if (this.extras == null) { this.extras = new HashMap<>(); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultTopologyMonitor.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultTopologyMonitor.java index 87008b05cec..df593d2b0e8 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultTopologyMonitor.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/DefaultTopologyMonitor.java @@ -36,8 +36,6 @@ import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableSet; import com.datastax.oss.protocol.internal.ProtocolConstants; import com.datastax.oss.protocol.internal.response.Error; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -53,6 +51,8 @@ import java.util.UUID; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -230,20 +230,20 @@ public CompletionStage checkSchemaAgreement() { return new SchemaAgreementChecker(channel, context, logPrefix).run(); } - @NonNull + @Nonnull @Override public CompletionStage closeFuture() { return closeFuture; } - @NonNull + @Nonnull @Override public CompletionStage closeAsync() { closeFuture.complete(null); return closeFuture; } - @NonNull + @Nonnull @Override public CompletionStage forceCloseAsync() { return closeAsync(); @@ -300,11 +300,11 @@ private Optional firstPeerRowAsNodeInfo(AdminResult result, EndPoint l * connection may have changed its channel since. So this parameter must be provided by the * caller. */ - @NonNull + @Nonnull protected DefaultNodeInfo.Builder nodeInfoBuilder( - @NonNull AdminRow row, + @Nonnull AdminRow row, @Nullable InetSocketAddress broadcastRpcAddress, - @NonNull EndPoint localEndPoint) { + @Nonnull EndPoint localEndPoint) { EndPoint endPoint = buildNodeEndPoint(row, broadcastRpcAddress, localEndPoint); @@ -411,11 +411,11 @@ protected DefaultNodeInfo.Builder nodeInfoBuilder( * connection may have changed its channel since. So this parameter must be provided by the * caller. */ - @NonNull + @Nonnull protected EndPoint buildNodeEndPoint( - @NonNull AdminRow row, + @Nonnull AdminRow row, @Nullable InetSocketAddress broadcastRpcAddress, - @NonNull EndPoint localEndPoint) { + @Nonnull EndPoint localEndPoint) { boolean peer = row.contains("peer"); if (peer) { // If this node is a peer, its broadcast RPC address must be present. @@ -493,7 +493,7 @@ private void savePort(DriverChannel channel) { */ @Nullable protected InetSocketAddress getBroadcastRpcAddress( - @NonNull AdminRow row, @NonNull EndPoint localEndPoint) { + @Nonnull AdminRow row, @Nonnull EndPoint localEndPoint) { // in system.peers or system.local InetAddress broadcastRpcInetAddress = row.getInetAddress("rpc_address"); if (broadcastRpcInetAddress == null) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/LoadBalancingPolicyWrapper.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/LoadBalancingPolicyWrapper.java index 20d045d4e72..96309ab3a21 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/LoadBalancingPolicyWrapper.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/LoadBalancingPolicyWrapper.java @@ -29,8 +29,6 @@ import com.datastax.oss.driver.internal.core.util.concurrent.ReplayingEventFilter; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableSet; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -42,6 +40,8 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.GuardedBy; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; @@ -89,8 +89,8 @@ private enum State { private final AtomicReference stateRef = new AtomicReference<>(State.BEFORE_INIT); public LoadBalancingPolicyWrapper( - @NonNull InternalDriverContext context, - @NonNull Map policiesPerProfile) { + @Nonnull InternalDriverContext context, + @Nonnull Map policiesPerProfile) { this.context = context; this.policiesPerProfile = policiesPerProfile; @@ -139,9 +139,9 @@ public void init() { * * @see LoadBalancingPolicy#newQueryPlan(Request, Session) */ - @NonNull + @Nonnull public Queue newQueryPlan( - @Nullable Request request, @NonNull String executionProfileName, @Nullable Session session) { + @Nullable Request request, @Nonnull String executionProfileName, @Nullable Session session) { switch (stateRef.get()) { case BEFORE_INIT: case DURING_INIT: @@ -160,7 +160,7 @@ public Queue newQueryPlan( } } - @NonNull + @Nonnull public Queue newQueryPlan() { return newQueryPlan(null, DriverExecutionProfile.DEFAULT_NAME, null); } @@ -227,7 +227,7 @@ private SinglePolicyDistanceReporter(LoadBalancingPolicy policy) { } @Override - public void setDistance(@NonNull Node node, @NonNull NodeDistance suggestedDistance) { + public void setDistance(@Nonnull Node node, @Nonnull NodeDistance suggestedDistance) { LOG.debug( "[{}] {} suggested {} to {}, checking what other policies said", logPrefix, diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/MetadataManager.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/MetadataManager.java index 28e8b18f127..5c99247ef3e 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/MetadataManager.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/MetadataManager.java @@ -38,7 +38,6 @@ import com.datastax.oss.driver.internal.core.util.concurrent.RunOrSchedule; import com.datastax.oss.driver.shaded.guava.common.annotations.VisibleForTesting; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableSet; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.util.concurrent.EventExecutor; import java.net.InetSocketAddress; import java.util.Collections; @@ -46,6 +45,7 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -277,20 +277,20 @@ public CompletionStage setSchemaEnabled(Boolean newValue) { } } - @NonNull + @Nonnull @Override public CompletionStage closeFuture() { return singleThreaded.closeFuture; } - @NonNull + @Nonnull @Override public CompletionStage closeAsync() { RunOrSchedule.on(adminExecutor, singleThreaded::close); return singleThreaded.closeFuture; } - @NonNull + @Nonnull @Override public CompletionStage forceCloseAsync() { return this.closeAsync(); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/MultiplexingNodeStateListener.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/MultiplexingNodeStateListener.java index 8ee6d04bbae..3e3130ddf07 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/MultiplexingNodeStateListener.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/MultiplexingNodeStateListener.java @@ -21,13 +21,13 @@ import com.datastax.oss.driver.api.core.metadata.NodeStateListener; import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.internal.core.util.Loggers; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Objects; import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Consumer; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -69,32 +69,32 @@ private void addListener(NodeStateListener toAdd) { } } - public void register(@NonNull NodeStateListener listener) { + public void register(@Nonnull NodeStateListener listener) { addListener(listener); } @Override - public void onAdd(@NonNull Node node) { + public void onAdd(@Nonnull Node node) { invokeListeners(listener -> listener.onAdd(node), "onAdd"); } @Override - public void onUp(@NonNull Node node) { + public void onUp(@Nonnull Node node) { invokeListeners(listener -> listener.onUp(node), "onUp"); } @Override - public void onDown(@NonNull Node node) { + public void onDown(@Nonnull Node node) { invokeListeners(listener -> listener.onDown(node), "onDown"); } @Override - public void onRemove(@NonNull Node node) { + public void onRemove(@Nonnull Node node) { invokeListeners(listener -> listener.onRemove(node), "onRemove"); } @Override - public void onSessionReady(@NonNull Session session) { + public void onSessionReady(@Nonnull Session session) { invokeListeners(listener -> listener.onSessionReady(session), "onSessionReady"); } @@ -110,7 +110,7 @@ public void close() throws Exception { } } - private void invokeListeners(@NonNull Consumer action, String event) { + private void invokeListeners(@Nonnull Consumer action, String event) { for (NodeStateListener listener : listeners) { try { action.accept(listener); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/NodeInfo.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/NodeInfo.java index 6a9651d8376..e61b7bc71ed 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/NodeInfo.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/NodeInfo.java @@ -22,13 +22,13 @@ import com.datastax.oss.driver.api.core.metadata.EndPoint; import com.datastax.oss.driver.api.core.metadata.Metadata; import com.datastax.oss.driver.api.core.metadata.Node; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.net.InetSocketAddress; import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.UUID; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Information about a node, returned by the {@link TopologyMonitor}. @@ -43,7 +43,7 @@ public interface NodeInfo { *

    This information is required; the driver will not function properly if this method returns * {@code null}. */ - @NonNull + @Nonnull EndPoint getEndPoint(); /** @@ -56,7 +56,7 @@ public interface NodeInfo { * * @see Node#getBroadcastRpcAddress() */ - @NonNull + @Nonnull Optional getBroadcastRpcAddress(); /** @@ -66,7 +66,7 @@ public interface NodeInfo { *

    This is only used by the default topology monitor, so if you are writing a custom one and * don't need this information, you can leave it empty. */ - @NonNull + @Nonnull Optional getBroadcastAddress(); /** @@ -75,7 +75,7 @@ public interface NodeInfo { *

    This is currently not used anywhere in the driver. If you write a custom topology monitor * and don't need this information, you can leave it empty. */ - @NonNull + @Nonnull Optional getListenAddress(); /** @@ -145,7 +145,7 @@ public interface NodeInfo { *

    This information is required; the driver will not function properly if this method returns * {@code null}. */ - @NonNull + @Nonnull UUID getHostId(); /** diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/NodeStateManager.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/NodeStateManager.java index c8a52e4fa00..60ba6362964 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/NodeStateManager.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/NodeStateManager.java @@ -30,7 +30,6 @@ import com.datastax.oss.driver.internal.core.util.concurrent.Debouncer; import com.datastax.oss.driver.internal.core.util.concurrent.RunOrSchedule; import com.datastax.oss.driver.shaded.guava.common.collect.Maps; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.util.concurrent.EventExecutor; import java.net.InetSocketAddress; import java.util.Collection; @@ -39,6 +38,7 @@ import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -71,20 +71,20 @@ public void markInitialized() { RunOrSchedule.on(adminExecutor, singleThreaded::markInitialized); } - @NonNull + @Nonnull @Override public CompletionStage closeFuture() { return singleThreaded.closeFuture; } - @NonNull + @Nonnull @Override public CompletionStage closeAsync() { RunOrSchedule.on(adminExecutor, singleThreaded::close); return singleThreaded.closeFuture; } - @NonNull + @Nonnull @Override public CompletionStage forceCloseAsync() { return closeAsync(); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/PeerRowValidator.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/PeerRowValidator.java index 4782d72abbb..8fcd285215a 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/PeerRowValidator.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/PeerRowValidator.java @@ -19,14 +19,14 @@ package com.datastax.oss.driver.internal.core.metadata; import com.datastax.oss.driver.internal.core.adminrequest.AdminRow; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; @ThreadSafe public class PeerRowValidator { /** Returns {@code true} if the given peer row is valid, and {@code false} otherwise. */ - public static boolean isValid(@NonNull AdminRow peerRow) { + public static boolean isValid(@Nonnull AdminRow peerRow) { boolean hasPeersRpcAddress = !peerRow.isNull("rpc_address"); boolean hasPeersV2RpcAddress = diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/SniEndPoint.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/SniEndPoint.java index ace4e82617d..9d3b0ac8278 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/SniEndPoint.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/SniEndPoint.java @@ -19,7 +19,6 @@ import com.datastax.oss.driver.api.core.metadata.EndPoint; import com.datastax.oss.driver.shaded.guava.common.primitives.UnsignedBytes; -import edu.umd.cs.findbugs.annotations.NonNull; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.UnknownHostException; @@ -27,6 +26,7 @@ import java.util.Comparator; import java.util.Objects; import java.util.concurrent.atomic.AtomicLong; +import javax.annotation.Nonnull; public class SniEndPoint implements EndPoint { private static final AtomicLong OFFSET = new AtomicLong(); @@ -51,7 +51,7 @@ public String getServerName() { return serverName; } - @NonNull + @Nonnull @Override public InetSocketAddress resolve() { try { @@ -97,7 +97,7 @@ public String toString() { return proxyAddress.toString() + ":" + serverName; } - @NonNull + @Nonnull @Override public String asMetricPrefix() { String hostString = proxyAddress.getHostString(); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultAggregateMetadata.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultAggregateMetadata.java index 669f925af65..41769616d43 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultAggregateMetadata.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultAggregateMetadata.java @@ -22,11 +22,11 @@ import com.datastax.oss.driver.api.core.metadata.schema.FunctionSignature; import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.codec.TypeCodec; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.Serializable; import java.util.Objects; import java.util.Optional; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,24 +38,24 @@ public class DefaultAggregateMetadata implements AggregateMetadata, Serializable private static final long serialVersionUID = 1; - @NonNull private final CqlIdentifier keyspace; - @NonNull private final FunctionSignature signature; + @Nonnull private final CqlIdentifier keyspace; + @Nonnull private final FunctionSignature signature; @Nullable private final FunctionSignature finalFuncSignature; @Nullable private final Object initCond; @Nullable private final String formattedInitCond; - @NonNull private final DataType returnType; - @NonNull private final FunctionSignature stateFuncSignature; - @NonNull private final DataType stateType; + @Nonnull private final DataType returnType; + @Nonnull private final FunctionSignature stateFuncSignature; + @Nonnull private final DataType stateType; public DefaultAggregateMetadata( - @NonNull CqlIdentifier keyspace, - @NonNull FunctionSignature signature, + @Nonnull CqlIdentifier keyspace, + @Nonnull FunctionSignature signature, @Nullable FunctionSignature finalFuncSignature, @Nullable Object initCond, - @NonNull DataType returnType, - @NonNull FunctionSignature stateFuncSignature, - @NonNull DataType stateType, - @NonNull TypeCodec stateTypeCodec) { + @Nonnull DataType returnType, + @Nonnull FunctionSignature stateFuncSignature, + @Nonnull DataType stateType, + @Nonnull TypeCodec stateTypeCodec) { this.keyspace = keyspace; this.signature = signature; this.finalFuncSignature = finalFuncSignature; @@ -66,49 +66,49 @@ public DefaultAggregateMetadata( this.stateType = stateType; } - @NonNull + @Nonnull @Override public CqlIdentifier getKeyspace() { return keyspace; } - @NonNull + @Nonnull @Override public FunctionSignature getSignature() { return signature; } - @NonNull + @Nonnull @Override public Optional getFinalFuncSignature() { return Optional.ofNullable(finalFuncSignature); } - @NonNull + @Nonnull @Override public Optional getInitCond() { return Optional.ofNullable(initCond); } - @NonNull + @Nonnull @Override public DataType getReturnType() { return returnType; } - @NonNull + @Nonnull @Override public FunctionSignature getStateFuncSignature() { return stateFuncSignature; } - @NonNull + @Nonnull @Override public DataType getStateType() { return stateType; } - @NonNull + @Nonnull @Override public Optional formatInitCond() { return Optional.ofNullable(this.formattedInitCond); @@ -157,7 +157,7 @@ public String toString() { @Nullable private String computeFormattedInitCond( - @Nullable Object initCond, @NonNull TypeCodec stateTypeCodec) { + @Nullable Object initCond, @Nonnull TypeCodec stateTypeCodec) { if (initCond == null) { return null; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultColumnMetadata.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultColumnMetadata.java index 3d0c6209880..9950bd685ee 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultColumnMetadata.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultColumnMetadata.java @@ -20,9 +20,9 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.core.metadata.schema.ColumnMetadata; import com.datastax.oss.driver.api.core.type.DataType; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.Serializable; import java.util.Objects; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -30,17 +30,17 @@ public class DefaultColumnMetadata implements ColumnMetadata, Serializable { private static final long serialVersionUID = 1; - @NonNull private final CqlIdentifier keyspace; - @NonNull private final CqlIdentifier parent; - @NonNull private final CqlIdentifier name; - @NonNull private final DataType dataType; + @Nonnull private final CqlIdentifier keyspace; + @Nonnull private final CqlIdentifier parent; + @Nonnull private final CqlIdentifier name; + @Nonnull private final DataType dataType; private final boolean isStatic; public DefaultColumnMetadata( - @NonNull CqlIdentifier keyspace, - @NonNull CqlIdentifier parent, - @NonNull CqlIdentifier name, - @NonNull DataType dataType, + @Nonnull CqlIdentifier keyspace, + @Nonnull CqlIdentifier parent, + @Nonnull CqlIdentifier name, + @Nonnull DataType dataType, boolean isStatic) { this.keyspace = keyspace; this.parent = parent; @@ -49,25 +49,25 @@ public DefaultColumnMetadata( this.isStatic = isStatic; } - @NonNull + @Nonnull @Override public CqlIdentifier getKeyspace() { return keyspace; } - @NonNull + @Nonnull @Override public CqlIdentifier getParent() { return parent; } - @NonNull + @Nonnull @Override public CqlIdentifier getName() { return name; } - @NonNull + @Nonnull @Override public DataType getType() { return dataType; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultFunctionMetadata.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultFunctionMetadata.java index 75b343d77b1..cc49c4979f7 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultFunctionMetadata.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultFunctionMetadata.java @@ -22,10 +22,10 @@ import com.datastax.oss.driver.api.core.metadata.schema.FunctionSignature; import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.Serializable; import java.util.List; import java.util.Objects; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -33,22 +33,22 @@ public class DefaultFunctionMetadata implements FunctionMetadata, Serializable { private static final long serialVersionUID = 1; - @NonNull private final CqlIdentifier keyspace; - @NonNull private final FunctionSignature signature; - @NonNull private final List parameterNames; - @NonNull private final String body; + @Nonnull private final CqlIdentifier keyspace; + @Nonnull private final FunctionSignature signature; + @Nonnull private final List parameterNames; + @Nonnull private final String body; private final boolean calledOnNullInput; - @NonNull private final String language; - @NonNull private final DataType returnType; + @Nonnull private final String language; + @Nonnull private final DataType returnType; public DefaultFunctionMetadata( - @NonNull CqlIdentifier keyspace, - @NonNull FunctionSignature signature, - @NonNull List parameterNames, - @NonNull String body, + @Nonnull CqlIdentifier keyspace, + @Nonnull FunctionSignature signature, + @Nonnull List parameterNames, + @Nonnull String body, boolean calledOnNullInput, - @NonNull String language, - @NonNull DataType returnType) { + @Nonnull String language, + @Nonnull DataType returnType) { Preconditions.checkArgument( signature.getParameterTypes().size() == parameterNames.size(), "Number of parameter names should match number of types in the signature (got %s and %s)", @@ -63,25 +63,25 @@ public DefaultFunctionMetadata( this.returnType = returnType; } - @NonNull + @Nonnull @Override public CqlIdentifier getKeyspace() { return keyspace; } - @NonNull + @Nonnull @Override public FunctionSignature getSignature() { return signature; } - @NonNull + @Nonnull @Override public List getParameterNames() { return parameterNames; } - @NonNull + @Nonnull @Override public String getBody() { return body; @@ -92,13 +92,13 @@ public boolean isCalledOnNullInput() { return calledOnNullInput; } - @NonNull + @Nonnull @Override public String getLanguage() { return language; } - @NonNull + @Nonnull @Override public DataType getReturnType() { return returnType; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultIndexMetadata.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultIndexMetadata.java index 8ff0263fcc8..84ce04cad05 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultIndexMetadata.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultIndexMetadata.java @@ -20,10 +20,10 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.core.metadata.schema.IndexKind; import com.datastax.oss.driver.api.core.metadata.schema.IndexMetadata; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.Serializable; import java.util.Map; import java.util.Objects; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -31,20 +31,20 @@ public class DefaultIndexMetadata implements IndexMetadata, Serializable { private static final long serialVersionUID = 1; - @NonNull private final CqlIdentifier keyspace; - @NonNull private final CqlIdentifier table; - @NonNull private final CqlIdentifier name; - @NonNull private final IndexKind kind; - @NonNull private final String target; - @NonNull private final Map options; + @Nonnull private final CqlIdentifier keyspace; + @Nonnull private final CqlIdentifier table; + @Nonnull private final CqlIdentifier name; + @Nonnull private final IndexKind kind; + @Nonnull private final String target; + @Nonnull private final Map options; public DefaultIndexMetadata( - @NonNull CqlIdentifier keyspace, - @NonNull CqlIdentifier table, - @NonNull CqlIdentifier name, - @NonNull IndexKind kind, - @NonNull String target, - @NonNull Map options) { + @Nonnull CqlIdentifier keyspace, + @Nonnull CqlIdentifier table, + @Nonnull CqlIdentifier name, + @Nonnull IndexKind kind, + @Nonnull String target, + @Nonnull Map options) { this.keyspace = keyspace; this.table = table; this.name = name; @@ -53,37 +53,37 @@ public DefaultIndexMetadata( this.options = options; } - @NonNull + @Nonnull @Override public CqlIdentifier getKeyspace() { return keyspace; } - @NonNull + @Nonnull @Override public CqlIdentifier getTable() { return table; } - @NonNull + @Nonnull @Override public CqlIdentifier getName() { return name; } - @NonNull + @Nonnull @Override public IndexKind getKind() { return kind; } - @NonNull + @Nonnull @Override public String getTarget() { return target; } - @NonNull + @Nonnull @Override public Map getOptions() { return options; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultKeyspaceMetadata.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultKeyspaceMetadata.java index 3d443dd8c16..42b65e11632 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultKeyspaceMetadata.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultKeyspaceMetadata.java @@ -25,10 +25,10 @@ import com.datastax.oss.driver.api.core.metadata.schema.TableMetadata; import com.datastax.oss.driver.api.core.metadata.schema.ViewMetadata; import com.datastax.oss.driver.api.core.type.UserDefinedType; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.Serializable; import java.util.Map; import java.util.Objects; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -36,26 +36,26 @@ public class DefaultKeyspaceMetadata implements KeyspaceMetadata, Serializable { private static final long serialVersionUID = 1; - @NonNull private final CqlIdentifier name; + @Nonnull private final CqlIdentifier name; private final boolean durableWrites; private final boolean virtual; - @NonNull private final Map replication; - @NonNull private final Map types; - @NonNull private final Map tables; - @NonNull private final Map views; - @NonNull private final Map functions; - @NonNull private final Map aggregates; + @Nonnull private final Map replication; + @Nonnull private final Map types; + @Nonnull private final Map tables; + @Nonnull private final Map views; + @Nonnull private final Map functions; + @Nonnull private final Map aggregates; public DefaultKeyspaceMetadata( - @NonNull CqlIdentifier name, + @Nonnull CqlIdentifier name, boolean durableWrites, boolean virtual, - @NonNull Map replication, - @NonNull Map types, - @NonNull Map tables, - @NonNull Map views, - @NonNull Map functions, - @NonNull Map aggregates) { + @Nonnull Map replication, + @Nonnull Map types, + @Nonnull Map tables, + @Nonnull Map views, + @Nonnull Map functions, + @Nonnull Map aggregates) { this.name = name; this.durableWrites = durableWrites; this.virtual = virtual; @@ -67,7 +67,7 @@ public DefaultKeyspaceMetadata( this.aggregates = aggregates; } - @NonNull + @Nonnull @Override public CqlIdentifier getName() { return name; @@ -83,37 +83,37 @@ public boolean isVirtual() { return virtual; } - @NonNull + @Nonnull @Override public Map getReplication() { return replication; } - @NonNull + @Nonnull @Override public Map getUserDefinedTypes() { return types; } - @NonNull + @Nonnull @Override public Map getTables() { return tables; } - @NonNull + @Nonnull @Override public Map getViews() { return views; } - @NonNull + @Nonnull @Override public Map getFunctions() { return functions; } - @NonNull + @Nonnull @Override public Map getAggregates() { return aggregates; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultTableMetadata.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultTableMetadata.java index 4c339f89299..1161bf2bf25 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultTableMetadata.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultTableMetadata.java @@ -22,14 +22,14 @@ import com.datastax.oss.driver.api.core.metadata.schema.ColumnMetadata; import com.datastax.oss.driver.api.core.metadata.schema.IndexMetadata; import com.datastax.oss.driver.api.core.metadata.schema.TableMetadata; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.Serializable; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.UUID; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; @Immutable @@ -37,29 +37,29 @@ public class DefaultTableMetadata implements TableMetadata, Serializable { private static final long serialVersionUID = 1; - @NonNull private final CqlIdentifier keyspace; - @NonNull private final CqlIdentifier name; + @Nonnull private final CqlIdentifier keyspace; + @Nonnull private final CqlIdentifier name; // null for virtual tables @Nullable private final UUID id; private final boolean compactStorage; private final boolean virtual; - @NonNull private final List partitionKey; - @NonNull private final Map clusteringColumns; - @NonNull private final Map columns; - @NonNull private final Map options; - @NonNull private final Map indexes; + @Nonnull private final List partitionKey; + @Nonnull private final Map clusteringColumns; + @Nonnull private final Map columns; + @Nonnull private final Map options; + @Nonnull private final Map indexes; public DefaultTableMetadata( - @NonNull CqlIdentifier keyspace, - @NonNull CqlIdentifier name, + @Nonnull CqlIdentifier keyspace, + @Nonnull CqlIdentifier name, @Nullable UUID id, boolean compactStorage, boolean virtual, - @NonNull List partitionKey, - @NonNull Map clusteringColumns, - @NonNull Map columns, - @NonNull Map options, - @NonNull Map indexes) { + @Nonnull List partitionKey, + @Nonnull Map clusteringColumns, + @Nonnull Map columns, + @Nonnull Map options, + @Nonnull Map indexes) { this.keyspace = keyspace; this.name = name; this.id = id; @@ -72,19 +72,19 @@ public DefaultTableMetadata( this.indexes = indexes; } - @NonNull + @Nonnull @Override public CqlIdentifier getKeyspace() { return keyspace; } - @NonNull + @Nonnull @Override public CqlIdentifier getName() { return name; } - @NonNull + @Nonnull @Override public Optional getId() { return Optional.ofNullable(id); @@ -100,31 +100,31 @@ public boolean isVirtual() { return virtual; } - @NonNull + @Nonnull @Override public List getPartitionKey() { return partitionKey; } - @NonNull + @Nonnull @Override public Map getClusteringColumns() { return clusteringColumns; } - @NonNull + @Nonnull @Override public Map getColumns() { return columns; } - @NonNull + @Nonnull @Override public Map getOptions() { return options; } - @NonNull + @Nonnull @Override public Map getIndexes() { return indexes; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultViewMetadata.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultViewMetadata.java index 2c5e5a9603e..1e4e43d3498 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultViewMetadata.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/DefaultViewMetadata.java @@ -23,14 +23,14 @@ import com.datastax.oss.driver.api.core.metadata.schema.ViewMetadata; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.Serializable; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.UUID; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; @Immutable @@ -38,28 +38,28 @@ public class DefaultViewMetadata implements ViewMetadata, Serializable { private static final long serialVersionUID = 1; - @NonNull private final CqlIdentifier keyspace; - @NonNull private final CqlIdentifier name; - @NonNull private final CqlIdentifier baseTable; + @Nonnull private final CqlIdentifier keyspace; + @Nonnull private final CqlIdentifier name; + @Nonnull private final CqlIdentifier baseTable; private final boolean includesAllColumns; @Nullable private final String whereClause; - @NonNull private final UUID id; - @NonNull private final ImmutableList partitionKey; - @NonNull private final ImmutableMap clusteringColumns; - @NonNull private final ImmutableMap columns; - @NonNull private final Map options; + @Nonnull private final UUID id; + @Nonnull private final ImmutableList partitionKey; + @Nonnull private final ImmutableMap clusteringColumns; + @Nonnull private final ImmutableMap columns; + @Nonnull private final Map options; public DefaultViewMetadata( - @NonNull CqlIdentifier keyspace, - @NonNull CqlIdentifier name, - @NonNull CqlIdentifier baseTable, + @Nonnull CqlIdentifier keyspace, + @Nonnull CqlIdentifier name, + @Nonnull CqlIdentifier baseTable, boolean includesAllColumns, @Nullable String whereClause, - @NonNull UUID id, - @NonNull ImmutableList partitionKey, - @NonNull ImmutableMap clusteringColumns, - @NonNull ImmutableMap columns, - @NonNull Map options) { + @Nonnull UUID id, + @Nonnull ImmutableList partitionKey, + @Nonnull ImmutableMap clusteringColumns, + @Nonnull ImmutableMap columns, + @Nonnull Map options) { this.keyspace = keyspace; this.name = name; this.baseTable = baseTable; @@ -72,25 +72,25 @@ public DefaultViewMetadata( this.options = options; } - @NonNull + @Nonnull @Override public CqlIdentifier getKeyspace() { return keyspace; } - @NonNull + @Nonnull @Override public CqlIdentifier getName() { return name; } - @NonNull + @Nonnull @Override public Optional getId() { return Optional.of(id); } - @NonNull + @Nonnull @Override public CqlIdentifier getBaseTable() { return baseTable; @@ -101,31 +101,31 @@ public boolean includesAllColumns() { return includesAllColumns; } - @NonNull + @Nonnull @Override public Optional getWhereClause() { return Optional.ofNullable(whereClause); } - @NonNull + @Nonnull @Override public List getPartitionKey() { return partitionKey; } - @NonNull + @Nonnull @Override public Map getClusteringColumns() { return clusteringColumns; } - @NonNull + @Nonnull @Override public Map getColumns() { return columns; } - @NonNull + @Nonnull @Override public Map getOptions() { return options; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/MultiplexingSchemaChangeListener.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/MultiplexingSchemaChangeListener.java index eebe16364d1..269ff82fca2 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/MultiplexingSchemaChangeListener.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/MultiplexingSchemaChangeListener.java @@ -26,13 +26,13 @@ import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.api.core.type.UserDefinedType; import com.datastax.oss.driver.internal.core.util.Loggers; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Objects; import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Consumer; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -74,111 +74,111 @@ private void addListener(SchemaChangeListener toAdd) { } } - public void register(@NonNull SchemaChangeListener listener) { + public void register(@Nonnull SchemaChangeListener listener) { addListener(listener); } @Override - public void onKeyspaceCreated(@NonNull KeyspaceMetadata keyspace) { + public void onKeyspaceCreated(@Nonnull KeyspaceMetadata keyspace) { invokeListeners(listener -> listener.onKeyspaceCreated(keyspace), "onKeyspaceCreated"); } @Override - public void onKeyspaceDropped(@NonNull KeyspaceMetadata keyspace) { + public void onKeyspaceDropped(@Nonnull KeyspaceMetadata keyspace) { invokeListeners(listener -> listener.onKeyspaceDropped(keyspace), "onKeyspaceDropped"); } @Override public void onKeyspaceUpdated( - @NonNull KeyspaceMetadata current, @NonNull KeyspaceMetadata previous) { + @Nonnull KeyspaceMetadata current, @Nonnull KeyspaceMetadata previous) { invokeListeners(listener -> listener.onKeyspaceUpdated(current, previous), "onKeyspaceUpdated"); } @Override - public void onTableCreated(@NonNull TableMetadata table) { + public void onTableCreated(@Nonnull TableMetadata table) { invokeListeners(listener -> listener.onTableCreated(table), "onTableCreated"); } @Override - public void onTableDropped(@NonNull TableMetadata table) { + public void onTableDropped(@Nonnull TableMetadata table) { invokeListeners(listener -> listener.onTableDropped(table), "onTableDropped"); } @Override - public void onTableUpdated(@NonNull TableMetadata current, @NonNull TableMetadata previous) { + public void onTableUpdated(@Nonnull TableMetadata current, @Nonnull TableMetadata previous) { invokeListeners(listener -> listener.onTableUpdated(current, previous), "onTableUpdated"); } @Override - public void onUserDefinedTypeCreated(@NonNull UserDefinedType type) { + public void onUserDefinedTypeCreated(@Nonnull UserDefinedType type) { invokeListeners( listener -> listener.onUserDefinedTypeCreated(type), "onUserDefinedTypeCreated"); } @Override - public void onUserDefinedTypeDropped(@NonNull UserDefinedType type) { + public void onUserDefinedTypeDropped(@Nonnull UserDefinedType type) { invokeListeners( listener -> listener.onUserDefinedTypeDropped(type), "onUserDefinedTypeDropped"); } @Override public void onUserDefinedTypeUpdated( - @NonNull UserDefinedType current, @NonNull UserDefinedType previous) { + @Nonnull UserDefinedType current, @Nonnull UserDefinedType previous) { invokeListeners( listener -> listener.onUserDefinedTypeUpdated(current, previous), "onUserDefinedTypeUpdated"); } @Override - public void onFunctionCreated(@NonNull FunctionMetadata function) { + public void onFunctionCreated(@Nonnull FunctionMetadata function) { invokeListeners(listener -> listener.onFunctionCreated(function), "onFunctionCreated"); } @Override - public void onFunctionDropped(@NonNull FunctionMetadata function) { + public void onFunctionDropped(@Nonnull FunctionMetadata function) { invokeListeners(listener -> listener.onFunctionDropped(function), "onFunctionDropped"); } @Override public void onFunctionUpdated( - @NonNull FunctionMetadata current, @NonNull FunctionMetadata previous) { + @Nonnull FunctionMetadata current, @Nonnull FunctionMetadata previous) { invokeListeners(listener -> listener.onFunctionUpdated(current, previous), "onFunctionUpdated"); } @Override - public void onAggregateCreated(@NonNull AggregateMetadata aggregate) { + public void onAggregateCreated(@Nonnull AggregateMetadata aggregate) { invokeListeners(listener -> listener.onAggregateCreated(aggregate), "onAggregateCreated"); } @Override - public void onAggregateDropped(@NonNull AggregateMetadata aggregate) { + public void onAggregateDropped(@Nonnull AggregateMetadata aggregate) { invokeListeners(listener -> listener.onAggregateDropped(aggregate), "onAggregateDropped"); } @Override public void onAggregateUpdated( - @NonNull AggregateMetadata current, @NonNull AggregateMetadata previous) { + @Nonnull AggregateMetadata current, @Nonnull AggregateMetadata previous) { invokeListeners( listener -> listener.onAggregateUpdated(current, previous), "onAggregateUpdated"); } @Override - public void onViewCreated(@NonNull ViewMetadata view) { + public void onViewCreated(@Nonnull ViewMetadata view) { invokeListeners(listener -> listener.onViewCreated(view), "onViewCreated"); } @Override - public void onViewDropped(@NonNull ViewMetadata view) { + public void onViewDropped(@Nonnull ViewMetadata view) { invokeListeners(listener -> listener.onViewDropped(view), "onViewDropped"); } @Override - public void onViewUpdated(@NonNull ViewMetadata current, @NonNull ViewMetadata previous) { + public void onViewUpdated(@Nonnull ViewMetadata current, @Nonnull ViewMetadata previous) { invokeListeners(listener -> listener.onViewUpdated(current, previous), "onViewUpdated"); } @Override - public void onSessionReady(@NonNull Session session) { + public void onSessionReady(@Nonnull Session session) { invokeListeners(listener -> listener.onSessionReady(session), "onSessionReady"); } @@ -194,7 +194,7 @@ public void close() throws Exception { } } - private void invokeListeners(@NonNull Consumer action, String event) { + private void invokeListeners(@Nonnull Consumer action, String event) { for (SchemaChangeListener listener : listeners) { try { action.accept(listener); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/ShallowUserDefinedType.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/ShallowUserDefinedType.java index 069ce3752b2..3d0251e6433 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/ShallowUserDefinedType.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/ShallowUserDefinedType.java @@ -24,13 +24,13 @@ import com.datastax.oss.driver.api.core.type.UserDefinedType; import com.datastax.oss.driver.internal.core.metadata.schema.parsing.UserDefinedTypeParser; import com.datastax.oss.driver.internal.core.type.DefaultUserDefinedType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.List; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; /** @@ -68,7 +68,7 @@ public CqlIdentifier getKeyspace() { return keyspace; } - @NonNull + @Nonnull @Override public CqlIdentifier getName() { return name; @@ -79,68 +79,68 @@ public boolean isFrozen() { return frozen; } - @NonNull + @Nonnull @Override public List getFieldNames() { throw new UnsupportedOperationException( "This implementation should only be used internally, this is likely a driver bug"); } - @NonNull + @Nonnull @Override - public List allIndicesOf(@NonNull CqlIdentifier id) { + public List allIndicesOf(@Nonnull CqlIdentifier id) { throw new UnsupportedOperationException( "This implementation should only be used internally, this is likely a driver bug"); } @Override - public int firstIndexOf(@NonNull CqlIdentifier id) { + public int firstIndexOf(@Nonnull CqlIdentifier id) { throw new UnsupportedOperationException( "This implementation should only be used internally, this is likely a driver bug"); } - @NonNull + @Nonnull @Override - public List allIndicesOf(@NonNull String name) { + public List allIndicesOf(@Nonnull String name) { throw new UnsupportedOperationException( "This implementation should only be used internally, this is likely a driver bug"); } @Override - public int firstIndexOf(@NonNull String name) { + public int firstIndexOf(@Nonnull String name) { throw new UnsupportedOperationException( "This implementation should only be used internally, this is likely a driver bug"); } - @NonNull + @Nonnull @Override public List getFieldTypes() { throw new UnsupportedOperationException( "This implementation should only be used internally, this is likely a driver bug"); } - @NonNull + @Nonnull @Override public UserDefinedType copy(boolean newFrozen) { throw new UnsupportedOperationException( "This implementation should only be used internally, this is likely a driver bug"); } - @NonNull + @Nonnull @Override public UdtValue newValue() { throw new UnsupportedOperationException( "This implementation should only be used internally, this is likely a driver bug"); } - @NonNull + @Nonnull @Override - public UdtValue newValue(@NonNull Object... fields) { + public UdtValue newValue(@Nonnull Object... fields) { throw new UnsupportedOperationException( "This implementation should only be used internally, this is likely a driver bug"); } - @NonNull + @Nonnull @Override public AttachmentPoint getAttachmentPoint() { throw new UnsupportedOperationException( @@ -154,7 +154,7 @@ public boolean isDetached() { } @Override - public void attach(@NonNull AttachmentPoint attachmentPoint) { + public void attach(@Nonnull AttachmentPoint attachmentPoint) { throw new UnsupportedOperationException( "This implementation should only be used internally, this is likely a driver bug"); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/parsing/RawColumn.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/parsing/RawColumn.java index 331f4841f79..b6907b4814f 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/parsing/RawColumn.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/parsing/RawColumn.java @@ -22,12 +22,12 @@ import com.datastax.oss.driver.internal.core.adminrequest.AdminRow; import com.datastax.oss.driver.shaded.guava.common.collect.Lists; import com.datastax.oss.driver.shaded.guava.common.primitives.Ints; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.ListIterator; import java.util.Map; +import javax.annotation.Nonnull; import net.jcip.annotations.NotThreadSafe; /** @@ -118,7 +118,7 @@ private RawColumn(AdminRow row) { } @Override - public int compareTo(@NonNull RawColumn that) { + public int compareTo(@Nonnull RawColumn that) { // First, order by kind. Then order partition key and clustering columns by position. For // other kinds, order by column name. if (!this.kind.equals(that.kind)) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/queries/CassandraSchemaRows.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/queries/CassandraSchemaRows.java index 95af0739300..ed153195346 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/queries/CassandraSchemaRows.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/queries/CassandraSchemaRows.java @@ -30,10 +30,10 @@ import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMultimap; import com.datastax.oss.driver.shaded.guava.common.collect.Multimap; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -90,7 +90,7 @@ private CassandraSchemaRows( this.edges = edges; } - @NonNull + @Nonnull @Override public Node getNode() { return node; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/queries/KeyspaceFilter.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/queries/KeyspaceFilter.java index a483a904f6e..d93e7a0447d 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/queries/KeyspaceFilter.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/queries/KeyspaceFilter.java @@ -17,8 +17,8 @@ */ package com.datastax.oss.driver.internal.core.metadata.schema.queries; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; +import javax.annotation.Nonnull; /** * Filters keyspaces during schema metadata queries. @@ -29,7 +29,7 @@ */ public interface KeyspaceFilter { - static KeyspaceFilter newInstance(@NonNull String logPrefix, @NonNull List specs) { + static KeyspaceFilter newInstance(@Nonnull String logPrefix, @Nonnull List specs) { if (specs.isEmpty()) { return INCLUDE_ALL; } else { @@ -38,22 +38,22 @@ static KeyspaceFilter newInstance(@NonNull String logPrefix, @NonNull List loggedKeyspaces; - RuleBasedKeyspaceFilter(@NonNull String logPrefix, @NonNull List specs) { + RuleBasedKeyspaceFilter(@Nonnull String logPrefix, @Nonnull List specs) { assert !specs.isEmpty(); // see KeyspaceFilter#newInstance this.logPrefix = logPrefix; @@ -111,14 +111,14 @@ class RuleBasedKeyspaceFilter implements KeyspaceFilter { loggedKeyspaces = isDebugEnabled ? new HashSet<>() : null; } - @NonNull + @Nonnull @Override public String getWhereClause() { return whereClause; } @Override - public boolean includes(@NonNull String keyspace) { + public boolean includes(@Nonnull String keyspace) { if (exactIncludes.contains(keyspace)) { log(keyspace, true, "it is included by name"); return true; @@ -157,7 +157,7 @@ public boolean includes(@NonNull String keyspace) { } } - private void log(@NonNull String keyspace, boolean include, @NonNull String reason) { + private void log(@Nonnull String keyspace, boolean include, @Nonnull String reason) { if (isDebugEnabled && loggedKeyspaces.add(keyspace)) { LOG.debug( "[{}] Filtering {} '{}' because {}", logPrefix, include ? "in" : "out", keyspace, reason); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/queries/SchemaRows.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/queries/SchemaRows.java index 0507b8cffd1..8954f1fa167 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/queries/SchemaRows.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/schema/queries/SchemaRows.java @@ -22,10 +22,10 @@ import com.datastax.oss.driver.internal.core.adminrequest.AdminRow; import com.datastax.oss.driver.internal.core.metadata.schema.parsing.DataTypeParser; import com.datastax.oss.driver.shaded.guava.common.collect.Multimap; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import javax.annotation.Nonnull; /** * The system rows returned by the queries for a schema refresh, categorized by keyspace/table where @@ -36,7 +36,7 @@ public interface SchemaRows { /** The node that was used to retrieve the schema information. */ - @NonNull + @Nonnull Node getNode(); List keyspaces(); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/ByteOrderedToken.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/ByteOrderedToken.java index ff7642d0c18..c4ad3dfdd1a 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/ByteOrderedToken.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/ByteOrderedToken.java @@ -21,8 +21,8 @@ import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; import com.datastax.oss.driver.shaded.guava.common.primitives.UnsignedBytes; import com.datastax.oss.protocol.internal.util.Bytes; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; /** A token generated by {@code ByteOrderedPartitioner}. */ @@ -31,11 +31,11 @@ public class ByteOrderedToken implements Token { private final ByteBuffer value; - public ByteOrderedToken(@NonNull ByteBuffer value) { + public ByteOrderedToken(@Nonnull ByteBuffer value) { this.value = ByteBuffer.wrap(Bytes.getArray(value)).asReadOnlyBuffer(); } - @NonNull + @Nonnull public ByteBuffer getValue() { return value; } @@ -58,7 +58,7 @@ public int hashCode() { } @Override - public int compareTo(@NonNull Token other) { + public int compareTo(@Nonnull Token other) { Preconditions.checkArgument( other instanceof ByteOrderedToken, "Can only compare tokens of the same type"); return UnsignedBytes.lexicographicalComparator() diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/DefaultTokenMap.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/DefaultTokenMap.java index 8c59fb73847..4bb8e674017 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/DefaultTokenMap.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/DefaultTokenMap.java @@ -31,7 +31,6 @@ import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableSet; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableSetMultimap; import com.datastax.oss.driver.shaded.guava.common.collect.SetMultimap; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.util.Collection; import java.util.Collections; @@ -40,6 +39,7 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,11 +50,11 @@ public class DefaultTokenMap implements TokenMap { private static final Logger LOG = LoggerFactory.getLogger(DefaultTokenMap.class); public static DefaultTokenMap build( - @NonNull Collection nodes, - @NonNull Collection keyspaces, - @NonNull TokenFactory tokenFactory, - @NonNull ReplicationStrategyFactory replicationStrategyFactory, - @NonNull String logPrefix) { + @Nonnull Collection nodes, + @Nonnull Collection keyspaces, + @Nonnull TokenFactory tokenFactory, + @Nonnull ReplicationStrategyFactory replicationStrategyFactory, + @Nonnull String logPrefix) { TokenToPrimaryAndRing tmp = buildTokenToPrimaryAndRing(nodes, tokenFactory); Map tokenToPrimary = tmp.tokenToPrimary; @@ -128,64 +128,64 @@ public TokenFactory getTokenFactory() { return tokenFactory; } - @NonNull + @Nonnull @Override - public Token parse(@NonNull String tokenString) { + public Token parse(@Nonnull String tokenString) { return tokenFactory.parse(tokenString); } - @NonNull + @Nonnull @Override - public String format(@NonNull Token token) { + public String format(@Nonnull Token token) { return tokenFactory.format(token); } - @NonNull + @Nonnull @Override - public Token newToken(@NonNull ByteBuffer... partitionKey) { + public Token newToken(@Nonnull ByteBuffer... partitionKey) { return tokenFactory.hash(RoutingKey.compose(partitionKey)); } - @NonNull + @Nonnull @Override - public TokenRange newTokenRange(@NonNull Token start, @NonNull Token end) { + public TokenRange newTokenRange(@Nonnull Token start, @Nonnull Token end) { return tokenFactory.range(start, end); } - @NonNull + @Nonnull @Override public Set getTokenRanges() { return tokenRanges; } - @NonNull + @Nonnull @Override - public Set getTokenRanges(@NonNull Node node) { + public Set getTokenRanges(@Nonnull Node node) { return tokenRangesByPrimary.get(node); } - @NonNull + @Nonnull @Override - public Set getTokenRanges(@NonNull CqlIdentifier keyspace, @NonNull Node replica) { + public Set getTokenRanges(@Nonnull CqlIdentifier keyspace, @Nonnull Node replica) { KeyspaceTokenMap keyspaceMap = getKeyspaceMap(keyspace); return (keyspaceMap == null) ? Collections.emptySet() : keyspaceMap.getTokenRanges(replica); } - @NonNull + @Nonnull @Override - public Set getReplicas(@NonNull CqlIdentifier keyspace, @NonNull ByteBuffer partitionKey) { + public Set getReplicas(@Nonnull CqlIdentifier keyspace, @Nonnull ByteBuffer partitionKey) { KeyspaceTokenMap keyspaceMap = getKeyspaceMap(keyspace); return (keyspaceMap == null) ? Collections.emptySet() : keyspaceMap.getReplicas(partitionKey); } - @NonNull + @Nonnull @Override - public Set getReplicas(@NonNull CqlIdentifier keyspace, @NonNull Token token) { + public Set getReplicas(@Nonnull CqlIdentifier keyspace, @Nonnull Token token) { KeyspaceTokenMap keyspaceMap = getKeyspaceMap(keyspace); return (keyspaceMap == null) ? Collections.emptySet() : keyspaceMap.getReplicas(token); } - @NonNull + @Nonnull @Override public String getPartitionerName() { return tokenFactory.getPartitionerName(); @@ -198,9 +198,9 @@ private KeyspaceTokenMap getKeyspaceMap(CqlIdentifier keyspace) { /** Called when only the schema has changed. */ public DefaultTokenMap refresh( - @NonNull Collection nodes, - @NonNull Collection keyspaces, - @NonNull ReplicationStrategyFactory replicationStrategyFactory) { + @Nonnull Collection nodes, + @Nonnull Collection keyspaces, + @Nonnull ReplicationStrategyFactory replicationStrategyFactory) { Map> newReplicationConfigs = buildReplicationConfigs(keyspaces, logPrefix); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/Murmur3Token.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/Murmur3Token.java index 1b3072d4f22..e7db4f3b988 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/Murmur3Token.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/Murmur3Token.java @@ -20,7 +20,7 @@ import com.datastax.oss.driver.api.core.metadata.token.Token; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; import com.datastax.oss.driver.shaded.guava.common.primitives.Longs; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; /** A token generated by {@code Murmur3Partitioner}. */ @@ -55,7 +55,7 @@ public int hashCode() { } @Override - public int compareTo(@NonNull Token other) { + public int compareTo(@Nonnull Token other) { Preconditions.checkArgument( other instanceof Murmur3Token, "Can only compare tokens of the same type"); Murmur3Token that = (Murmur3Token) other; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/RandomToken.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/RandomToken.java index 52e32fef522..08be9e1aaa5 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/RandomToken.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/RandomToken.java @@ -19,8 +19,8 @@ import com.datastax.oss.driver.api.core.metadata.token.Token; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; -import edu.umd.cs.findbugs.annotations.NonNull; import java.math.BigInteger; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; /** A token generated by {@code RandomPartitioner}. */ @@ -55,7 +55,7 @@ public int hashCode() { } @Override - public int compareTo(@NonNull Token other) { + public int compareTo(@Nonnull Token other) { Preconditions.checkArgument( other instanceof RandomToken, "Can only compare tokens of the same type"); RandomToken that = (RandomToken) other; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/TokenRangeBase.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/TokenRangeBase.java index f63f9dd1ab4..92529c635c3 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/TokenRangeBase.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/token/TokenRangeBase.java @@ -22,11 +22,11 @@ import com.datastax.oss.driver.shaded.guava.common.annotations.VisibleForTesting; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; import com.datastax.oss.driver.shaded.guava.common.collect.Lists; -import edu.umd.cs.findbugs.annotations.NonNull; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; import java.util.Objects; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -42,19 +42,19 @@ protected TokenRangeBase(Token start, Token end, Token minToken) { this.minToken = minToken; } - @NonNull + @Nonnull @Override public Token getStart() { return start; } - @NonNull + @Nonnull @Override public Token getEnd() { return end; } - @NonNull + @Nonnull @Override public List splitEvenly(int numberOfSplits) { if (numberOfSplits < 1) @@ -120,7 +120,7 @@ public boolean isFullRing() { return start.equals(minToken) && end.equals(minToken); } - @NonNull + @Nonnull @Override public List unwrap() { if (isWrappedAround()) { @@ -131,7 +131,7 @@ public List unwrap() { } @Override - public boolean intersects(@NonNull TokenRange that) { + public boolean intersects(@Nonnull TokenRange that) { // Empty ranges never intersect any other range if (this.isEmpty() || that.isEmpty()) { return false; @@ -143,9 +143,9 @@ public boolean intersects(@NonNull TokenRange that) { || contains(that, this.end, false); } - @NonNull + @Nonnull @Override - public List intersectWith(@NonNull TokenRange that) { + public List intersectWith(@Nonnull TokenRange that) { if (!this.intersects(that)) { throw new IllegalArgumentException( "The two ranges do not intersect, use intersects() before calling this method"); @@ -181,7 +181,7 @@ public List intersectWith(@NonNull TokenRange that) { } @Override - public boolean contains(@NonNull Token token) { + public boolean contains(@Nonnull Token token) { return contains(this, token, false); } @@ -214,9 +214,9 @@ boolean contains(TokenRange range, Token token, boolean isStart) { } } - @NonNull + @Nonnull @Override - public TokenRange mergeWith(@NonNull TokenRange that) { + public TokenRange mergeWith(@Nonnull TokenRange that) { if (this.equals(that)) { return this; } @@ -281,7 +281,7 @@ public int hashCode() { } @Override - public int compareTo(@NonNull TokenRange that) { + public int compareTo(@Nonnull TokenRange that) { if (this.equals(that)) { return 0; } else { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/AbstractMetricUpdater.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/AbstractMetricUpdater.java index fcfe56b605e..12e471d654a 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/AbstractMetricUpdater.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/AbstractMetricUpdater.java @@ -30,12 +30,12 @@ import com.datastax.oss.driver.internal.core.session.throttling.ConcurrencyLimitingRequestThrottler; import com.datastax.oss.driver.internal.core.session.throttling.RateLimitingRequestThrottler; import com.datastax.oss.driver.shaded.guava.common.cache.Cache; -import edu.umd.cs.findbugs.annotations.Nullable; import io.netty.util.Timeout; import java.time.Duration; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import javax.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/DefaultMetricId.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/DefaultMetricId.java index c1c2e80e387..c022b38bc7b 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/DefaultMetricId.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/DefaultMetricId.java @@ -18,9 +18,9 @@ package com.datastax.oss.driver.internal.core.metrics; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; import java.util.Objects; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -34,13 +34,13 @@ public DefaultMetricId(String name, Map tags) { this.tags = ImmutableMap.copyOf(Objects.requireNonNull(tags, "tags cannot be null")); } - @NonNull + @Nonnull @Override public String getName() { return name; } - @NonNull + @Nonnull @Override public Map getTags() { return tags; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/DefaultMetricIdGenerator.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/DefaultMetricIdGenerator.java index d4bacb35df9..ac6323c4991 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/DefaultMetricIdGenerator.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/DefaultMetricIdGenerator.java @@ -23,8 +23,8 @@ import com.datastax.oss.driver.api.core.metrics.NodeMetric; import com.datastax.oss.driver.api.core.metrics.SessionMetric; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; +import javax.annotation.Nonnull; /** * The default {@link MetricIdGenerator}. @@ -50,15 +50,15 @@ public DefaultMetricIdGenerator(DriverContext context) { nodePrefix = sessionPrefix + "nodes."; } - @NonNull + @Nonnull @Override - public MetricId sessionMetricId(@NonNull SessionMetric metric) { + public MetricId sessionMetricId(@Nonnull SessionMetric metric) { return new DefaultMetricId(sessionPrefix + metric.getPath(), ImmutableMap.of()); } - @NonNull + @Nonnull @Override - public MetricId nodeMetricId(@NonNull Node node, @NonNull NodeMetric metric) { + public MetricId nodeMetricId(@Nonnull Node node, @Nonnull NodeMetric metric) { return new DefaultMetricId( nodePrefix + node.getEndPoint().asMetricPrefix() + '.' + metric.getPath(), ImmutableMap.of()); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/DefaultMetrics.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/DefaultMetrics.java index b15dc955760..33c6d325410 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/DefaultMetrics.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/DefaultMetrics.java @@ -24,8 +24,8 @@ import com.datastax.oss.driver.api.core.metrics.NodeMetric; import com.datastax.oss.driver.api.core.metrics.SessionMetric; import com.datastax.oss.driver.internal.core.metadata.DefaultNode; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Optional; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -39,25 +39,25 @@ public DefaultMetrics(MetricRegistry registry, DropwizardSessionMetricUpdater se this.sessionUpdater = sessionUpdater; } - @NonNull + @Nonnull @Override public MetricRegistry getRegistry() { return registry; } - @NonNull + @Nonnull @Override @SuppressWarnings("TypeParameterUnusedInFormals") public Optional getSessionMetric( - @NonNull SessionMetric metric, String profileName) { + @Nonnull SessionMetric metric, String profileName) { return Optional.ofNullable(sessionUpdater.getMetric(metric, profileName)); } - @NonNull + @Nonnull @Override @SuppressWarnings("TypeParameterUnusedInFormals") public Optional getNodeMetric( - @NonNull Node node, @NonNull NodeMetric metric, String profileName) { + @Nonnull Node node, @Nonnull NodeMetric metric, String profileName) { NodeMetricUpdater nodeUpdater = ((DefaultNode) node).getMetricUpdater(); return Optional.ofNullable( ((DropwizardNodeMetricUpdater) nodeUpdater).getMetric(metric, profileName)); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/DropwizardMetricUpdater.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/DropwizardMetricUpdater.java index 8590917be21..74769577bbf 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/DropwizardMetricUpdater.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/DropwizardMetricUpdater.java @@ -27,13 +27,13 @@ import com.datastax.oss.driver.api.core.config.DriverExecutionProfile; import com.datastax.oss.driver.api.core.config.DriverOption; import com.datastax.oss.driver.internal.core.context.InternalDriverContext; -import edu.umd.cs.findbugs.annotations.Nullable; import java.time.Duration; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/DropwizardMetricsFactory.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/DropwizardMetricsFactory.java index 5f28f8f5060..4ffbadf71a7 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/DropwizardMetricsFactory.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/DropwizardMetricsFactory.java @@ -29,10 +29,10 @@ import com.datastax.oss.driver.internal.core.context.InternalDriverContext; import com.datastax.oss.driver.internal.core.metadata.NodeStateEvent; import com.datastax.oss.driver.internal.core.util.concurrent.RunOrSchedule; -import edu.umd.cs.findbugs.annotations.Nullable; import io.netty.util.concurrent.EventExecutor; import java.util.Optional; import java.util.Set; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/MetricId.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/MetricId.java index 039fb96d34b..919fe48aeaa 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/MetricId.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/MetricId.java @@ -17,8 +17,8 @@ */ package com.datastax.oss.driver.internal.core.metrics; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.Nonnull; /** * The identifier of a metric. @@ -40,10 +40,10 @@ public interface MetricId { * * @return The metric name; cannot be empty nor null. */ - @NonNull + @Nonnull String getName(); /** @return The metric tags, or empty if no tag is defined; cannot be null. */ - @NonNull + @Nonnull Map getTags(); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/MetricIdGenerator.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/MetricIdGenerator.java index 7a33a81b966..187a7c9fb38 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/MetricIdGenerator.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/MetricIdGenerator.java @@ -20,7 +20,7 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.metrics.NodeMetric; import com.datastax.oss.driver.api.core.metrics.SessionMetric; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * A {@link MetricIdGenerator} is used to generate the unique identifiers by which a metric should @@ -40,10 +40,10 @@ public interface MetricIdGenerator { /** Generates a {@link MetricId} for the given {@link SessionMetric}. */ - @NonNull - MetricId sessionMetricId(@NonNull SessionMetric metric); + @Nonnull + MetricId sessionMetricId(@Nonnull SessionMetric metric); /** Generates a {@link MetricId} for the given {@link Node} and {@link NodeMetric}. */ - @NonNull - MetricId nodeMetricId(@NonNull Node node, @NonNull NodeMetric metric); + @Nonnull + MetricId nodeMetricId(@Nonnull Node node, @Nonnull NodeMetric metric); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/MetricUpdater.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/MetricUpdater.java index c4b432f3c50..da6bd51076d 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/MetricUpdater.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/MetricUpdater.java @@ -17,8 +17,8 @@ */ package com.datastax.oss.driver.internal.core.metrics; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.concurrent.TimeUnit; +import javax.annotation.Nullable; /** * Note about profiles names: they are included to keep the possibility to break up metrics per diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/TaggingMetricIdGenerator.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/TaggingMetricIdGenerator.java index 393651929c9..cfab12ef74f 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/TaggingMetricIdGenerator.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/metrics/TaggingMetricIdGenerator.java @@ -23,8 +23,8 @@ import com.datastax.oss.driver.api.core.metrics.NodeMetric; import com.datastax.oss.driver.api.core.metrics.SessionMetric; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; +import javax.annotation.Nonnull; /** * A {@link MetricIdGenerator} that generates metric identifiers using a combination of names and @@ -56,16 +56,16 @@ public TaggingMetricIdGenerator(DriverContext context) { nodePrefix = prefix.isEmpty() ? "nodes." : prefix + ".nodes."; } - @NonNull + @Nonnull @Override - public MetricId sessionMetricId(@NonNull SessionMetric metric) { + public MetricId sessionMetricId(@Nonnull SessionMetric metric) { return new DefaultMetricId( sessionPrefix + metric.getPath(), ImmutableMap.of("session", sessionName)); } - @NonNull + @Nonnull @Override - public MetricId nodeMetricId(@NonNull Node node, @NonNull NodeMetric metric) { + public MetricId nodeMetricId(@Nonnull Node node, @Nonnull NodeMetric metric) { return new DefaultMetricId( nodePrefix + metric.getPath(), ImmutableMap.of("session", sessionName, "node", node.getEndPoint().toString())); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/pool/ChannelPool.java b/core/src/main/java/com/datastax/oss/driver/internal/core/pool/ChannelPool.java index 6b7d06045bd..a61f252cb2a 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/pool/ChannelPool.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/pool/ChannelPool.java @@ -45,7 +45,6 @@ import com.datastax.oss.driver.internal.core.util.concurrent.UncaughtExceptions; import com.datastax.oss.driver.shaded.guava.common.annotations.VisibleForTesting; import com.datastax.oss.driver.shaded.guava.common.collect.Sets; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.util.concurrent.EventExecutor; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; @@ -56,6 +55,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.concurrent.atomic.AtomicInteger; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -202,20 +202,20 @@ public void reconnectNow() { RunOrSchedule.on(adminExecutor, singleThreaded::reconnectNow); } - @NonNull + @Nonnull @Override public CompletionStage closeFuture() { return singleThreaded.closeFuture; } - @NonNull + @Nonnull @Override public CompletionStage closeAsync() { RunOrSchedule.on(adminExecutor, singleThreaded::close); return singleThreaded.closeFuture; } - @NonNull + @Nonnull @Override public CompletionStage forceCloseAsync() { RunOrSchedule.on(adminExecutor, singleThreaded::forceClose); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/pool/ChannelSet.java b/core/src/main/java/com/datastax/oss/driver/internal/core/pool/ChannelSet.java index b02e15819d9..26671984507 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/pool/ChannelSet.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/pool/ChannelSet.java @@ -20,10 +20,10 @@ import com.datastax.oss.driver.internal.core.channel.DriverChannel; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; import com.datastax.oss.driver.shaded.guava.common.collect.Iterators; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Arrays; import java.util.Iterator; import java.util.concurrent.locks.ReentrantLock; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -161,7 +161,7 @@ int size() { return this.channels.length; } - @NonNull + @Nonnull @Override public Iterator iterator() { return Iterators.forArray(this.channels); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/ByteBufSegmentBuilder.java b/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/ByteBufSegmentBuilder.java index 9b112559aab..974eb389f36 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/ByteBufSegmentBuilder.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/ByteBufSegmentBuilder.java @@ -23,7 +23,6 @@ import com.datastax.oss.protocol.internal.PrimitiveCodec; import com.datastax.oss.protocol.internal.Segment; import com.datastax.oss.protocol.internal.SegmentBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; @@ -31,6 +30,7 @@ import io.netty.util.concurrent.GenericFutureListener; import java.util.ArrayList; import java.util.List; +import javax.annotation.Nonnull; import net.jcip.annotations.NotThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,18 +44,18 @@ public class ByteBufSegmentBuilder extends SegmentBuilder primitiveCodec, - @NonNull FrameCodec frameCodec, - @NonNull String logPrefix) { + @Nonnull ChannelHandlerContext context, + @Nonnull PrimitiveCodec primitiveCodec, + @Nonnull FrameCodec frameCodec, + @Nonnull String logPrefix) { super(primitiveCodec, frameCodec); this.context = context; this.logPrefix = logPrefix; } @Override - @NonNull - protected ChannelPromise mergeStates(@NonNull List framePromises) { + @Nonnull + protected ChannelPromise mergeStates(@Nonnull List framePromises) { if (framePromises.size() == 1) { return framePromises.get(0); } @@ -80,8 +80,8 @@ protected ChannelPromise mergeStates(@NonNull List framePromises } @Override - @NonNull - protected List splitState(@NonNull ChannelPromise framePromise, int sliceCount) { + @Nonnull + protected List splitState(@Nonnull ChannelPromise framePromise, int sliceCount) { // We split one frame into multiple slices. When all slices are written, the frame is written. List slicePromises = new ArrayList<>(sliceCount); for (int i = 0; i < sliceCount; i++) { @@ -97,12 +97,12 @@ protected List splitState(@NonNull ChannelPromise framePromise, @Override protected void processSegment( - @NonNull Segment segment, @NonNull ChannelPromise segmentPromise) { + @Nonnull Segment segment, @Nonnull ChannelPromise segmentPromise) { context.write(segment, segmentPromise); } @Override - protected void onLargeFrameSplit(@NonNull Frame frame, int frameLength, int sliceCount) { + protected void onLargeFrameSplit(@Nonnull Frame frame, int frameLength, int sliceCount) { LOG.trace( "[{}] Frame {} is too large ({} > {}), splitting into {} segments", logPrefix, @@ -114,7 +114,7 @@ protected void onLargeFrameSplit(@NonNull Frame frame, int frameLength, int slic @Override protected void onSegmentFull( - @NonNull Frame frame, int frameLength, int currentPayloadLength, int currentFrameCount) { + @Nonnull Frame frame, int frameLength, int currentPayloadLength, int currentFrameCount) { LOG.trace( "[{}] Current self-contained segment is full ({}/{} bytes, {} frames), processing now", logPrefix, @@ -125,7 +125,7 @@ protected void onSegmentFull( @Override protected void onSmallFrameAdded( - @NonNull Frame frame, int frameLength, int currentPayloadLength, int currentFrameCount) { + @Nonnull Frame frame, int frameLength, int currentPayloadLength, int currentFrameCount) { LOG.trace( "[{}] Added frame {} to current self-contained segment " + "(bringing it to {}/{} bytes, {} frames)", @@ -156,14 +156,14 @@ static class SliceWriteListener implements GenericFutureListener> { // also runs on the same event loop, so we don't need synchronization. private int remainingSlices; - SliceWriteListener(@NonNull ChannelPromise parentPromise, List slicePromises) { + SliceWriteListener(@Nonnull ChannelPromise parentPromise, List slicePromises) { this.parentPromise = parentPromise; this.slicePromises = slicePromises; this.remainingSlices = slicePromises.size(); } @Override - public void operationComplete(@NonNull Future future) { + public void operationComplete(@Nonnull Future future) { if (!parentPromise.isDone()) { if (future.isSuccess()) { remainingSlices -= 1; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/BytesToSegmentDecoder.java b/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/BytesToSegmentDecoder.java index 03125bd33a5..5db1173d8fc 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/BytesToSegmentDecoder.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/BytesToSegmentDecoder.java @@ -20,11 +20,11 @@ import com.datastax.oss.driver.api.core.connection.CrcMismatchException; import com.datastax.oss.protocol.internal.Segment; import com.datastax.oss.protocol.internal.SegmentCodec; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.LengthFieldBasedFrameDecoder; import java.nio.ByteOrder; +import javax.annotation.Nonnull; import net.jcip.annotations.NotThreadSafe; /** @@ -41,7 +41,7 @@ public class BytesToSegmentDecoder extends LengthFieldBasedFrameDecoder { private final SegmentCodec segmentCodec; private SegmentCodec.Header header; - public BytesToSegmentDecoder(@NonNull SegmentCodec segmentCodec) { + public BytesToSegmentDecoder(@Nonnull SegmentCodec segmentCodec) { super( // max length (Netty wants this to be the overall length including everything): segmentCodec.headerLength() diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/FrameToSegmentEncoder.java b/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/FrameToSegmentEncoder.java index 46c872f4adc..2a8cdd63d87 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/FrameToSegmentEncoder.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/FrameToSegmentEncoder.java @@ -20,11 +20,11 @@ import com.datastax.oss.protocol.internal.Frame; import com.datastax.oss.protocol.internal.FrameCodec; import com.datastax.oss.protocol.internal.PrimitiveCodec; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelOutboundHandlerAdapter; import io.netty.channel.ChannelPromise; +import javax.annotation.Nonnull; import net.jcip.annotations.NotThreadSafe; @NotThreadSafe @@ -37,22 +37,22 @@ public class FrameToSegmentEncoder extends ChannelOutboundHandlerAdapter { private ByteBufSegmentBuilder segmentBuilder; public FrameToSegmentEncoder( - @NonNull PrimitiveCodec primitiveCodec, - @NonNull FrameCodec frameCodec, - @NonNull String logPrefix) { + @Nonnull PrimitiveCodec primitiveCodec, + @Nonnull FrameCodec frameCodec, + @Nonnull String logPrefix) { this.primitiveCodec = primitiveCodec; this.frameCodec = frameCodec; this.logPrefix = logPrefix; } @Override - public void handlerAdded(@NonNull ChannelHandlerContext ctx) { + public void handlerAdded(@Nonnull ChannelHandlerContext ctx) { segmentBuilder = new ByteBufSegmentBuilder(ctx, primitiveCodec, frameCodec, logPrefix); } @Override public void write( - @NonNull ChannelHandlerContext ctx, @NonNull Object msg, @NonNull ChannelPromise promise) + @Nonnull ChannelHandlerContext ctx, @Nonnull Object msg, @Nonnull ChannelPromise promise) throws Exception { if (msg instanceof Frame) { segmentBuilder.addFrame(((Frame) msg), promise); @@ -62,7 +62,7 @@ public void write( } @Override - public void flush(@NonNull ChannelHandlerContext ctx) throws Exception { + public void flush(@Nonnull ChannelHandlerContext ctx) throws Exception { segmentBuilder.flush(); super.flush(ctx); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/SegmentToBytesEncoder.java b/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/SegmentToBytesEncoder.java index c7845545df4..6e78495a545 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/SegmentToBytesEncoder.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/SegmentToBytesEncoder.java @@ -19,12 +19,12 @@ import com.datastax.oss.protocol.internal.Segment; import com.datastax.oss.protocol.internal.SegmentCodec; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageEncoder; import java.util.List; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -33,15 +33,15 @@ public class SegmentToBytesEncoder extends MessageToMessageEncoder segmentCodec; - public SegmentToBytesEncoder(@NonNull SegmentCodec segmentCodec) { + public SegmentToBytesEncoder(@Nonnull SegmentCodec segmentCodec) { this.segmentCodec = segmentCodec; } @Override protected void encode( - @NonNull ChannelHandlerContext ctx, - @NonNull Segment segment, - @NonNull List out) { + @Nonnull ChannelHandlerContext ctx, + @Nonnull Segment segment, + @Nonnull List out) { segmentCodec.encode(segment, out); } } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/SegmentToFrameDecoder.java b/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/SegmentToFrameDecoder.java index b15a17bb87f..73222a6c18e 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/SegmentToFrameDecoder.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/SegmentToFrameDecoder.java @@ -20,7 +20,6 @@ import com.datastax.oss.protocol.internal.Frame; import com.datastax.oss.protocol.internal.FrameCodec; import com.datastax.oss.protocol.internal.Segment; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.CompositeByteBuf; @@ -28,6 +27,7 @@ import io.netty.handler.codec.MessageToMessageDecoder; import java.util.ArrayList; import java.util.List; +import javax.annotation.Nonnull; import net.jcip.annotations.NotThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,16 +51,16 @@ public class SegmentToFrameDecoder extends MessageToMessageDecoder accumulatedSlices = new ArrayList<>(); private int accumulatedLength; - public SegmentToFrameDecoder(@NonNull FrameCodec frameCodec, @NonNull String logPrefix) { + public SegmentToFrameDecoder(@Nonnull FrameCodec frameCodec, @Nonnull String logPrefix) { this.logPrefix = logPrefix; this.frameCodec = frameCodec; } @Override protected void decode( - @NonNull ChannelHandlerContext ctx, - @NonNull Segment segment, - @NonNull List out) { + @Nonnull ChannelHandlerContext ctx, + @Nonnull Segment segment, + @Nonnull List out) { if (segment.isSelfContained) { decodeSelfContained(segment, out); } else { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/retry/ConsistencyDowngradingRetryPolicy.java b/core/src/main/java/com/datastax/oss/driver/internal/core/retry/ConsistencyDowngradingRetryPolicy.java index dbf534459a3..a2b30b7ec53 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/retry/ConsistencyDowngradingRetryPolicy.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/retry/ConsistencyDowngradingRetryPolicy.java @@ -35,7 +35,7 @@ import com.datastax.oss.driver.api.core.servererrors.WriteType; import com.datastax.oss.driver.api.core.session.Request; import com.datastax.oss.driver.shaded.guava.common.annotations.VisibleForTesting; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -128,11 +128,11 @@ public class ConsistencyDowngradingRetryPolicy implements RetryPolicy { @SuppressWarnings("unused") public ConsistencyDowngradingRetryPolicy( - @NonNull DriverContext context, @NonNull String profileName) { + @Nonnull DriverContext context, @Nonnull String profileName) { this(context.getSessionName() + "|" + profileName); } - public ConsistencyDowngradingRetryPolicy(@NonNull String logPrefix) { + public ConsistencyDowngradingRetryPolicy(@Nonnull String logPrefix) { this.logPrefix = logPrefix; } @@ -146,8 +146,8 @@ public ConsistencyDowngradingRetryPolicy(@NonNull String logPrefix) { */ @Override public RetryVerdict onReadTimeoutVerdict( - @NonNull Request request, - @NonNull ConsistencyLevel cl, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, int blockFor, int received, boolean dataPresent, @@ -202,9 +202,9 @@ public RetryVerdict onReadTimeoutVerdict( */ @Override public RetryVerdict onWriteTimeoutVerdict( - @NonNull Request request, - @NonNull ConsistencyLevel cl, - @NonNull WriteType writeType, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, + @Nonnull WriteType writeType, int blockFor, int received, int retryCount) { @@ -246,8 +246,8 @@ public RetryVerdict onWriteTimeoutVerdict( */ @Override public RetryVerdict onUnavailableVerdict( - @NonNull Request request, - @NonNull ConsistencyLevel cl, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, int required, int alive, int retryCount) { @@ -271,7 +271,7 @@ public RetryVerdict onUnavailableVerdict( @Override public RetryVerdict onRequestAbortedVerdict( - @NonNull Request request, @NonNull Throwable error, int retryCount) { + @Nonnull Request request, @Nonnull Throwable error, int retryCount) { RetryVerdict verdict = error instanceof ClosedConnectionException || error instanceof HeartbeatException ? RetryVerdict.RETRY_NEXT @@ -290,7 +290,7 @@ public RetryVerdict onRequestAbortedVerdict( @Override public RetryVerdict onErrorResponseVerdict( - @NonNull Request request, @NonNull CoordinatorException error, int retryCount) { + @Nonnull Request request, @Nonnull CoordinatorException error, int retryCount) { RetryVerdict verdict = error instanceof WriteFailureException || error instanceof ReadFailureException ? RetryVerdict.RETHROW @@ -310,8 +310,8 @@ public RetryVerdict onErrorResponseVerdict( @Override @Deprecated public RetryDecision onReadTimeout( - @NonNull Request request, - @NonNull ConsistencyLevel cl, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, int blockFor, int received, boolean dataPresent, @@ -322,9 +322,9 @@ public RetryDecision onReadTimeout( @Override @Deprecated public RetryDecision onWriteTimeout( - @NonNull Request request, - @NonNull ConsistencyLevel cl, - @NonNull WriteType writeType, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, + @Nonnull WriteType writeType, int blockFor, int received, int retryCount) { @@ -334,8 +334,8 @@ public RetryDecision onWriteTimeout( @Override @Deprecated public RetryDecision onUnavailable( - @NonNull Request request, - @NonNull ConsistencyLevel cl, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, int required, int alive, int retryCount) { @@ -345,14 +345,14 @@ public RetryDecision onUnavailable( @Override @Deprecated public RetryDecision onRequestAborted( - @NonNull Request request, @NonNull Throwable error, int retryCount) { + @Nonnull Request request, @Nonnull Throwable error, int retryCount) { throw new UnsupportedOperationException("onRequestAborted"); } @Override @Deprecated public RetryDecision onErrorResponse( - @NonNull Request request, @NonNull CoordinatorException error, int retryCount) { + @Nonnull Request request, @Nonnull CoordinatorException error, int retryCount) { throw new UnsupportedOperationException("onErrorResponse"); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/retry/ConsistencyDowngradingRetryVerdict.java b/core/src/main/java/com/datastax/oss/driver/internal/core/retry/ConsistencyDowngradingRetryVerdict.java index d78f80c7354..148828ab677 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/retry/ConsistencyDowngradingRetryVerdict.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/retry/ConsistencyDowngradingRetryVerdict.java @@ -22,25 +22,25 @@ import com.datastax.oss.driver.api.core.retry.RetryDecision; import com.datastax.oss.driver.api.core.retry.RetryVerdict; import com.datastax.oss.driver.api.core.session.Request; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public class ConsistencyDowngradingRetryVerdict implements RetryVerdict { private final ConsistencyLevel consistencyLevel; - public ConsistencyDowngradingRetryVerdict(@NonNull ConsistencyLevel consistencyLevel) { + public ConsistencyDowngradingRetryVerdict(@Nonnull ConsistencyLevel consistencyLevel) { this.consistencyLevel = consistencyLevel; } - @NonNull + @Nonnull @Override public RetryDecision getRetryDecision() { return RetryDecision.RETRY_SAME; } - @NonNull + @Nonnull @Override - public RequestT getRetryRequest(@NonNull RequestT previous) { + public RequestT getRetryRequest(@Nonnull RequestT previous) { if (previous instanceof Statement) { Statement statement = (Statement) previous; @SuppressWarnings("unchecked") diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/retry/DefaultRetryPolicy.java b/core/src/main/java/com/datastax/oss/driver/internal/core/retry/DefaultRetryPolicy.java index 8cea1a564b5..79fbcde558f 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/retry/DefaultRetryPolicy.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/retry/DefaultRetryPolicy.java @@ -30,7 +30,7 @@ import com.datastax.oss.driver.api.core.servererrors.WriteType; import com.datastax.oss.driver.api.core.session.Request; import com.datastax.oss.driver.shaded.guava.common.annotations.VisibleForTesting; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -104,8 +104,8 @@ public DefaultRetryPolicy(DriverContext context, String profileName) { @Override @Deprecated public RetryDecision onReadTimeout( - @NonNull Request request, - @NonNull ConsistencyLevel cl, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, int blockFor, int received, boolean dataPresent, @@ -138,9 +138,9 @@ public RetryDecision onReadTimeout( @Override @Deprecated public RetryDecision onWriteTimeout( - @NonNull Request request, - @NonNull ConsistencyLevel cl, - @NonNull WriteType writeType, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, + @Nonnull WriteType writeType, int blockFor, int received, int retryCount) { @@ -171,8 +171,8 @@ public RetryDecision onWriteTimeout( @Override @Deprecated public RetryDecision onUnavailable( - @NonNull Request request, - @NonNull ConsistencyLevel cl, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, int required, int alive, int retryCount) { @@ -195,7 +195,7 @@ public RetryDecision onUnavailable( @Override @Deprecated public RetryDecision onRequestAborted( - @NonNull Request request, @NonNull Throwable error, int retryCount) { + @Nonnull Request request, @Nonnull Throwable error, int retryCount) { RetryDecision decision = (error instanceof ClosedConnectionException || error instanceof HeartbeatException) @@ -218,7 +218,7 @@ public RetryDecision onRequestAborted( @Override @Deprecated public RetryDecision onErrorResponse( - @NonNull Request request, @NonNull CoordinatorException error, int retryCount) { + @Nonnull Request request, @Nonnull CoordinatorException error, int retryCount) { RetryDecision decision = (error instanceof ReadFailureException || error instanceof WriteFailureException) diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/retry/DefaultRetryVerdict.java b/core/src/main/java/com/datastax/oss/driver/internal/core/retry/DefaultRetryVerdict.java index e74651e30de..c2860132741 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/retry/DefaultRetryVerdict.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/retry/DefaultRetryVerdict.java @@ -19,17 +19,17 @@ import com.datastax.oss.driver.api.core.retry.RetryDecision; import com.datastax.oss.driver.api.core.retry.RetryVerdict; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public class DefaultRetryVerdict implements RetryVerdict { private final RetryDecision decision; - public DefaultRetryVerdict(@NonNull RetryDecision decision) { + public DefaultRetryVerdict(@Nonnull RetryDecision decision) { this.decision = decision; } - @NonNull + @Nonnull @Override public RetryDecision getRetryDecision() { return decision; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/session/DefaultSession.java b/core/src/main/java/com/datastax/oss/driver/internal/core/session/DefaultSession.java index af9dc183f7e..dc6e5f4ff14 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/session/DefaultSession.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/session/DefaultSession.java @@ -44,8 +44,6 @@ import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures; import com.datastax.oss.driver.internal.core.util.concurrent.RunOrSchedule; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import io.netty.util.concurrent.EventExecutor; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -59,6 +57,8 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -149,13 +149,13 @@ private CompletionStage init(CqlIdentifier keyspace) { return singleThreaded.initFuture; } - @NonNull + @Nonnull @Override public String getName() { return context.getSessionName(); } - @NonNull + @Nonnull @Override public Metadata getMetadata() { return metadataManager.getMetadata(); @@ -166,13 +166,13 @@ public boolean isSchemaMetadataEnabled() { return metadataManager.isSchemaEnabled(); } - @NonNull + @Nonnull @Override public CompletionStage setSchemaMetadataEnabled(@Nullable Boolean newValue) { return metadataManager.setSchemaEnabled(newValue); } - @NonNull + @Nonnull @Override public CompletionStage refreshSchemaAsync() { return metadataManager @@ -180,25 +180,25 @@ public CompletionStage refreshSchemaAsync() { .thenApply(RefreshSchemaResult::getMetadata); } - @NonNull + @Nonnull @Override public CompletionStage checkSchemaAgreementAsync() { return context.getTopologyMonitor().checkSchemaAgreement(); } - @NonNull + @Nonnull @Override public DriverContext getContext() { return context; } - @NonNull + @Nonnull @Override public Optional getKeyspace() { return Optional.ofNullable(poolManager.getKeyspace()); } - @NonNull + @Nonnull @Override public Optional getMetrics() { return context.getMetricsFactory().getMetrics(); @@ -211,12 +211,12 @@ public Optional getMetrics() { * session. Calling it from anywhere else is highly discouraged, as an invalid keyspace would * wreak havoc (close all connections and make the session unusable). */ - @NonNull - public CompletionStage setKeyspace(@NonNull CqlIdentifier newKeyspace) { + @Nonnull + public CompletionStage setKeyspace(@Nonnull CqlIdentifier newKeyspace) { return poolManager.setKeyspace(newKeyspace); } - @NonNull + @Nonnull public Map getPools() { return poolManager.getPools(); } @@ -224,7 +224,7 @@ public Map getPools() { @Nullable @Override public ResultT execute( - @NonNull RequestT request, @NonNull GenericType resultType) { + @Nonnull RequestT request, @Nonnull GenericType resultType) { RequestProcessor processor = processorRegistry.processorFor(request, resultType); return isClosed() @@ -233,7 +233,7 @@ public ResultT execute( } @Nullable - public DriverChannel getChannel(@NonNull Node node, @NonNull String logPrefix) { + public DriverChannel getChannel(@Nonnull Node node, @Nonnull String logPrefix) { ChannelPool pool = poolManager.getPools().get(node); if (pool == null) { LOG.trace("[{}] No pool to {}, skipping", logPrefix, node); @@ -252,29 +252,29 @@ public DriverChannel getChannel(@NonNull Node node, @NonNull String logPrefix) { } } - @NonNull + @Nonnull public ConcurrentMap getRepreparePayloads() { return poolManager.getRepreparePayloads(); } - @NonNull + @Nonnull public SessionMetricUpdater getMetricUpdater() { return metricUpdater; } - @NonNull + @Nonnull @Override public CompletionStage closeFuture() { return singleThreaded.closeFuture; } - @NonNull + @Nonnull @Override public CompletionStage closeAsync() { return closeSafely(singleThreaded::close); } - @NonNull + @Nonnull @Override public CompletionStage forceCloseAsync() { return closeSafely(singleThreaded::forceClose); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/session/PoolManager.java b/core/src/main/java/com/datastax/oss/driver/internal/core/session/PoolManager.java index 661be017461..6c402de2eb4 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/session/PoolManager.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/session/PoolManager.java @@ -39,7 +39,6 @@ import com.datastax.oss.driver.internal.core.util.concurrent.UncaughtExceptions; import com.datastax.oss.driver.shaded.guava.common.collect.Lists; import com.datastax.oss.driver.shaded.guava.common.collect.MapMaker; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.util.concurrent.EventExecutor; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -53,6 +52,7 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -144,20 +144,20 @@ public ConcurrentMap getRepreparePayloads() { return repreparePayloads; } - @NonNull + @Nonnull @Override public CompletionStage closeFuture() { return singleThreaded.closeFuture; } - @NonNull + @Nonnull @Override public CompletionStage closeAsync() { RunOrSchedule.on(adminExecutor, singleThreaded::close); return singleThreaded.closeFuture; } - @NonNull + @Nonnull @Override public CompletionStage forceCloseAsync() { RunOrSchedule.on(adminExecutor, singleThreaded::forceClose); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/session/SessionWrapper.java b/core/src/main/java/com/datastax/oss/driver/internal/core/session/SessionWrapper.java index 1a1270b41c8..4a31ed4773b 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/session/SessionWrapper.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/session/SessionWrapper.java @@ -24,10 +24,10 @@ import com.datastax.oss.driver.api.core.session.Request; import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Optional; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; /** @@ -48,22 +48,22 @@ public class SessionWrapper implements Session { private final Session delegate; - public SessionWrapper(@NonNull Session delegate) { + public SessionWrapper(@Nonnull Session delegate) { this.delegate = delegate; } - @NonNull + @Nonnull public Session getDelegate() { return delegate; } - @NonNull + @Nonnull @Override public String getName() { return delegate.getName(); } - @NonNull + @Nonnull @Override public Metadata getMetadata() { return delegate.getMetadata(); @@ -74,37 +74,37 @@ public boolean isSchemaMetadataEnabled() { return delegate.isSchemaMetadataEnabled(); } - @NonNull + @Nonnull @Override public CompletionStage setSchemaMetadataEnabled(@Nullable Boolean newValue) { return delegate.setSchemaMetadataEnabled(newValue); } - @NonNull + @Nonnull @Override public CompletionStage refreshSchemaAsync() { return delegate.refreshSchemaAsync(); } - @NonNull + @Nonnull @Override public CompletionStage checkSchemaAgreementAsync() { return delegate.checkSchemaAgreementAsync(); } - @NonNull + @Nonnull @Override public DriverContext getContext() { return delegate.getContext(); } - @NonNull + @Nonnull @Override public Optional getKeyspace() { return delegate.getKeyspace(); } - @NonNull + @Nonnull @Override public Optional getMetrics() { return delegate.getMetrics(); @@ -113,23 +113,23 @@ public Optional getMetrics() { @Nullable @Override public ResultT execute( - @NonNull RequestT request, @NonNull GenericType resultType) { + @Nonnull RequestT request, @Nonnull GenericType resultType) { return delegate.execute(request, resultType); } - @NonNull + @Nonnull @Override public CompletionStage closeFuture() { return delegate.closeFuture(); } - @NonNull + @Nonnull @Override public CompletionStage closeAsync() { return delegate.closeAsync(); } - @NonNull + @Nonnull @Override public CompletionStage forceCloseAsync() { return delegate.forceCloseAsync(); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/session/throttling/ConcurrencyLimitingRequestThrottler.java b/core/src/main/java/com/datastax/oss/driver/internal/core/session/throttling/ConcurrencyLimitingRequestThrottler.java index e8f27467c6f..7bfca6a1f3b 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/session/throttling/ConcurrencyLimitingRequestThrottler.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/session/throttling/ConcurrencyLimitingRequestThrottler.java @@ -24,10 +24,10 @@ import com.datastax.oss.driver.api.core.session.throttling.RequestThrottler; import com.datastax.oss.driver.api.core.session.throttling.Throttled; import com.datastax.oss.driver.shaded.guava.common.annotations.VisibleForTesting; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayDeque; import java.util.Deque; import java.util.concurrent.locks.ReentrantLock; +import javax.annotation.Nonnull; import net.jcip.annotations.GuardedBy; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; @@ -86,7 +86,7 @@ public ConcurrencyLimitingRequestThrottler(DriverContext context) { } @Override - public void register(@NonNull Throttled request) { + public void register(@Nonnull Throttled request) { lock.lock(); try { if (closed) { @@ -115,7 +115,7 @@ public void register(@NonNull Throttled request) { } @Override - public void signalSuccess(@NonNull Throttled request) { + public void signalSuccess(@Nonnull Throttled request) { lock.lock(); try { onRequestDone(); @@ -125,12 +125,12 @@ public void signalSuccess(@NonNull Throttled request) { } @Override - public void signalError(@NonNull Throttled request, @NonNull Throwable error) { + public void signalError(@Nonnull Throttled request, @Nonnull Throwable error) { signalSuccess(request); // not treated differently } @Override - public void signalTimeout(@NonNull Throttled request) { + public void signalTimeout(@Nonnull Throttled request) { lock.lock(); try { if (!closed) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/session/throttling/PassThroughRequestThrottler.java b/core/src/main/java/com/datastax/oss/driver/internal/core/session/throttling/PassThroughRequestThrottler.java index 714c712a4e8..bfd27235a0d 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/session/throttling/PassThroughRequestThrottler.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/session/throttling/PassThroughRequestThrottler.java @@ -20,8 +20,8 @@ import com.datastax.oss.driver.api.core.context.DriverContext; import com.datastax.oss.driver.api.core.session.throttling.RequestThrottler; import com.datastax.oss.driver.api.core.session.throttling.Throttled; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; /** @@ -50,22 +50,22 @@ public PassThroughRequestThrottler(DriverContext context) { } @Override - public void register(@NonNull Throttled request) { + public void register(@Nonnull Throttled request) { request.onThrottleReady(false); } @Override - public void signalSuccess(@NonNull Throttled request) { + public void signalSuccess(@Nonnull Throttled request) { // nothing to do } @Override - public void signalError(@NonNull Throttled request, @NonNull Throwable error) { + public void signalError(@Nonnull Throttled request, @Nonnull Throwable error) { // nothing to do } @Override - public void signalTimeout(@NonNull Throttled request) { + public void signalTimeout(@Nonnull Throttled request) { // nothing to do } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/session/throttling/RateLimitingRequestThrottler.java b/core/src/main/java/com/datastax/oss/driver/internal/core/session/throttling/RateLimitingRequestThrottler.java index 6536804ffee..f174bddf04c 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/session/throttling/RateLimitingRequestThrottler.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/session/throttling/RateLimitingRequestThrottler.java @@ -25,13 +25,13 @@ import com.datastax.oss.driver.api.core.session.throttling.Throttled; import com.datastax.oss.driver.internal.core.context.InternalDriverContext; import com.datastax.oss.driver.shaded.guava.common.annotations.VisibleForTesting; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.util.concurrent.EventExecutor; import java.time.Duration; import java.util.ArrayDeque; import java.util.Deque; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; +import javax.annotation.Nonnull; import net.jcip.annotations.GuardedBy; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; @@ -117,7 +117,7 @@ public RateLimitingRequestThrottler(DriverContext context) { } @Override - public void register(@NonNull Throttled request) { + public void register(@Nonnull Throttled request) { long now = clock.nanoTime(); lock.lock(); try { @@ -177,17 +177,17 @@ private void drain() { } @Override - public void signalSuccess(@NonNull Throttled request) { + public void signalSuccess(@Nonnull Throttled request) { // nothing to do } @Override - public void signalError(@NonNull Throttled request, @NonNull Throwable error) { + public void signalError(@Nonnull Throttled request, @Nonnull Throwable error) { // nothing to do } @Override - public void signalTimeout(@NonNull Throttled request) { + public void signalTimeout(@Nonnull Throttled request) { lock.lock(); try { if (!closed && queue.remove(request)) { // The request timed out before it was active diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/specex/ConstantSpeculativeExecutionPolicy.java b/core/src/main/java/com/datastax/oss/driver/internal/core/specex/ConstantSpeculativeExecutionPolicy.java index 5e84f6b1002..48fd40d71a1 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/specex/ConstantSpeculativeExecutionPolicy.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/specex/ConstantSpeculativeExecutionPolicy.java @@ -24,8 +24,8 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.session.Request; import com.datastax.oss.driver.api.core.specex.SpeculativeExecutionPolicy; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; /** @@ -68,9 +68,9 @@ public ConstantSpeculativeExecutionPolicy(DriverContext context, String profileN @Override public long nextExecution( - @NonNull @SuppressWarnings("unused") Node node, + @Nonnull @SuppressWarnings("unused") Node node, @Nullable @SuppressWarnings("unused") CqlIdentifier keyspace, - @NonNull @SuppressWarnings("unused") Request request, + @Nonnull @SuppressWarnings("unused") Request request, int runningExecutions) { assert runningExecutions >= 1; return (runningExecutions < maxExecutions) ? constantDelayMillis : -1; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/specex/NoSpeculativeExecutionPolicy.java b/core/src/main/java/com/datastax/oss/driver/internal/core/specex/NoSpeculativeExecutionPolicy.java index 2f6b17286e5..373e672e591 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/specex/NoSpeculativeExecutionPolicy.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/specex/NoSpeculativeExecutionPolicy.java @@ -22,8 +22,8 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.session.Request; import com.datastax.oss.driver.api.core.specex.SpeculativeExecutionPolicy; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; /** @@ -54,9 +54,9 @@ public NoSpeculativeExecutionPolicy( @Override @SuppressWarnings("unused") public long nextExecution( - @NonNull Node node, + @Nonnull Node node, @Nullable CqlIdentifier keyspace, - @NonNull Request request, + @Nonnull Request request, int runningExecutions) { // never start speculative executions return -1; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/ssl/DefaultSslEngineFactory.java b/core/src/main/java/com/datastax/oss/driver/internal/core/ssl/DefaultSslEngineFactory.java index 085b36dc539..6835776ba2a 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/ssl/DefaultSslEngineFactory.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/ssl/DefaultSslEngineFactory.java @@ -22,7 +22,6 @@ import com.datastax.oss.driver.api.core.context.DriverContext; import com.datastax.oss.driver.api.core.metadata.EndPoint; import com.datastax.oss.driver.api.core.ssl.SslEngineFactory; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.InputStream; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -31,6 +30,7 @@ import java.security.KeyStore; import java.security.SecureRandom; import java.util.List; +import javax.annotation.Nonnull; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; @@ -86,9 +86,9 @@ public DefaultSslEngineFactory(DriverContext driverContext) { config.getBoolean(DefaultDriverOption.SSL_HOSTNAME_VALIDATION, true); } - @NonNull + @Nonnull @Override - public SSLEngine newSslEngine(@NonNull EndPoint remoteEndpoint) { + public SSLEngine newSslEngine(@Nonnull EndPoint remoteEndpoint) { SSLEngine engine; SocketAddress remoteAddress = remoteEndpoint.resolve(); if (remoteAddress instanceof InetSocketAddress) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/ssl/SniSslEngineFactory.java b/core/src/main/java/com/datastax/oss/driver/internal/core/ssl/SniSslEngineFactory.java index 98af19045dc..7c2748b138a 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/ssl/SniSslEngineFactory.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/ssl/SniSslEngineFactory.java @@ -22,9 +22,9 @@ import com.datastax.oss.driver.api.core.ssl.SslEngineFactory; import com.datastax.oss.driver.internal.core.metadata.SniEndPoint; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; import java.net.InetSocketAddress; import java.util.concurrent.CopyOnWriteArrayList; +import javax.annotation.Nonnull; import javax.net.ssl.SNIHostName; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; @@ -43,9 +43,9 @@ public SniSslEngineFactory(SSLContext sslContext) { this.sslContext = sslContext; } - @NonNull + @Nonnull @Override - public SSLEngine newSslEngine(@NonNull EndPoint remoteEndpoint) { + public SSLEngine newSslEngine(@Nonnull EndPoint remoteEndpoint) { if (!(remoteEndpoint instanceof SniEndPoint)) { throw new IllegalArgumentException( String.format( diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/tracker/MultiplexingRequestTracker.java b/core/src/main/java/com/datastax/oss/driver/internal/core/tracker/MultiplexingRequestTracker.java index d4d20f3eb78..4fcd45178e1 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/tracker/MultiplexingRequestTracker.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/tracker/MultiplexingRequestTracker.java @@ -23,14 +23,14 @@ import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.api.core.tracker.RequestTracker; import com.datastax.oss.driver.internal.core.util.Loggers; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Objects; import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Consumer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,17 +72,17 @@ private void addTracker(RequestTracker toAdd) { } } - public void register(@NonNull RequestTracker tracker) { + public void register(@Nonnull RequestTracker tracker) { addTracker(tracker); } @Override public void onSuccess( - @NonNull Request request, + @Nonnull Request request, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, - @NonNull Node node, - @NonNull String logPrefix) { + @Nonnull DriverExecutionProfile executionProfile, + @Nonnull Node node, + @Nonnull String logPrefix) { invokeTrackers( tracker -> tracker.onSuccess(request, latencyNanos, executionProfile, node, logPrefix), logPrefix, @@ -91,12 +91,12 @@ public void onSuccess( @Override public void onError( - @NonNull Request request, - @NonNull Throwable error, + @Nonnull Request request, + @Nonnull Throwable error, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, + @Nonnull DriverExecutionProfile executionProfile, @Nullable Node node, - @NonNull String logPrefix) { + @Nonnull String logPrefix) { invokeTrackers( tracker -> tracker.onError(request, error, latencyNanos, executionProfile, node, logPrefix), logPrefix, @@ -105,11 +105,11 @@ public void onError( @Override public void onNodeSuccess( - @NonNull Request request, + @Nonnull Request request, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, - @NonNull Node node, - @NonNull String logPrefix) { + @Nonnull DriverExecutionProfile executionProfile, + @Nonnull Node node, + @Nonnull String logPrefix) { invokeTrackers( tracker -> tracker.onNodeSuccess(request, latencyNanos, executionProfile, node, logPrefix), logPrefix, @@ -118,12 +118,12 @@ public void onNodeSuccess( @Override public void onNodeError( - @NonNull Request request, - @NonNull Throwable error, + @Nonnull Request request, + @Nonnull Throwable error, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, - @NonNull Node node, - @NonNull String logPrefix) { + @Nonnull DriverExecutionProfile executionProfile, + @Nonnull Node node, + @Nonnull String logPrefix) { invokeTrackers( tracker -> tracker.onNodeError(request, error, latencyNanos, executionProfile, node, logPrefix), @@ -132,7 +132,7 @@ public void onNodeError( } @Override - public void onSessionReady(@NonNull Session session) { + public void onSessionReady(@Nonnull Session session) { invokeTrackers(tracker -> tracker.onSessionReady(session), session.getName(), "onSessionReady"); } @@ -149,7 +149,7 @@ public void close() throws Exception { } private void invokeTrackers( - @NonNull Consumer action, String logPrefix, String event) { + @Nonnull Consumer action, String logPrefix, String event) { for (RequestTracker tracker : trackers) { try { action.accept(tracker); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/tracker/NoopRequestTracker.java b/core/src/main/java/com/datastax/oss/driver/internal/core/tracker/NoopRequestTracker.java index 09ac27e5e75..33e9f0dfb05 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/tracker/NoopRequestTracker.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/tracker/NoopRequestTracker.java @@ -22,7 +22,7 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.session.Request; import com.datastax.oss.driver.api.core.tracker.RequestTracker; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; /** @@ -38,43 +38,43 @@ public NoopRequestTracker(@SuppressWarnings("unused") DriverContext context) { @Override public void onSuccess( - @NonNull Request request, + @Nonnull Request request, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, - @NonNull Node node, - @NonNull String requestPrefix) { + @Nonnull DriverExecutionProfile executionProfile, + @Nonnull Node node, + @Nonnull String requestPrefix) { // nothing to do } @Override public void onError( - @NonNull Request request, - @NonNull Throwable error, + @Nonnull Request request, + @Nonnull Throwable error, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, + @Nonnull DriverExecutionProfile executionProfile, Node node, - @NonNull String requestPrefix) { + @Nonnull String requestPrefix) { // nothing to do } @Override public void onNodeError( - @NonNull Request request, - @NonNull Throwable error, + @Nonnull Request request, + @Nonnull Throwable error, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, - @NonNull Node node, - @NonNull String requestPrefix) { + @Nonnull DriverExecutionProfile executionProfile, + @Nonnull Node node, + @Nonnull String requestPrefix) { // nothing to do } @Override public void onNodeSuccess( - @NonNull Request request, + @Nonnull Request request, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, - @NonNull Node node, - @NonNull String requestPrefix) { + @Nonnull DriverExecutionProfile executionProfile, + @Nonnull Node node, + @Nonnull String requestPrefix) { // nothing to do } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/tracker/RequestLogger.java b/core/src/main/java/com/datastax/oss/driver/internal/core/tracker/RequestLogger.java index 235ef051b40..ef67ec5a967 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/tracker/RequestLogger.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/tracker/RequestLogger.java @@ -24,8 +24,8 @@ import com.datastax.oss.driver.api.core.session.Request; import com.datastax.oss.driver.api.core.session.SessionBuilder; import com.datastax.oss.driver.api.core.tracker.RequestTracker; -import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -82,11 +82,11 @@ protected RequestLogger(RequestLogFormatter formatter) { @Override public void onSuccess( - @NonNull Request request, + @Nonnull Request request, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, - @NonNull Node node, - @NonNull String logPrefix) { + @Nonnull DriverExecutionProfile executionProfile, + @Nonnull Node node, + @Nonnull String logPrefix) { boolean successEnabled = executionProfile.getBoolean(DefaultDriverOption.REQUEST_LOGGER_SUCCESS_ENABLED, false); @@ -134,12 +134,12 @@ public void onSuccess( @Override public void onError( - @NonNull Request request, - @NonNull Throwable error, + @Nonnull Request request, + @Nonnull Throwable error, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, + @Nonnull DriverExecutionProfile executionProfile, Node node, - @NonNull String logPrefix) { + @Nonnull String logPrefix) { if (!executionProfile.getBoolean(DefaultDriverOption.REQUEST_LOGGER_ERROR_ENABLED, false)) { return; @@ -178,22 +178,22 @@ public void onError( @Override public void onNodeError( - @NonNull Request request, - @NonNull Throwable error, + @Nonnull Request request, + @Nonnull Throwable error, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, - @NonNull Node node, - @NonNull String logPrefix) { + @Nonnull DriverExecutionProfile executionProfile, + @Nonnull Node node, + @Nonnull String logPrefix) { // Nothing to do } @Override public void onNodeSuccess( - @NonNull Request request, + @Nonnull Request request, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, - @NonNull Node node, - @NonNull String logPrefix) { + @Nonnull DriverExecutionProfile executionProfile, + @Nonnull Node node, + @Nonnull String logPrefix) { // Nothing to do } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultCustomType.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultCustomType.java index 7b9e03818ac..c79cc2628ec 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultCustomType.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultCustomType.java @@ -20,10 +20,10 @@ import com.datastax.oss.driver.api.core.detach.AttachmentPoint; import com.datastax.oss.driver.api.core.type.CustomType; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.io.ObjectInputStream; import java.io.Serializable; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -34,12 +34,12 @@ public class DefaultCustomType implements CustomType, Serializable { /** @serial */ private final String className; - public DefaultCustomType(@NonNull String className) { + public DefaultCustomType(@Nonnull String className) { Preconditions.checkNotNull(className); this.className = className; } - @NonNull + @Nonnull @Override public String getClassName() { return className; @@ -51,7 +51,7 @@ public boolean isDetached() { } @Override - public void attach(@NonNull AttachmentPoint attachmentPoint) { + public void attach(@Nonnull AttachmentPoint attachmentPoint) { // nothing to do } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultListType.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultListType.java index 6c21b44639e..41c631adb58 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultListType.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultListType.java @@ -21,11 +21,11 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.ListType; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.io.ObjectInputStream; import java.io.Serializable; import java.util.Objects; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -38,13 +38,13 @@ public class DefaultListType implements ListType, Serializable { /** @serial */ private final boolean frozen; - public DefaultListType(@NonNull DataType elementType, boolean frozen) { + public DefaultListType(@Nonnull DataType elementType, boolean frozen) { Preconditions.checkNotNull(elementType); this.elementType = elementType; this.frozen = frozen; } - @NonNull + @Nonnull @Override public DataType getElementType() { return elementType; @@ -61,7 +61,7 @@ public boolean isDetached() { } @Override - public void attach(@NonNull AttachmentPoint attachmentPoint) { + public void attach(@Nonnull AttachmentPoint attachmentPoint) { elementType.attach(attachmentPoint); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultMapType.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultMapType.java index 8da9f196f26..8fbe7ec4fab 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultMapType.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultMapType.java @@ -21,11 +21,11 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.MapType; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.io.ObjectInputStream; import java.io.Serializable; import java.util.Objects; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -40,7 +40,7 @@ public class DefaultMapType implements MapType, Serializable { /** @serial */ private final boolean frozen; - public DefaultMapType(@NonNull DataType keyType, @NonNull DataType valueType, boolean frozen) { + public DefaultMapType(@Nonnull DataType keyType, @Nonnull DataType valueType, boolean frozen) { Preconditions.checkNotNull(keyType); Preconditions.checkNotNull(valueType); this.keyType = keyType; @@ -48,13 +48,13 @@ public DefaultMapType(@NonNull DataType keyType, @NonNull DataType valueType, bo this.frozen = frozen; } - @NonNull + @Nonnull @Override public DataType getKeyType() { return keyType; } - @NonNull + @Nonnull @Override public DataType getValueType() { return valueType; @@ -71,7 +71,7 @@ public boolean isDetached() { } @Override - public void attach(@NonNull AttachmentPoint attachmentPoint) { + public void attach(@Nonnull AttachmentPoint attachmentPoint) { keyType.attach(attachmentPoint); valueType.attach(attachmentPoint); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultSetType.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultSetType.java index 27641731c72..5adc848d65d 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultSetType.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultSetType.java @@ -21,11 +21,11 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.SetType; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.io.ObjectInputStream; import java.io.Serializable; import java.util.Objects; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -38,13 +38,13 @@ public class DefaultSetType implements SetType, Serializable { /** @serial */ private final boolean frozen; - public DefaultSetType(@NonNull DataType elementType, boolean frozen) { + public DefaultSetType(@Nonnull DataType elementType, boolean frozen) { Preconditions.checkNotNull(elementType); this.elementType = elementType; this.frozen = frozen; } - @NonNull + @Nonnull @Override public DataType getElementType() { return elementType; @@ -61,7 +61,7 @@ public boolean isDetached() { } @Override - public void attach(@NonNull AttachmentPoint attachmentPoint) { + public void attach(@Nonnull AttachmentPoint attachmentPoint) { elementType.attach(attachmentPoint); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultTupleType.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultTupleType.java index 29b1b20436f..f551dd1d3d1 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultTupleType.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultTupleType.java @@ -25,11 +25,11 @@ import com.datastax.oss.driver.shaded.guava.common.base.Joiner; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.io.ObjectInputStream; import java.io.Serializable; import java.util.List; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -43,31 +43,31 @@ public class DefaultTupleType implements TupleType, Serializable { private transient volatile AttachmentPoint attachmentPoint; public DefaultTupleType( - @NonNull List componentTypes, @NonNull AttachmentPoint attachmentPoint) { + @Nonnull List componentTypes, @Nonnull AttachmentPoint attachmentPoint) { Preconditions.checkNotNull(componentTypes); this.componentTypes = ImmutableList.copyOf(componentTypes); this.attachmentPoint = attachmentPoint; } - public DefaultTupleType(@NonNull List componentTypes) { + public DefaultTupleType(@Nonnull List componentTypes) { this(componentTypes, AttachmentPoint.NONE); } - @NonNull + @Nonnull @Override public List getComponentTypes() { return componentTypes; } - @NonNull + @Nonnull @Override public TupleValue newValue() { return new DefaultTupleValue(this); } - @NonNull + @Nonnull @Override - public TupleValue newValue(@NonNull Object... values) { + public TupleValue newValue(@Nonnull Object... values) { return new DefaultTupleValue(this, values); } @@ -77,14 +77,14 @@ public boolean isDetached() { } @Override - public void attach(@NonNull AttachmentPoint attachmentPoint) { + public void attach(@Nonnull AttachmentPoint attachmentPoint) { this.attachmentPoint = attachmentPoint; for (DataType componentType : componentTypes) { componentType.attach(attachmentPoint); } } - @NonNull + @Nonnull @Override public AttachmentPoint getAttachmentPoint() { return attachmentPoint; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultUserDefinedType.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultUserDefinedType.java index 6b1431dc699..0f87c718eb8 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultUserDefinedType.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultUserDefinedType.java @@ -26,12 +26,12 @@ import com.datastax.oss.driver.internal.core.data.IdentifierIndex; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.io.ObjectInputStream; import java.io.Serializable; import java.util.List; import java.util.Objects; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -56,12 +56,12 @@ public class DefaultUserDefinedType implements UserDefinedType, Serializable { private transient volatile AttachmentPoint attachmentPoint; public DefaultUserDefinedType( - @NonNull CqlIdentifier keyspace, - @NonNull CqlIdentifier name, + @Nonnull CqlIdentifier keyspace, + @Nonnull CqlIdentifier name, boolean frozen, List fieldNames, - @NonNull List fieldTypes, - @NonNull AttachmentPoint attachmentPoint) { + @Nonnull List fieldTypes, + @Nonnull AttachmentPoint attachmentPoint) { Preconditions.checkNotNull(keyspace); Preconditions.checkNotNull(name); Preconditions.checkNotNull(fieldNames); @@ -80,21 +80,21 @@ public DefaultUserDefinedType( } public DefaultUserDefinedType( - @NonNull CqlIdentifier keyspace, - @NonNull CqlIdentifier name, + @Nonnull CqlIdentifier keyspace, + @Nonnull CqlIdentifier name, boolean frozen, - @NonNull List fieldNames, - @NonNull List fieldTypes) { + @Nonnull List fieldNames, + @Nonnull List fieldTypes) { this(keyspace, name, frozen, fieldNames, fieldTypes, AttachmentPoint.NONE); } - @NonNull + @Nonnull @Override public CqlIdentifier getKeyspace() { return keyspace; } - @NonNull + @Nonnull @Override public CqlIdentifier getName() { return name; @@ -105,41 +105,41 @@ public boolean isFrozen() { return frozen; } - @NonNull + @Nonnull @Override public List getFieldNames() { return fieldNames; } - @NonNull + @Nonnull @Override - public List allIndicesOf(@NonNull CqlIdentifier id) { + public List allIndicesOf(@Nonnull CqlIdentifier id) { return index.allIndicesOf(id); } @Override - public int firstIndexOf(@NonNull CqlIdentifier id) { + public int firstIndexOf(@Nonnull CqlIdentifier id) { return index.firstIndexOf(id); } - @NonNull + @Nonnull @Override - public List allIndicesOf(@NonNull String name) { + public List allIndicesOf(@Nonnull String name) { return index.allIndicesOf(name); } @Override - public int firstIndexOf(@NonNull String name) { + public int firstIndexOf(@Nonnull String name) { return index.firstIndexOf(name); } - @NonNull + @Nonnull @Override public List getFieldTypes() { return fieldTypes; } - @NonNull + @Nonnull @Override public UserDefinedType copy(boolean newFrozen) { return (newFrozen == frozen) @@ -148,15 +148,15 @@ public UserDefinedType copy(boolean newFrozen) { keyspace, name, newFrozen, fieldNames, fieldTypes, attachmentPoint); } - @NonNull + @Nonnull @Override public UdtValue newValue() { return new DefaultUdtValue(this); } - @NonNull + @Nonnull @Override - public UdtValue newValue(@NonNull Object... fields) { + public UdtValue newValue(@Nonnull Object... fields) { return new DefaultUdtValue(this, fields); } @@ -166,14 +166,14 @@ public boolean isDetached() { } @Override - public void attach(@NonNull AttachmentPoint attachmentPoint) { + public void attach(@Nonnull AttachmentPoint attachmentPoint) { this.attachmentPoint = attachmentPoint; for (DataType fieldType : fieldTypes) { fieldType.attach(attachmentPoint); } } - @NonNull + @Nonnull @Override public AttachmentPoint getAttachmentPoint() { return attachmentPoint; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultVectorType.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultVectorType.java index 5915adc2fb3..d1e30751098 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultVectorType.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/DefaultVectorType.java @@ -20,8 +20,8 @@ import com.datastax.oss.driver.api.core.detach.AttachmentPoint; import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.VectorType; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -51,13 +51,13 @@ public int getDimensions() { } /* ============== CustomType interface ============== */ - @NonNull + @Nonnull @Override public String getClassName() { return VECTOR_CLASS_NAME; } - @NonNull + @Nonnull @Override public String asCql(boolean includeFrozen, boolean pretty) { return String.format("'%s(%d)'", getClassName(), getDimensions()); @@ -92,7 +92,7 @@ public boolean isDetached() { } @Override - public void attach(@NonNull AttachmentPoint attachmentPoint) { + public void attach(@Nonnull AttachmentPoint attachmentPoint) { // nothing to do } } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/PrimitiveType.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/PrimitiveType.java index c6f815a7487..6fe719ac8e5 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/PrimitiveType.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/PrimitiveType.java @@ -20,9 +20,9 @@ import com.datastax.oss.driver.api.core.detach.AttachmentPoint; import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.protocol.internal.ProtocolConstants; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.Serializable; import java.util.Locale; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -46,7 +46,7 @@ public boolean isDetached() { } @Override - public void attach(@NonNull AttachmentPoint attachmentPoint) { + public void attach(@Nonnull AttachmentPoint attachmentPoint) { // nothing to do } @@ -67,7 +67,7 @@ public int hashCode() { return protocolCode; } - @NonNull + @Nonnull @Override public String asCql(boolean includeFrozen, boolean pretty) { return codeName(protocolCode).toLowerCase(Locale.ROOT); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/BigIntCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/BigIntCodec.java index 2b3b8255cc1..aeedbeedbf8 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/BigIntCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/BigIntCodec.java @@ -22,38 +22,38 @@ import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.core.type.codec.PrimitiveLongCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe public class BigIntCodec implements PrimitiveLongCodec { - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.LONG; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.BIGINT; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof Long; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return javaClass == Long.class || javaClass == long.class; } @Nullable @Override - public ByteBuffer encodePrimitive(long value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encodePrimitive(long value, @Nonnull ProtocolVersion protocolVersion) { ByteBuffer bytes = ByteBuffer.allocate(8); bytes.putLong(0, value); return bytes; @@ -61,7 +61,7 @@ public ByteBuffer encodePrimitive(long value, @NonNull ProtocolVersion protocolV @Override public long decodePrimitive( - @Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + @Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { return 0; } else if (bytes.remaining() != 8) { @@ -72,7 +72,7 @@ public long decodePrimitive( } } - @NonNull + @Nonnull @Override public String format(@Nullable Long value) { return (value == null) ? "NULL" : Long.toString(value); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/BlobCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/BlobCodec.java index 1f5fcd5eeaa..006db8da109 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/BlobCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/BlobCodec.java @@ -23,9 +23,9 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.protocol.internal.util.Bytes; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; /** @@ -36,41 +36,41 @@ */ @ThreadSafe public class BlobCodec implements TypeCodec { - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.BYTE_BUFFER; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.BLOB; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof ByteBuffer; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return ByteBuffer.class.equals(javaClass); } @Nullable @Override - public ByteBuffer encode(@Nullable ByteBuffer value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(@Nullable ByteBuffer value, @Nonnull ProtocolVersion protocolVersion) { return (value == null) ? null : value.duplicate(); } @Nullable @Override - public ByteBuffer decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { return (bytes == null) ? null : bytes.duplicate(); } - @NonNull + @Nonnull @Override public String format(@Nullable ByteBuffer value) { return (value == null) ? "NULL" : Bytes.toHexString(value); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/BooleanCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/BooleanCodec.java index 7a982a9e6ca..0cd6ca5991c 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/BooleanCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/BooleanCodec.java @@ -22,9 +22,9 @@ import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.core.type.codec.PrimitiveBooleanCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -33,37 +33,37 @@ public class BooleanCodec implements PrimitiveBooleanCodec { private static final ByteBuffer TRUE = ByteBuffer.wrap(new byte[] {1}); private static final ByteBuffer FALSE = ByteBuffer.wrap(new byte[] {0}); - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.BOOLEAN; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.BOOLEAN; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof Boolean; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return javaClass == Boolean.class || javaClass == boolean.class; } @Nullable @Override - public ByteBuffer encodePrimitive(boolean value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encodePrimitive(boolean value, @Nonnull ProtocolVersion protocolVersion) { return value ? TRUE.duplicate() : FALSE.duplicate(); } @Override public boolean decodePrimitive( - @Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + @Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { return false; } else if (bytes.remaining() != 1) { @@ -74,7 +74,7 @@ public boolean decodePrimitive( } } - @NonNull + @Nonnull @Override public String format(@Nullable Boolean value) { if (value == null) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/CounterCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/CounterCodec.java index ab90ba09c20..c9df7e59fb7 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/CounterCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/CounterCodec.java @@ -19,12 +19,12 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.DataTypes; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; @ThreadSafe public class CounterCodec extends BigIntCodec { - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.COUNTER; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/CqlDurationCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/CqlDurationCodec.java index 90f6f56cf06..af36f5d87fb 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/CqlDurationCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/CqlDurationCodec.java @@ -27,40 +27,40 @@ import com.datastax.oss.driver.shaded.guava.common.io.ByteArrayDataOutput; import com.datastax.oss.driver.shaded.guava.common.io.ByteStreams; import com.datastax.oss.protocol.internal.util.Bytes; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.DataInput; import java.io.IOException; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe public class CqlDurationCodec implements TypeCodec { - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.CQL_DURATION; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.DURATION; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof CqlDuration; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return javaClass == CqlDuration.class; } @Nullable @Override - public ByteBuffer encode(@Nullable CqlDuration value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(@Nullable CqlDuration value, @Nonnull ProtocolVersion protocolVersion) { if (value == null) { return null; } @@ -85,7 +85,7 @@ public ByteBuffer encode(@Nullable CqlDuration value, @NonNull ProtocolVersion p @Nullable @Override - public CqlDuration decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public CqlDuration decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { return null; } else { @@ -102,7 +102,7 @@ public CqlDuration decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion p } } - @NonNull + @Nonnull @Override public String format(@Nullable CqlDuration value) { return (value == null) ? "NULL" : value.toString(); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/CustomCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/CustomCodec.java index 61a854e88d8..5ed9bcd7b3c 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/CustomCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/CustomCodec.java @@ -23,9 +23,9 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.protocol.internal.util.Bytes; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -37,41 +37,41 @@ public CustomCodec(CustomType cqlType) { this.cqlType = cqlType; } - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.BYTE_BUFFER; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return cqlType; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof ByteBuffer; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return ByteBuffer.class.equals(javaClass); } @Nullable @Override - public ByteBuffer encode(@Nullable ByteBuffer value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(@Nullable ByteBuffer value, @Nonnull ProtocolVersion protocolVersion) { return (value == null) ? null : value.duplicate(); } @Nullable @Override - public ByteBuffer decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { return (bytes == null) ? null : bytes.duplicate(); } - @NonNull + @Nonnull @Override public String format(@Nullable ByteBuffer value) { return (value == null) ? "NULL" : Bytes.toHexString(value); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/DateCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/DateCodec.java index 2fc463ef7d2..eee02c8f5cc 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/DateCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/DateCodec.java @@ -26,12 +26,12 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodecs; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.internal.core.util.Strings; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -39,31 +39,31 @@ public class DateCodec implements TypeCodec { private static final LocalDate EPOCH = LocalDate.of(1970, 1, 1); - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.LOCAL_DATE; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.DATE; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof LocalDate; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return javaClass == LocalDate.class; } @Nullable @Override - public ByteBuffer encode(@Nullable LocalDate value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(@Nullable LocalDate value, @Nonnull ProtocolVersion protocolVersion) { if (value == null) { return null; } @@ -74,7 +74,7 @@ public ByteBuffer encode(@Nullable LocalDate value, @NonNull ProtocolVersion pro @Nullable @Override - public LocalDate decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public LocalDate decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { return null; } @@ -83,7 +83,7 @@ public LocalDate decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion pro return EPOCH.plusDays(signed); } - @NonNull + @Nonnull @Override public String format(@Nullable LocalDate value) { return (value == null) ? "NULL" : Strings.quote(DateTimeFormatter.ISO_LOCAL_DATE.format(value)); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/DecimalCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/DecimalCodec.java index 25650b733cd..6e5e447fd49 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/DecimalCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/DecimalCodec.java @@ -22,40 +22,40 @@ import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.math.BigDecimal; import java.math.BigInteger; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe public class DecimalCodec implements TypeCodec { - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.BIG_DECIMAL; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.DECIMAL; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof BigDecimal; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return BigDecimal.class.isAssignableFrom(javaClass); } @Nullable @Override - public ByteBuffer encode(@Nullable BigDecimal value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(@Nullable BigDecimal value, @Nonnull ProtocolVersion protocolVersion) { if (value == null) { return null; } @@ -72,7 +72,7 @@ public ByteBuffer encode(@Nullable BigDecimal value, @NonNull ProtocolVersion pr @Nullable @Override - public BigDecimal decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public BigDecimal decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { return null; } else if (bytes.remaining() < 4) { @@ -89,7 +89,7 @@ public BigDecimal decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion pr return new BigDecimal(bi, scale); } - @NonNull + @Nonnull @Override public String format(@Nullable BigDecimal value) { return (value == null) ? "NULL" : value.toString(); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/DoubleCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/DoubleCodec.java index 28eff6f9463..b95e173aab5 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/DoubleCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/DoubleCodec.java @@ -22,38 +22,38 @@ import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.core.type.codec.PrimitiveDoubleCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe public class DoubleCodec implements PrimitiveDoubleCodec { - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.DOUBLE; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.DOUBLE; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof Double; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return javaClass == Double.class || javaClass == double.class; } @Nullable @Override - public ByteBuffer encodePrimitive(double value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encodePrimitive(double value, @Nonnull ProtocolVersion protocolVersion) { ByteBuffer bytes = ByteBuffer.allocate(8); bytes.putDouble(0, value); return bytes; @@ -61,7 +61,7 @@ public ByteBuffer encodePrimitive(double value, @NonNull ProtocolVersion protoco @Override public double decodePrimitive( - @Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + @Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { return 0; } else if (bytes.remaining() != 8) { @@ -72,7 +72,7 @@ public double decodePrimitive( } } - @NonNull + @Nonnull @Override public String format(@Nullable Double value) { return (value == null) ? "NULL" : Double.toString(value); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/FloatCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/FloatCodec.java index 11786dbc77d..466558e0b16 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/FloatCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/FloatCodec.java @@ -22,38 +22,38 @@ import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.core.type.codec.PrimitiveFloatCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe public class FloatCodec implements PrimitiveFloatCodec { - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.FLOAT; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.FLOAT; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof Float; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return javaClass == Float.class || javaClass == float.class; } @Nullable @Override - public ByteBuffer encodePrimitive(float value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encodePrimitive(float value, @Nonnull ProtocolVersion protocolVersion) { ByteBuffer bytes = ByteBuffer.allocate(4); bytes.putFloat(0, value); return bytes; @@ -61,7 +61,7 @@ public ByteBuffer encodePrimitive(float value, @NonNull ProtocolVersion protocol @Override public float decodePrimitive( - @Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + @Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { return 0; } else if (bytes.remaining() != 4) { @@ -72,7 +72,7 @@ public float decodePrimitive( } } - @NonNull + @Nonnull @Override public String format(@Nullable Float value) { return (value == null) ? "NULL" : Float.toString(value); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/InetCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/InetCodec.java index 167c7109bf9..d3fe917b006 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/InetCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/InetCodec.java @@ -24,46 +24,46 @@ import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.internal.core.util.Strings; import com.datastax.oss.protocol.internal.util.Bytes; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.net.InetAddress; import java.net.UnknownHostException; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe public class InetCodec implements TypeCodec { - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.INET_ADDRESS; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.INET; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof InetAddress; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return InetAddress.class.equals(javaClass); } @Nullable @Override - public ByteBuffer encode(@Nullable InetAddress value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(@Nullable InetAddress value, @Nonnull ProtocolVersion protocolVersion) { return (value == null) ? null : ByteBuffer.wrap(value.getAddress()); } @Nullable @Override - public InetAddress decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public InetAddress decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { return null; } @@ -75,7 +75,7 @@ public InetAddress decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion p } } - @NonNull + @Nonnull @Override public String format(@Nullable InetAddress value) { return (value == null) ? "NULL" : ("'" + value.getHostAddress() + "'"); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/IntCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/IntCodec.java index e5bb530ba79..72f68a41501 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/IntCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/IntCodec.java @@ -22,46 +22,46 @@ import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.core.type.codec.PrimitiveIntCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe public class IntCodec implements PrimitiveIntCodec { - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.INTEGER; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.INT; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof Integer; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return javaClass == Integer.class || javaClass == int.class; } @Nullable @Override - public ByteBuffer encodePrimitive(int value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encodePrimitive(int value, @Nonnull ProtocolVersion protocolVersion) { ByteBuffer bytes = ByteBuffer.allocate(4); bytes.putInt(0, value); return bytes; } @Override - public int decodePrimitive(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public int decodePrimitive(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { return 0; } else if (bytes.remaining() != 4) { @@ -72,7 +72,7 @@ public int decodePrimitive(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion } } - @NonNull + @Nonnull @Override public String format(@Nullable Integer value) { return (value == null) ? "NULL" : Integer.toString(value); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/ListCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/ListCodec.java index d587bbd5887..86bb4c0777e 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/ListCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/ListCodec.java @@ -23,11 +23,11 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -44,20 +44,20 @@ public ListCodec(DataType cqlType, TypeCodec elementCodec) { Preconditions.checkArgument(cqlType instanceof ListType); } - @NonNull + @Nonnull @Override public GenericType> getJavaType() { return javaType; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return cqlType; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { if (List.class.isAssignableFrom(value.getClass())) { // runtime type ok, now check element type List list = (List) value; @@ -70,7 +70,7 @@ public boolean accepts(@NonNull Object value) { @Nullable @Override public ByteBuffer encode( - @Nullable List value, @NonNull ProtocolVersion protocolVersion) { + @Nullable List value, @Nonnull ProtocolVersion protocolVersion) { // An int indicating the number of elements in the list, followed by the elements. Each element // is a byte array representing the serialized value, preceded by an int indicating its size. if (value == null) { @@ -109,7 +109,7 @@ public ByteBuffer encode( @Nullable @Override public List decode( - @Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + @Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { return new ArrayList<>(0); } else { @@ -135,7 +135,7 @@ public List decode( } } - @NonNull + @Nonnull @Override public String format(@Nullable List value) { if (value == null) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/MapCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/MapCodec.java index 999f41bf207..f6214fe9eae 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/MapCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/MapCodec.java @@ -22,11 +22,11 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.shaded.guava.common.collect.Maps; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.util.LinkedHashMap; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -44,20 +44,20 @@ public MapCodec(DataType cqlType, TypeCodec keyCodec, TypeCodec va this.javaType = GenericType.mapOf(keyCodec.getJavaType(), valueCodec.getJavaType()); } - @NonNull + @Nonnull @Override public GenericType> getJavaType() { return javaType; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return cqlType; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { if (value instanceof Map) { // runtime type ok, now check key and value types Map map = (Map) value; @@ -73,7 +73,7 @@ public boolean accepts(@NonNull Object value) { @Override @Nullable public ByteBuffer encode( - @Nullable Map value, @NonNull ProtocolVersion protocolVersion) { + @Nullable Map value, @Nonnull ProtocolVersion protocolVersion) { // An int indicating the number of key/value pairs in the map, followed by the pairs. Each pair // is a byte array representing the serialized key, preceded by an int indicating its size, // followed by the value in the same format. @@ -128,7 +128,7 @@ public ByteBuffer encode( @Nullable @Override public Map decode( - @Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + @Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { return new LinkedHashMap<>(0); } else { @@ -164,7 +164,7 @@ public Map decode( } } - @NonNull + @Nonnull @Override public String format(@Nullable Map value) { if (value == null) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/SetCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/SetCodec.java index fc4c0887516..2111fa9281c 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/SetCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/SetCodec.java @@ -24,11 +24,11 @@ import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; import com.datastax.oss.driver.shaded.guava.common.collect.Sets; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.util.LinkedHashSet; import java.util.Set; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -45,20 +45,20 @@ public SetCodec(DataType cqlType, TypeCodec elementCodec) { Preconditions.checkArgument(cqlType instanceof SetType); } - @NonNull + @Nonnull @Override public GenericType> getJavaType() { return javaType; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return cqlType; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { if (Set.class.isAssignableFrom(value.getClass())) { // runtime type ok, now check element type Set set = (Set) value; @@ -71,7 +71,7 @@ public boolean accepts(@NonNull Object value) { @Nullable @Override public ByteBuffer encode( - @Nullable Set value, @NonNull ProtocolVersion protocolVersion) { + @Nullable Set value, @Nonnull ProtocolVersion protocolVersion) { // An int indicating the number of elements in the set, followed by the elements. Each element // is a byte array representing the serialized value, preceded by an int indicating its size. if (value == null) { @@ -110,7 +110,7 @@ public ByteBuffer encode( @Nullable @Override public Set decode( - @Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + @Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { return new LinkedHashSet<>(0); } else { @@ -136,7 +136,7 @@ public Set decode( } } - @NonNull + @Nonnull @Override public String format(@Nullable Set value) { if (value == null) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/SimpleBlobCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/SimpleBlobCodec.java index 9f90feb8e7c..458a9276d44 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/SimpleBlobCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/SimpleBlobCodec.java @@ -22,9 +22,9 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodecs; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.internal.core.type.codec.extras.array.ByteListToArrayCodec; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; /** @@ -44,12 +44,12 @@ public SimpleBlobCodec() { } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof byte[]; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return byte[].class.equals(javaClass); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/SmallIntCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/SmallIntCodec.java index 08beb0b34c5..221f3afa233 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/SmallIntCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/SmallIntCodec.java @@ -22,38 +22,38 @@ import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.core.type.codec.PrimitiveShortCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe public class SmallIntCodec implements PrimitiveShortCodec { - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.SHORT; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.SMALLINT; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof Short; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return javaClass == Short.class || javaClass == short.class; } @Nullable @Override - public ByteBuffer encodePrimitive(short value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encodePrimitive(short value, @Nonnull ProtocolVersion protocolVersion) { ByteBuffer bytes = ByteBuffer.allocate(2); bytes.putShort(0, value); return bytes; @@ -61,7 +61,7 @@ public ByteBuffer encodePrimitive(short value, @NonNull ProtocolVersion protocol @Override public short decodePrimitive( - @Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + @Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { return 0; } else if (bytes.remaining() != 2) { @@ -72,7 +72,7 @@ public short decodePrimitive( } } - @NonNull + @Nonnull @Override public String format(@Nullable Short value) { return (value == null) ? "NULL" : Short.toString(value); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/StringCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/StringCodec.java index 2a9acdd8c47..3bcbe130016 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/StringCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/StringCodec.java @@ -22,8 +22,6 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.internal.core.util.Strings; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import io.netty.util.concurrent.FastThreadLocal; import java.nio.ByteBuffer; import java.nio.CharBuffer; @@ -32,6 +30,8 @@ import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; import java.nio.charset.CodingErrorAction; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -41,7 +41,7 @@ public class StringCodec implements TypeCodec { private final FastThreadLocal charsetEncoder; private final FastThreadLocal charsetDecoder; - public StringCodec(@NonNull DataType cqlType, @NonNull Charset charset) { + public StringCodec(@Nonnull DataType cqlType, @Nonnull Charset charset) { this.cqlType = cqlType; charsetEncoder = new FastThreadLocal() { @@ -65,31 +65,31 @@ protected CharsetDecoder initialValue() throws Exception { }; } - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.STRING; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return cqlType; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof String; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return javaClass == String.class; } @Nullable @Override - public ByteBuffer encode(@Nullable String value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(@Nullable String value, @Nonnull ProtocolVersion protocolVersion) { if (value == null) { return null; } @@ -102,7 +102,7 @@ public ByteBuffer encode(@Nullable String value, @NonNull ProtocolVersion protoc @Nullable @Override - public String decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public String decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null) { return null; } else if (bytes.remaining() == 0) { @@ -116,7 +116,7 @@ public String decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protoc } } - @NonNull + @Nonnull @Override public String format(@Nullable String value) { return (value == null) ? "NULL" : Strings.quote(value); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/TimeCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/TimeCodec.java index 4977687342d..4d97372d10e 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/TimeCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/TimeCodec.java @@ -24,11 +24,11 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodecs; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.internal.core.util.Strings; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.time.LocalTime; import java.time.format.DateTimeFormatter; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -37,31 +37,31 @@ public class TimeCodec implements TypeCodec { private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("HH:mm:ss.SSSSSSSSS"); - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.LOCAL_TIME; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.TIME; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof LocalTime; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return javaClass == LocalTime.class; } @Nullable @Override - public ByteBuffer encode(@Nullable LocalTime value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(@Nullable LocalTime value, @Nonnull ProtocolVersion protocolVersion) { return (value == null) ? null : TypeCodecs.BIGINT.encodePrimitive(value.toNanoOfDay(), protocolVersion); @@ -69,7 +69,7 @@ public ByteBuffer encode(@Nullable LocalTime value, @NonNull ProtocolVersion pro @Nullable @Override - public LocalTime decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public LocalTime decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { return null; } else { @@ -78,7 +78,7 @@ public LocalTime decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion pro } } - @NonNull + @Nonnull @Override public String format(@Nullable LocalTime value) { return (value == null) ? "NULL" : Strings.quote(FORMATTER.format(value)); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/TimeUuidCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/TimeUuidCodec.java index 95744f63ee3..d3f635fbbef 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/TimeUuidCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/TimeUuidCodec.java @@ -20,33 +20,33 @@ import com.datastax.oss.driver.api.core.ProtocolVersion; import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.DataTypes; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.util.UUID; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe public class TimeUuidCodec extends UuidCodec { - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.TIMEUUID; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof UUID && ((UUID) value).version() == 1; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return javaClass == UUID.class; } @Nullable @Override - public ByteBuffer encode(@Nullable UUID value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(@Nullable UUID value, @Nonnull ProtocolVersion protocolVersion) { if (value == null) { return null; } else if (value.version() != 1) { @@ -57,7 +57,7 @@ public ByteBuffer encode(@Nullable UUID value, @NonNull ProtocolVersion protocol } } - @NonNull + @Nonnull @Override public String format(@Nullable UUID value) { if (value == null) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/TimestampCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/TimestampCodec.java index eeba3c7c66c..7c18357d8b1 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/TimestampCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/TimestampCodec.java @@ -24,8 +24,6 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodecs; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.internal.core.util.Strings; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import io.netty.util.concurrent.FastThreadLocal; import java.nio.ByteBuffer; import java.text.ParsePosition; @@ -34,6 +32,8 @@ import java.time.ZoneId; import java.util.Date; import java.util.TimeZone; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; /** @@ -207,31 +207,31 @@ protected SimpleDateFormat initialValue() { }; } - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.INSTANT; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.TIMESTAMP; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof Instant; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return javaClass == Instant.class; } @Nullable @Override - public ByteBuffer encode(@Nullable Instant value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(@Nullable Instant value, @Nonnull ProtocolVersion protocolVersion) { return (value == null) ? null : TypeCodecs.BIGINT.encodePrimitive(value.toEpochMilli(), protocolVersion); @@ -239,13 +239,13 @@ public ByteBuffer encode(@Nullable Instant value, @NonNull ProtocolVersion proto @Nullable @Override - public Instant decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public Instant decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { return (bytes == null || bytes.remaining() == 0) ? null : Instant.ofEpochMilli(TypeCodecs.BIGINT.decodePrimitive(bytes, protocolVersion)); } - @NonNull + @Nonnull @Override public String format(@Nullable Instant value) { return (value == null) ? "NULL" : Strings.quote(formatter.get().format(Date.from(value))); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/TinyIntCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/TinyIntCodec.java index 13bf79b70d5..05a1b1c9d30 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/TinyIntCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/TinyIntCodec.java @@ -22,38 +22,38 @@ import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.core.type.codec.PrimitiveByteCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe public class TinyIntCodec implements PrimitiveByteCodec { - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.BYTE; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.TINYINT; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof Byte; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return javaClass == Byte.class || javaClass == byte.class; } @Nullable @Override - public ByteBuffer encodePrimitive(byte value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encodePrimitive(byte value, @Nonnull ProtocolVersion protocolVersion) { ByteBuffer bytes = ByteBuffer.allocate(1); bytes.put(0, value); return bytes; @@ -61,7 +61,7 @@ public ByteBuffer encodePrimitive(byte value, @NonNull ProtocolVersion protocolV @Override public byte decodePrimitive( - @Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + @Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { return 0; } else if (bytes.remaining() != 1) { @@ -72,7 +72,7 @@ public byte decodePrimitive( } } - @NonNull + @Nonnull @Override public String format(@Nullable Byte value) { return (value == null) ? "NULL" : Byte.toString(value); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/TupleCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/TupleCodec.java index cc85266682c..9832113f3ba 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/TupleCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/TupleCodec.java @@ -24,10 +24,10 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -35,35 +35,35 @@ public class TupleCodec implements TypeCodec { private final TupleType cqlType; - public TupleCodec(@NonNull TupleType cqlType) { + public TupleCodec(@Nonnull TupleType cqlType) { this.cqlType = cqlType; } - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.TUPLE_VALUE; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return cqlType; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return (value instanceof TupleValue) && ((TupleValue) value).getType().equals(cqlType); } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return TupleValue.class.equals(javaClass); } @Nullable @Override - public ByteBuffer encode(@Nullable TupleValue value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(@Nullable TupleValue value, @Nonnull ProtocolVersion protocolVersion) { if (value == null) { return null; } @@ -93,7 +93,7 @@ public ByteBuffer encode(@Nullable TupleValue value, @NonNull ProtocolVersion pr @Nullable @Override - public TupleValue decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public TupleValue decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null) { return null; } @@ -127,7 +127,7 @@ public TupleValue decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion pr } } - @NonNull + @Nonnull @Override public String format(@Nullable TupleValue value) { if (value == null) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/UdtCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/UdtCodec.java index f5177e63b5e..7ce1795c6f6 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/UdtCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/UdtCodec.java @@ -25,10 +25,10 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -36,35 +36,35 @@ public class UdtCodec implements TypeCodec { private final UserDefinedType cqlType; - public UdtCodec(@NonNull UserDefinedType cqlType) { + public UdtCodec(@Nonnull UserDefinedType cqlType) { this.cqlType = cqlType; } - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.UDT_VALUE; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return cqlType; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof UdtValue && ((UdtValue) value).getType().equals(cqlType); } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return UdtValue.class.equals(javaClass); } @Nullable @Override - public ByteBuffer encode(@Nullable UdtValue value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(@Nullable UdtValue value, @Nonnull ProtocolVersion protocolVersion) { if (value == null) { return null; } @@ -96,7 +96,7 @@ public ByteBuffer encode(@Nullable UdtValue value, @NonNull ProtocolVersion prot @Nullable @Override - public UdtValue decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public UdtValue decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null) { return null; } @@ -130,7 +130,7 @@ public UdtValue decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion prot } } - @NonNull + @Nonnull @Override public String format(@Nullable UdtValue value) { if (value == null) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/UuidCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/UuidCodec.java index 57feac4ae7e..39ffcdf06a5 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/UuidCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/UuidCodec.java @@ -22,39 +22,39 @@ import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.util.UUID; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe public class UuidCodec implements TypeCodec { - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.UUID; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.UUID; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof UUID; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return javaClass == UUID.class; } @Nullable @Override - public ByteBuffer encode(@Nullable UUID value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(@Nullable UUID value, @Nonnull ProtocolVersion protocolVersion) { if (value == null) { return null; } @@ -66,7 +66,7 @@ public ByteBuffer encode(@Nullable UUID value, @NonNull ProtocolVersion protocol @Nullable @Override - public UUID decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public UUID decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { return null; } else if (bytes.remaining() != 16) { @@ -77,7 +77,7 @@ public UUID decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocol } } - @NonNull + @Nonnull @Override public String format(@Nullable UUID value) { return (value == null) ? "NULL" : value.toString(); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/VarIntCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/VarIntCodec.java index b04c959c704..b6e0ee8db67 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/VarIntCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/VarIntCodec.java @@ -23,49 +23,49 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.protocol.internal.util.Bytes; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.math.BigInteger; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe public class VarIntCodec implements TypeCodec { - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.BIG_INTEGER; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.VARINT; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { return value instanceof BigInteger; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return BigInteger.class.isAssignableFrom(javaClass); } @Nullable @Override - public ByteBuffer encode(@Nullable BigInteger value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(@Nullable BigInteger value, @Nonnull ProtocolVersion protocolVersion) { return (value == null) ? null : ByteBuffer.wrap(value.toByteArray()); } @Nullable @Override - public BigInteger decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public BigInteger decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { return (bytes == null) || bytes.remaining() == 0 ? null : new BigInteger(Bytes.getArray(bytes)); } - @NonNull + @Nonnull @Override public String format(@Nullable BigInteger value) { return (value == null) ? "NULL" : value.toString(); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/VectorCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/VectorCodec.java index 1b663a29d9e..5023402f35f 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/VectorCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/VectorCodec.java @@ -25,13 +25,13 @@ import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.internal.core.type.DefaultVectorType; import com.datastax.oss.driver.shaded.guava.common.collect.Iterables; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class VectorCodec implements TypeCodec> { @@ -39,23 +39,23 @@ public class VectorCodec implements TypeCodec> javaType; private final TypeCodec subtypeCodec; - public VectorCodec(@NonNull VectorType cqlType, @NonNull TypeCodec subtypeCodec) { + public VectorCodec(@Nonnull VectorType cqlType, @Nonnull TypeCodec subtypeCodec) { this.cqlType = cqlType; this.subtypeCodec = subtypeCodec; this.javaType = GenericType.vectorOf(subtypeCodec.getJavaType()); } - public VectorCodec(int dimensions, @NonNull TypeCodec subtypeCodec) { + public VectorCodec(int dimensions, @Nonnull TypeCodec subtypeCodec) { this(new DefaultVectorType(subtypeCodec.getCqlType(), dimensions), subtypeCodec); } - @NonNull + @Nonnull @Override public GenericType> getJavaType() { return this.javaType; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return this.cqlType; @@ -64,7 +64,7 @@ public DataType getCqlType() { @Nullable @Override public ByteBuffer encode( - @Nullable CqlVector value, @NonNull ProtocolVersion protocolVersion) { + @Nullable CqlVector value, @Nonnull ProtocolVersion protocolVersion) { if (value == null || cqlType.getDimensions() <= 0) { return null; } @@ -109,7 +109,7 @@ public ByteBuffer encode( @Nullable @Override public CqlVector decode( - @Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + @Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { return null; } @@ -141,7 +141,7 @@ Elements should at least precede themselves with their size (along the lines of return CqlVector.newInstance(rv); } - @NonNull + @Nonnull @Override public String format(@Nullable CqlVector value) { return value == null ? "NULL" : Iterables.toString(value); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/OptionalCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/OptionalCodec.java index e62e244bf5e..9845e0c87d3 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/OptionalCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/OptionalCodec.java @@ -20,12 +20,12 @@ import com.datastax.oss.driver.api.core.type.codec.MappingCodec; import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Collection; import java.util.Map; import java.util.Objects; import java.util.Optional; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; /** @@ -36,14 +36,14 @@ @Immutable public class OptionalCodec extends MappingCodec> { - public OptionalCodec(@NonNull TypeCodec innerCodec) { + public OptionalCodec(@Nonnull TypeCodec innerCodec) { super( Objects.requireNonNull(innerCodec, "innerCodec must not be null"), GenericType.optionalOf(innerCodec.getJavaType())); } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { Objects.requireNonNull(value); if (value instanceof Optional) { Optional optional = (Optional) value; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/AbstractListToArrayCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/AbstractListToArrayCodec.java index fcf61a4e7b3..da42cf26f35 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/AbstractListToArrayCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/AbstractListToArrayCodec.java @@ -22,10 +22,10 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.internal.core.type.codec.ParseUtils; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.lang.reflect.Array; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Base class for all codecs dealing with Java arrays. This class aims to reduce the amount of code @@ -35,15 +35,15 @@ */ public abstract class AbstractListToArrayCodec implements TypeCodec { - @NonNull protected final ListType cqlType; - @NonNull protected final GenericType javaType; + @Nonnull protected final ListType cqlType; + @Nonnull protected final GenericType javaType; /** * @param cqlType The CQL type. Must be a list type. * @param arrayType The Java type. Must be an array class. */ protected AbstractListToArrayCodec( - @NonNull ListType cqlType, @NonNull GenericType arrayType) { + @Nonnull ListType cqlType, @Nonnull GenericType arrayType) { this.cqlType = Objects.requireNonNull(cqlType, "cqlType cannot be null"); this.javaType = Objects.requireNonNull(arrayType, "arrayType cannot be null"); if (!arrayType.isArray()) { @@ -51,19 +51,19 @@ protected AbstractListToArrayCodec( } } - @NonNull + @Nonnull @Override public GenericType getJavaType() { return javaType; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return cqlType; } - @NonNull + @Nonnull @Override public String format(@Nullable ArrayT array) { if (array == null) { @@ -119,7 +119,7 @@ public ArrayT parse(@Nullable String value) { * @param size The size of the array to instantiate. * @return a new array instance with the given size. */ - @NonNull + @Nonnull protected abstract ArrayT newInstance(int size); /** @@ -130,7 +130,7 @@ public ArrayT parse(@Nullable String value) { * @param index The element index. */ protected abstract void formatElement( - @NonNull StringBuilder output, @NonNull ArrayT array, int index); + @Nonnull StringBuilder output, @Nonnull ArrayT array, int index); /** * Parses the {@code index}th element of {@code array} from {@code input}. @@ -139,7 +139,7 @@ protected abstract void formatElement( * @param array The array to write to. * @param index The element index. */ - protected abstract void parseElement(@NonNull String input, @NonNull ArrayT array, int index); + protected abstract void parseElement(@Nonnull String input, @Nonnull ArrayT array, int index); private int getArrayLength(String value, int idx) { int length = 1; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/AbstractPrimitiveListToArrayCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/AbstractPrimitiveListToArrayCodec.java index 3e5ece7c159..f40ef079fd0 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/AbstractPrimitiveListToArrayCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/AbstractPrimitiveListToArrayCodec.java @@ -20,11 +20,11 @@ import com.datastax.oss.driver.api.core.ProtocolVersion; import com.datastax.oss.driver.api.core.type.ListType; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.lang.reflect.Array; import java.nio.ByteBuffer; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Base class for all codecs dealing with Java primitive arrays. This class provides a more @@ -41,7 +41,7 @@ public abstract class AbstractPrimitiveListToArrayCodec * @param javaClass The Java type. Must be an array class. */ protected AbstractPrimitiveListToArrayCodec( - @NonNull ListType cqlType, @NonNull GenericType javaClass) { + @Nonnull ListType cqlType, @Nonnull GenericType javaClass) { super(cqlType, javaClass); GenericType componentType = Objects.requireNonNull(javaClass.getComponentType()); if (!componentType.isPrimitive()) { @@ -53,7 +53,7 @@ protected AbstractPrimitiveListToArrayCodec( @Nullable @Override public ByteBuffer encode( - @Nullable PrimitiveArrayT array, @NonNull ProtocolVersion protocolVersion) { + @Nullable PrimitiveArrayT array, @Nonnull ProtocolVersion protocolVersion) { if (array == null) { return null; } @@ -73,7 +73,7 @@ public ByteBuffer encode( @Nullable @Override public PrimitiveArrayT decode( - @Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + @Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { return newInstance(0); } @@ -108,10 +108,10 @@ public PrimitiveArrayT decode( * @param protocolVersion The protocol version to use. */ protected abstract void serializeElement( - @NonNull ByteBuffer output, - @NonNull PrimitiveArrayT array, + @Nonnull ByteBuffer output, + @Nonnull PrimitiveArrayT array, int index, - @NonNull ProtocolVersion protocolVersion); + @Nonnull ProtocolVersion protocolVersion); /** * Read the {@code index}th element of {@code array} from {@code input}. @@ -122,8 +122,8 @@ protected abstract void serializeElement( * @param protocolVersion The protocol version to use. */ protected abstract void deserializeElement( - @NonNull ByteBuffer input, - @NonNull PrimitiveArrayT array, + @Nonnull ByteBuffer input, + @Nonnull PrimitiveArrayT array, int index, - @NonNull ProtocolVersion protocolVersion); + @Nonnull ProtocolVersion protocolVersion); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/BooleanListToArrayCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/BooleanListToArrayCodec.java index c9cc0baa41f..85b33074547 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/BooleanListToArrayCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/BooleanListToArrayCodec.java @@ -20,9 +20,9 @@ import com.datastax.oss.driver.api.core.ProtocolVersion; import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.util.Objects; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; /** @@ -44,13 +44,13 @@ public BooleanListToArrayCodec() { } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { Objects.requireNonNull(javaClass); return boolean[].class.equals(javaClass); } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { Objects.requireNonNull(value); return value instanceof boolean[]; } @@ -62,34 +62,34 @@ protected int sizeOfComponentType() { @Override protected void serializeElement( - @NonNull ByteBuffer output, - @NonNull boolean[] array, + @Nonnull ByteBuffer output, + @Nonnull boolean[] array, int index, - @NonNull ProtocolVersion protocolVersion) { + @Nonnull ProtocolVersion protocolVersion) { byte element = array[index] ? TRUE : FALSE; output.put(element); } @Override protected void deserializeElement( - @NonNull ByteBuffer input, - @NonNull boolean[] array, + @Nonnull ByteBuffer input, + @Nonnull boolean[] array, int index, - @NonNull ProtocolVersion protocolVersion) { + @Nonnull ProtocolVersion protocolVersion) { array[index] = input.get() == TRUE; } @Override - protected void formatElement(@NonNull StringBuilder output, @NonNull boolean[] array, int index) { + protected void formatElement(@Nonnull StringBuilder output, @Nonnull boolean[] array, int index) { output.append(array[index]); } @Override - protected void parseElement(@NonNull String input, @NonNull boolean[] array, int index) { + protected void parseElement(@Nonnull String input, @Nonnull boolean[] array, int index) { array[index] = Boolean.parseBoolean(input); } - @NonNull + @Nonnull @Override protected boolean[] newInstance(int size) { return new boolean[size]; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/ByteListToArrayCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/ByteListToArrayCodec.java index b811908e341..c7f96b85e52 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/ByteListToArrayCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/ByteListToArrayCodec.java @@ -21,9 +21,9 @@ import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.internal.core.type.codec.SimpleBlobCodec; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.util.Objects; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; /** @@ -45,13 +45,13 @@ public ByteListToArrayCodec() { } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { Objects.requireNonNull(javaClass); return byte[].class.equals(javaClass); } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { Objects.requireNonNull(value); return value instanceof byte[]; } @@ -63,33 +63,33 @@ protected int sizeOfComponentType() { @Override protected void serializeElement( - @NonNull ByteBuffer output, - @NonNull byte[] array, + @Nonnull ByteBuffer output, + @Nonnull byte[] array, int index, - @NonNull ProtocolVersion protocolVersion) { + @Nonnull ProtocolVersion protocolVersion) { output.put(array[index]); } @Override protected void deserializeElement( - @NonNull ByteBuffer input, - @NonNull byte[] array, + @Nonnull ByteBuffer input, + @Nonnull byte[] array, int index, - @NonNull ProtocolVersion protocolVersion) { + @Nonnull ProtocolVersion protocolVersion) { array[index] = input.get(); } @Override - protected void formatElement(@NonNull StringBuilder output, @NonNull byte[] array, int index) { + protected void formatElement(@Nonnull StringBuilder output, @Nonnull byte[] array, int index) { output.append(array[index]); } @Override - protected void parseElement(@NonNull String input, @NonNull byte[] array, int index) { + protected void parseElement(@Nonnull String input, @Nonnull byte[] array, int index) { array[index] = Byte.parseByte(input); } - @NonNull + @Nonnull @Override protected byte[] newInstance(int size) { return new byte[size]; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/DoubleListToArrayCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/DoubleListToArrayCodec.java index fdf5befa635..7283493d72f 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/DoubleListToArrayCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/DoubleListToArrayCodec.java @@ -20,9 +20,9 @@ import com.datastax.oss.driver.api.core.ProtocolVersion; import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.util.Objects; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; /** @@ -41,13 +41,13 @@ public DoubleListToArrayCodec() { } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { Objects.requireNonNull(javaClass); return double[].class.equals(javaClass); } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { Objects.requireNonNull(value); return value instanceof double[]; } @@ -59,33 +59,33 @@ protected int sizeOfComponentType() { @Override protected void serializeElement( - @NonNull ByteBuffer output, - @NonNull double[] array, + @Nonnull ByteBuffer output, + @Nonnull double[] array, int index, - @NonNull ProtocolVersion protocolVersion) { + @Nonnull ProtocolVersion protocolVersion) { output.putDouble(array[index]); } @Override protected void deserializeElement( - @NonNull ByteBuffer input, - @NonNull double[] array, + @Nonnull ByteBuffer input, + @Nonnull double[] array, int index, - @NonNull ProtocolVersion protocolVersion) { + @Nonnull ProtocolVersion protocolVersion) { array[index] = input.getDouble(); } @Override - protected void formatElement(@NonNull StringBuilder output, @NonNull double[] array, int index) { + protected void formatElement(@Nonnull StringBuilder output, @Nonnull double[] array, int index) { output.append(array[index]); } @Override - protected void parseElement(@NonNull String input, @NonNull double[] array, int index) { + protected void parseElement(@Nonnull String input, @Nonnull double[] array, int index) { array[index] = Double.parseDouble(input); } - @NonNull + @Nonnull @Override protected double[] newInstance(int size) { return new double[size]; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/FloatListToArrayCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/FloatListToArrayCodec.java index b77e5d1243d..4f90893da24 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/FloatListToArrayCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/FloatListToArrayCodec.java @@ -20,9 +20,9 @@ import com.datastax.oss.driver.api.core.ProtocolVersion; import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.util.Objects; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; /** @@ -41,13 +41,13 @@ public FloatListToArrayCodec() { } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { Objects.requireNonNull(javaClass); return float[].class.equals(javaClass); } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { Objects.requireNonNull(value); return value instanceof float[]; } @@ -59,33 +59,33 @@ protected int sizeOfComponentType() { @Override protected void serializeElement( - @NonNull ByteBuffer output, - @NonNull float[] array, + @Nonnull ByteBuffer output, + @Nonnull float[] array, int index, - @NonNull ProtocolVersion protocolVersion) { + @Nonnull ProtocolVersion protocolVersion) { output.putFloat(array[index]); } @Override protected void deserializeElement( - @NonNull ByteBuffer input, - @NonNull float[] array, + @Nonnull ByteBuffer input, + @Nonnull float[] array, int index, - @NonNull ProtocolVersion protocolVersion) { + @Nonnull ProtocolVersion protocolVersion) { array[index] = input.getFloat(); } @Override - protected void formatElement(@NonNull StringBuilder output, @NonNull float[] array, int index) { + protected void formatElement(@Nonnull StringBuilder output, @Nonnull float[] array, int index) { output.append(array[index]); } @Override - protected void parseElement(@NonNull String input, @NonNull float[] array, int index) { + protected void parseElement(@Nonnull String input, @Nonnull float[] array, int index) { array[index] = Float.parseFloat(input); } - @NonNull + @Nonnull @Override protected float[] newInstance(int size) { return new float[size]; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/IntListToArrayCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/IntListToArrayCodec.java index cf464282b1e..80f2182df2d 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/IntListToArrayCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/IntListToArrayCodec.java @@ -20,9 +20,9 @@ import com.datastax.oss.driver.api.core.ProtocolVersion; import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.util.Objects; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; /** @@ -41,13 +41,13 @@ public IntListToArrayCodec() { } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { Objects.requireNonNull(javaClass); return int[].class.equals(javaClass); } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { Objects.requireNonNull(value); return value instanceof int[]; } @@ -59,33 +59,33 @@ protected int sizeOfComponentType() { @Override protected void serializeElement( - @NonNull ByteBuffer output, - @NonNull int[] array, + @Nonnull ByteBuffer output, + @Nonnull int[] array, int index, - @NonNull ProtocolVersion protocolVersion) { + @Nonnull ProtocolVersion protocolVersion) { output.putInt(array[index]); } @Override protected void deserializeElement( - @NonNull ByteBuffer input, - @NonNull int[] array, + @Nonnull ByteBuffer input, + @Nonnull int[] array, int index, - @NonNull ProtocolVersion protocolVersion) { + @Nonnull ProtocolVersion protocolVersion) { array[index] = input.getInt(); } @Override - protected void formatElement(@NonNull StringBuilder output, @NonNull int[] array, int index) { + protected void formatElement(@Nonnull StringBuilder output, @Nonnull int[] array, int index) { output.append(array[index]); } @Override - protected void parseElement(@NonNull String input, @NonNull int[] array, int index) { + protected void parseElement(@Nonnull String input, @Nonnull int[] array, int index) { array[index] = Integer.parseInt(input); } - @NonNull + @Nonnull @Override protected int[] newInstance(int size) { return new int[size]; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/LongListToArrayCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/LongListToArrayCodec.java index bde21d40272..56a9ce1a3f4 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/LongListToArrayCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/LongListToArrayCodec.java @@ -20,9 +20,9 @@ import com.datastax.oss.driver.api.core.ProtocolVersion; import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.util.Objects; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; /** @@ -41,13 +41,13 @@ public LongListToArrayCodec() { } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { Objects.requireNonNull(javaClass); return long[].class.equals(javaClass); } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { Objects.requireNonNull(value); return value instanceof long[]; } @@ -59,33 +59,33 @@ protected int sizeOfComponentType() { @Override protected void serializeElement( - @NonNull ByteBuffer output, - @NonNull long[] array, + @Nonnull ByteBuffer output, + @Nonnull long[] array, int index, - @NonNull ProtocolVersion protocolVersion) { + @Nonnull ProtocolVersion protocolVersion) { output.putLong(array[index]); } @Override protected void deserializeElement( - @NonNull ByteBuffer input, - @NonNull long[] array, + @Nonnull ByteBuffer input, + @Nonnull long[] array, int index, - @NonNull ProtocolVersion protocolVersion) { + @Nonnull ProtocolVersion protocolVersion) { array[index] = input.getLong(); } @Override - protected void formatElement(@NonNull StringBuilder output, @NonNull long[] array, int index) { + protected void formatElement(@Nonnull StringBuilder output, @Nonnull long[] array, int index) { output.append(array[index]); } @Override - protected void parseElement(@NonNull String input, @NonNull long[] array, int index) { + protected void parseElement(@Nonnull String input, @Nonnull long[] array, int index) { array[index] = Long.parseLong(input); } - @NonNull + @Nonnull @Override protected long[] newInstance(int size) { return new long[size]; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/ObjectListToArrayCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/ObjectListToArrayCodec.java index 8600ba3e9a5..1c72f9bd97b 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/ObjectListToArrayCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/ObjectListToArrayCodec.java @@ -21,11 +21,11 @@ import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.lang.reflect.Array; import java.nio.ByteBuffer; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; /** @@ -46,7 +46,7 @@ public class ObjectListToArrayCodec extends AbstractListToArrayCodec elementCodec; - public ObjectListToArrayCodec(@NonNull TypeCodec elementCodec) { + public ObjectListToArrayCodec(@Nonnull TypeCodec elementCodec) { super( DataTypes.listOf( Objects.requireNonNull(elementCodec, "elementCodec must not be null").getCqlType()), @@ -55,7 +55,7 @@ public ObjectListToArrayCodec(@NonNull TypeCodec elementCodec) { } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { Objects.requireNonNull(value); Class clazz = value.getClass(); return clazz.isArray() @@ -64,7 +64,7 @@ public boolean accepts(@NonNull Object value) { @Nullable @Override - public ByteBuffer encode(@Nullable ElementT[] value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(@Nullable ElementT[] value, @Nonnull ProtocolVersion protocolVersion) { if (value == null) { return null; } @@ -103,7 +103,7 @@ public ByteBuffer encode(@Nullable ElementT[] value, @NonNull ProtocolVersion pr @Nullable @Override - public ElementT[] decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public ElementT[] decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { return newInstance(0); } @@ -130,16 +130,16 @@ public ElementT[] decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion pr @Override protected void formatElement( - @NonNull StringBuilder output, @NonNull ElementT[] array, int index) { + @Nonnull StringBuilder output, @Nonnull ElementT[] array, int index) { output.append(elementCodec.format(array[index])); } @Override - protected void parseElement(@NonNull String input, @NonNull ElementT[] array, int index) { + protected void parseElement(@Nonnull String input, @Nonnull ElementT[] array, int index) { array[index] = elementCodec.parse(input); } - @NonNull + @Nonnull @Override @SuppressWarnings("unchecked") protected ElementT[] newInstance(int size) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/ShortListToArrayCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/ShortListToArrayCodec.java index 13bb5733bf9..1ce0200f979 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/ShortListToArrayCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/array/ShortListToArrayCodec.java @@ -20,9 +20,9 @@ import com.datastax.oss.driver.api.core.ProtocolVersion; import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.util.Objects; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; /** @@ -41,12 +41,12 @@ public ShortListToArrayCodec() { } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return short[].class.equals(javaClass); } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { Objects.requireNonNull(value); return value instanceof short[]; } @@ -58,33 +58,33 @@ protected int sizeOfComponentType() { @Override protected void serializeElement( - @NonNull ByteBuffer output, - @NonNull short[] array, + @Nonnull ByteBuffer output, + @Nonnull short[] array, int index, - @NonNull ProtocolVersion protocolVersion) { + @Nonnull ProtocolVersion protocolVersion) { output.putShort(array[index]); } @Override protected void deserializeElement( - @NonNull ByteBuffer input, - @NonNull short[] array, + @Nonnull ByteBuffer input, + @Nonnull short[] array, int index, - @NonNull ProtocolVersion protocolVersion) { + @Nonnull ProtocolVersion protocolVersion) { array[index] = input.getShort(); } @Override - protected void formatElement(@NonNull StringBuilder output, @NonNull short[] array, int index) { + protected void formatElement(@Nonnull StringBuilder output, @Nonnull short[] array, int index) { output.append(array[index]); } @Override - protected void parseElement(@NonNull String input, @NonNull short[] array, int index) { + protected void parseElement(@Nonnull String input, @Nonnull short[] array, int index) { array[index] = Short.parseShort(input); } - @NonNull + @Nonnull @Override protected short[] newInstance(int size) { return new short[size]; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/enums/EnumNameCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/enums/EnumNameCodec.java index 56363ef819e..ce24568ebf5 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/enums/EnumNameCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/enums/EnumNameCodec.java @@ -20,9 +20,9 @@ import com.datastax.oss.driver.api.core.type.codec.MappingCodec; import com.datastax.oss.driver.api.core.type.codec.TypeCodecs; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; /** @@ -39,7 +39,7 @@ public class EnumNameCodec> extends MappingCodec enumClass; - public EnumNameCodec(@NonNull Class enumClass) { + public EnumNameCodec(@Nonnull Class enumClass) { super( TypeCodecs.TEXT, GenericType.of(Objects.requireNonNull(enumClass, "enumClass must not be null"))); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/enums/EnumOrdinalCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/enums/EnumOrdinalCodec.java index 4d6ca26484e..68f04373b91 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/enums/EnumOrdinalCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/enums/EnumOrdinalCodec.java @@ -20,9 +20,9 @@ import com.datastax.oss.driver.api.core.type.codec.MappingCodec; import com.datastax.oss.driver.api.core.type.codec.TypeCodecs; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; /** @@ -39,7 +39,7 @@ public class EnumOrdinalCodec> extends MappingCodec enumClass) { + public EnumOrdinalCodec(@Nonnull Class enumClass) { super( TypeCodecs.INT, GenericType.of(Objects.requireNonNull(enumClass, "enumClass must not be null"))); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/json/JsonCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/json/JsonCodec.java index a971d27b3f3..4b22e7fef9c 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/json/JsonCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/json/JsonCodec.java @@ -28,11 +28,11 @@ import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.type.TypeFactory; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.IOException; import java.nio.ByteBuffer; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A JSON codec that maps arbitrary Java objects to JSON strings stored as CQL type {@code text}, @@ -69,7 +69,7 @@ public class JsonCodec implements TypeCodec { * * @param javaClass the Java class this codec maps to. */ - public JsonCodec(@NonNull Class javaClass) { + public JsonCodec(@Nonnull Class javaClass) { this(GenericType.of(Objects.requireNonNull(javaClass, "javaClass cannot be null"))); } @@ -84,7 +84,7 @@ public JsonCodec(@NonNull Class javaClass) { * * @param javaType the Java type this codec maps to. */ - public JsonCodec(@NonNull GenericType javaType) { + public JsonCodec(@Nonnull GenericType javaType) { this(javaType, new ObjectMapper()); } @@ -95,7 +95,7 @@ public JsonCodec(@NonNull GenericType javaType) { * @param javaClass the Java class this codec maps to. * @param objectMapper the {@link ObjectMapper} instance to use. */ - public JsonCodec(@NonNull Class javaClass, @NonNull ObjectMapper objectMapper) { + public JsonCodec(@Nonnull Class javaClass, @Nonnull ObjectMapper objectMapper) { this( GenericType.of(Objects.requireNonNull(javaClass, "javaClass cannot be null")), objectMapper); @@ -108,19 +108,19 @@ public JsonCodec(@NonNull Class javaClass, @NonNull ObjectMapper objectMapper * @param javaType the Java type this codec maps to. * @param objectMapper the {@link ObjectMapper} instance to use. */ - public JsonCodec(@NonNull GenericType javaType, @NonNull ObjectMapper objectMapper) { + public JsonCodec(@Nonnull GenericType javaType, @Nonnull ObjectMapper objectMapper) { this.javaType = Objects.requireNonNull(javaType, "javaType cannot be null"); this.objectMapper = Objects.requireNonNull(objectMapper, "objectMapper cannot be null"); this.jacksonJavaType = TypeFactory.defaultInstance().constructType(javaType.getType()); } - @NonNull + @Nonnull @Override public GenericType getJavaType() { return javaType; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.TEXT; @@ -128,7 +128,7 @@ public DataType getCqlType() { @Nullable @Override - public ByteBuffer encode(@Nullable T value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(@Nullable T value, @Nonnull ProtocolVersion protocolVersion) { if (value == null) { return null; } @@ -141,7 +141,7 @@ public ByteBuffer encode(@Nullable T value, @NonNull ProtocolVersion protocolVer @Nullable @Override - public T decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public T decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null) { return null; } @@ -152,7 +152,7 @@ public T decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVer } } - @NonNull + @Nonnull @Override public String format(@Nullable T value) { if (value == null) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/time/LocalTimestampCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/time/LocalTimestampCodec.java index 6b66b5d2049..2337f41d25a 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/time/LocalTimestampCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/time/LocalTimestampCodec.java @@ -21,12 +21,12 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.internal.core.type.codec.TimestampCodec; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; /** @@ -57,7 +57,7 @@ public LocalTimestampCodec() { * timeZone} will also be used to parse CQL timestamp literals that do not include any time zone * information. */ - public LocalTimestampCodec(@NonNull ZoneId timeZone) { + public LocalTimestampCodec(@Nonnull ZoneId timeZone) { super( new TimestampCodec(Objects.requireNonNull(timeZone, "timeZone cannot be null")), GenericType.LOCAL_DATE_TIME); @@ -65,7 +65,7 @@ public LocalTimestampCodec(@NonNull ZoneId timeZone) { } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { Objects.requireNonNull(value); return value instanceof LocalDateTime; } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/time/PersistentZonedTimestampCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/time/PersistentZonedTimestampCodec.java index c16a64b9ad9..df0ccb2787c 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/time/PersistentZonedTimestampCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/time/PersistentZonedTimestampCodec.java @@ -25,12 +25,12 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.codec.TypeCodecs; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.time.Instant; import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; /** @@ -55,18 +55,18 @@ public PersistentZonedTimestampCodec() { } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { Objects.requireNonNull(value); return value instanceof ZonedDateTime; } - @NonNull + @Nonnull @Override public TupleType getCqlType() { return CQL_TYPE; } - @NonNull + @Nonnull @Override public String format(@Nullable ZonedDateTime value) { if (value == null) { diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/time/TimestampMillisCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/time/TimestampMillisCodec.java index a15495a432d..0cf35f34605 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/time/TimestampMillisCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/time/TimestampMillisCodec.java @@ -25,12 +25,12 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodecs; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.internal.core.type.codec.TimestampCodec; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.time.Instant; import java.time.ZoneId; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; /** @@ -66,38 +66,38 @@ public TimestampMillisCodec(ZoneId defaultZoneId) { timestampCodec = new TimestampCodec(defaultZoneId); } - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.LONG; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.TIMESTAMP; } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { return javaClass == Long.class || javaClass == long.class; } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { Objects.requireNonNull(value); return value instanceof Long; } @Nullable @Override - public ByteBuffer encodePrimitive(long value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encodePrimitive(long value, @Nonnull ProtocolVersion protocolVersion) { return TypeCodecs.BIGINT.encodePrimitive(value, protocolVersion); } @Override public long decodePrimitive( - @Nullable ByteBuffer value, @NonNull ProtocolVersion protocolVersion) { + @Nullable ByteBuffer value, @Nonnull ProtocolVersion protocolVersion) { return TypeCodecs.BIGINT.decodePrimitive(value, protocolVersion); } @@ -108,7 +108,7 @@ public Long parse(@Nullable String value) { return instant == null ? null : instant.toEpochMilli(); } - @NonNull + @Nonnull @Override public String format(@Nullable Long value) { Instant instant = value == null ? null : Instant.ofEpochMilli(value); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/time/ZonedTimestampCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/time/ZonedTimestampCodec.java index a0947ff3493..80e9bea161a 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/time/ZonedTimestampCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/time/ZonedTimestampCodec.java @@ -20,12 +20,12 @@ import com.datastax.oss.driver.api.core.type.codec.MappingCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.internal.core.type.codec.TimestampCodec; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.time.Instant; import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; /** @@ -71,7 +71,7 @@ public ZonedTimestampCodec(ZoneId timeZone) { } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { Objects.requireNonNull(value); return value instanceof ZonedDateTime; } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/vector/AbstractVectorToArrayCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/vector/AbstractVectorToArrayCodec.java index 3e4e844783c..aff9364128b 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/vector/AbstractVectorToArrayCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/vector/AbstractVectorToArrayCodec.java @@ -22,24 +22,24 @@ import com.datastax.oss.driver.api.core.type.VectorType; import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.lang.reflect.Array; import java.nio.ByteBuffer; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** Common super-class for all codecs which map a CQL vector type onto a primitive array */ public abstract class AbstractVectorToArrayCodec implements TypeCodec { - @NonNull protected final VectorType cqlType; - @NonNull protected final GenericType javaType; + @Nonnull protected final VectorType cqlType; + @Nonnull protected final GenericType javaType; /** * @param cqlType The CQL type. Must be a list type. * @param arrayType The Java type. Must be an array class. */ protected AbstractVectorToArrayCodec( - @NonNull VectorType cqlType, @NonNull GenericType arrayType) { + @Nonnull VectorType cqlType, @Nonnull GenericType arrayType) { this.cqlType = Objects.requireNonNull(cqlType, "cqlType cannot be null"); this.javaType = Objects.requireNonNull(arrayType, "arrayType cannot be null"); if (!arrayType.isArray()) { @@ -47,13 +47,13 @@ protected AbstractVectorToArrayCodec( } } - @NonNull + @Nonnull @Override public GenericType getJavaType() { return this.javaType; } - @NonNull + @Nonnull @Override public DataType getCqlType() { return this.cqlType; @@ -61,7 +61,7 @@ public DataType getCqlType() { @Nullable @Override - public ByteBuffer encode(@Nullable ArrayT array, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(@Nullable ArrayT array, @Nonnull ProtocolVersion protocolVersion) { if (array == null) { return null; } @@ -77,7 +77,7 @@ public ByteBuffer encode(@Nullable ArrayT array, @NonNull ProtocolVersion protoc @Nullable @Override - public ArrayT decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public ArrayT decode(@Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null || bytes.remaining() == 0) { throw new IllegalArgumentException( "Input ByteBuffer must not be null and must have non-zero remaining bytes"); @@ -102,7 +102,7 @@ public ArrayT decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protoc * * @return a new array instance with a size matching the specified vector. */ - @NonNull + @Nonnull protected abstract ArrayT newInstance(); /** @@ -121,10 +121,10 @@ public ArrayT decode(@Nullable ByteBuffer bytes, @NonNull ProtocolVersion protoc * @param protocolVersion The protocol version to use. */ protected abstract void serializeElement( - @NonNull ByteBuffer output, - @NonNull ArrayT array, + @Nonnull ByteBuffer output, + @Nonnull ArrayT array, int index, - @NonNull ProtocolVersion protocolVersion); + @Nonnull ProtocolVersion protocolVersion); /** * Read the {@code index}th element of {@code array} from {@code input}. @@ -135,8 +135,8 @@ protected abstract void serializeElement( * @param protocolVersion The protocol version to use. */ protected abstract void deserializeElement( - @NonNull ByteBuffer input, - @NonNull ArrayT array, + @Nonnull ByteBuffer input, + @Nonnull ArrayT array, int index, - @NonNull ProtocolVersion protocolVersion); + @Nonnull ProtocolVersion protocolVersion); } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/vector/FloatVectorToArrayCodec.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/vector/FloatVectorToArrayCodec.java index 86f31dc4980..8d2765f8350 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/vector/FloatVectorToArrayCodec.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/extras/vector/FloatVectorToArrayCodec.java @@ -23,12 +23,12 @@ import com.datastax.oss.driver.internal.core.type.codec.FloatCodec; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; import com.datastax.oss.driver.shaded.guava.common.base.Splitter; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Iterator; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** A codec that maps CQL vectors to the Java type {@code float[]}. */ public class FloatVectorToArrayCodec extends AbstractVectorToArrayCodec { @@ -38,18 +38,18 @@ public FloatVectorToArrayCodec(VectorType type) { } @Override - public boolean accepts(@NonNull Class javaClass) { + public boolean accepts(@Nonnull Class javaClass) { Objects.requireNonNull(javaClass); return float[].class.equals(javaClass); } @Override - public boolean accepts(@NonNull Object value) { + public boolean accepts(@Nonnull Object value) { Objects.requireNonNull(value); return value instanceof float[]; } - @NonNull + @Nonnull @Override protected float[] newInstance() { return new float[cqlType.getDimensions()]; @@ -62,23 +62,23 @@ protected int sizeOfComponentType() { @Override protected void serializeElement( - @NonNull ByteBuffer output, - @NonNull float[] array, + @Nonnull ByteBuffer output, + @Nonnull float[] array, int index, - @NonNull ProtocolVersion protocolVersion) { + @Nonnull ProtocolVersion protocolVersion) { output.putFloat(array[index]); } @Override protected void deserializeElement( - @NonNull ByteBuffer input, - @NonNull float[] array, + @Nonnull ByteBuffer input, + @Nonnull float[] array, int index, - @NonNull ProtocolVersion protocolVersion) { + @Nonnull ProtocolVersion protocolVersion) { array[index] = input.getFloat(); } - @NonNull + @Nonnull @Override public String format(@Nullable float[] value) { return value == null ? "NULL" : Arrays.toString(value); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/registry/CachingCodecRegistry.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/registry/CachingCodecRegistry.java index 495d6227d93..cd8e0b09638 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/registry/CachingCodecRegistry.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/registry/CachingCodecRegistry.java @@ -40,8 +40,6 @@ import com.datastax.oss.driver.shaded.guava.common.reflect.TypeToken; import com.datastax.oss.protocol.internal.ProtocolConstants; import com.datastax.oss.protocol.internal.util.IntMap; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.math.BigDecimal; @@ -59,6 +57,8 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -91,7 +91,7 @@ public abstract class CachingCodecRegistry implements MutableCodecRegistry { private final Lock registerLock = new ReentrantLock(); protected CachingCodecRegistry( - @NonNull String logPrefix, @NonNull TypeCodec[] primitiveCodecs) { + @Nonnull String logPrefix, @Nonnull TypeCodec[] primitiveCodecs) { this.logPrefix = logPrefix; this.primitiveCodecs = primitiveCodecs; this.primitiveCodecsByCode = sortByProtocolCode(primitiveCodecs); @@ -105,9 +105,9 @@ protected CachingCodecRegistry( */ @Deprecated protected CachingCodecRegistry( - @NonNull String logPrefix, - @NonNull TypeCodec[] primitiveCodecs, - @NonNull TypeCodec[] userCodecs) { + @Nonnull String logPrefix, + @Nonnull TypeCodec[] primitiveCodecs, + @Nonnull TypeCodec[] userCodecs) { this(logPrefix, primitiveCodecs); register(userCodecs); } @@ -173,18 +173,18 @@ private boolean collides(TypeCodec newCodec, TypeCodec oldCodec) { protected abstract TypeCodec getCachedCodec( @Nullable DataType cqlType, @Nullable GenericType javaType, boolean isJavaCovariant); - @NonNull + @Nonnull @Override public TypeCodec codecFor( - @NonNull DataType cqlType, @NonNull GenericType javaType) { + @Nonnull DataType cqlType, @Nonnull GenericType javaType) { return codecFor(cqlType, javaType, false); } // Not exposed publicly, (isJavaCovariant=true) is only used for internal recursion - @NonNull + @Nonnull protected TypeCodec codecFor( - @NonNull DataType cqlType, - @NonNull GenericType javaType, + @Nonnull DataType cqlType, + @Nonnull GenericType javaType, boolean isJavaCovariant) { LOG.trace("[{}] Looking up codec for {} <-> {}", logPrefix, cqlType, javaType); TypeCodec primitiveCodec = primitiveCodecsByCode.get(cqlType.getProtocolCode()); @@ -201,10 +201,10 @@ protected TypeCodec codecFor( return uncheckedCast(getCachedCodec(cqlType, javaType, isJavaCovariant)); } - @NonNull + @Nonnull @Override public TypeCodec codecFor( - @NonNull DataType cqlType, @NonNull Class javaType) { + @Nonnull DataType cqlType, @Nonnull Class javaType) { LOG.trace("[{}] Looking up codec for {} <-> {}", logPrefix, cqlType, javaType); TypeCodec primitiveCodec = primitiveCodecsByCode.get(cqlType.getProtocolCode()); if (primitiveCodec != null && primitiveCodec.accepts(javaType)) { @@ -220,9 +220,9 @@ public TypeCodec codecFor( return uncheckedCast(getCachedCodec(cqlType, GenericType.of(javaType), false)); } - @NonNull + @Nonnull @Override - public TypeCodec codecFor(@NonNull DataType cqlType) { + public TypeCodec codecFor(@Nonnull DataType cqlType) { LOG.trace("[{}] Looking up codec for CQL type {}", logPrefix, cqlType); TypeCodec primitiveCodec = primitiveCodecsByCode.get(cqlType.getProtocolCode()); if (primitiveCodec != null) { @@ -238,10 +238,10 @@ public TypeCodec codecFor(@NonNull DataType cqlType) { return uncheckedCast(getCachedCodec(cqlType, null, false)); } - @NonNull + @Nonnull @Override public TypeCodec codecFor( - @NonNull DataType cqlType, @NonNull JavaTypeT value) { + @Nonnull DataType cqlType, @Nonnull JavaTypeT value) { Preconditions.checkNotNull(cqlType); Preconditions.checkNotNull(value); LOG.trace("[{}] Looking up codec for CQL type {} and object {}", logPrefix, cqlType, value); @@ -263,9 +263,9 @@ public TypeCodec codecFor( return uncheckedCast(getCachedCodec(cqlType, javaType, true)); } - @NonNull + @Nonnull @Override - public TypeCodec codecFor(@NonNull JavaTypeT value) { + public TypeCodec codecFor(@Nonnull JavaTypeT value) { Preconditions.checkNotNull(value); LOG.trace("[{}] Looking up codec for object {}", logPrefix, value); @@ -292,16 +292,16 @@ public TypeCodec codecFor(@NonNull JavaTypeT value) { return uncheckedCast(getCachedCodec(cqlType, javaType, true)); } - @NonNull + @Nonnull @Override - public TypeCodec codecFor(@NonNull GenericType javaType) { + public TypeCodec codecFor(@Nonnull GenericType javaType) { return codecFor(javaType, false); } // Not exposed publicly, (isJavaCovariant=true) is only used for internal recursion - @NonNull + @Nonnull protected TypeCodec codecFor( - @NonNull GenericType javaType, boolean isJavaCovariant) { + @Nonnull GenericType javaType, boolean isJavaCovariant) { LOG.trace( "[{}] Looking up codec for Java type {} (covariant = {})", logPrefix, @@ -323,12 +323,12 @@ protected TypeCodec codecFor( } protected boolean matches( - @NonNull TypeCodec codec, @NonNull GenericType javaType, boolean isJavaCovariant) { + @Nonnull TypeCodec codec, @Nonnull GenericType javaType, boolean isJavaCovariant) { return isJavaCovariant ? codec.getJavaType().isSupertypeOf(javaType) : codec.accepts(javaType); } - @NonNull - protected GenericType inspectType(@NonNull Object value, @Nullable DataType cqlType) { + @Nonnull + protected GenericType inspectType(@Nonnull Object value, @Nullable DataType cqlType) { if (value instanceof List) { List list = (List) value; if (list.isEmpty()) { @@ -406,8 +406,8 @@ protected GenericType inspectType(@NonNull Object value, @Nullable DataType c } } - @NonNull - protected GenericType inferJavaTypeFromCqlType(@NonNull DataType cqlType) { + @Nonnull + protected GenericType inferJavaTypeFromCqlType(@Nonnull DataType cqlType) { if (cqlType instanceof ListType) { DataType elementType = ((ListType) cqlType).getElementType(); return GenericType.listOf(inferJavaTypeFromCqlType(elementType)); @@ -474,7 +474,7 @@ protected GenericType inferJavaTypeFromCqlType(@NonNull DataType cqlType) { } @Nullable - protected DataType inferCqlTypeFromValue(@NonNull Object value) { + protected DataType inferCqlTypeFromValue(@Nonnull Object value) { if (value instanceof List) { List list = (List) value; if (list.isEmpty()) { @@ -609,7 +609,7 @@ private TypeCodec getElementCodecForJavaType( } // Try to create a codec when we haven't found it in the cache - @NonNull + @Nonnull protected TypeCodec createCodec( @Nullable DataType cqlType, @Nullable GenericType javaType, boolean isJavaCovariant) { LOG.trace("[{}] Cache miss, creating codec", logPrefix); @@ -670,8 +670,8 @@ protected TypeCodec createCodec( // Try to create a codec when we haven't found it in the cache. // Variant where the CQL type is unknown. Can be covariant if we come from a lookup by Java value. - @NonNull - protected TypeCodec createCodec(@NonNull GenericType javaType, boolean isJavaCovariant) { + @Nonnull + protected TypeCodec createCodec(@Nonnull GenericType javaType, boolean isJavaCovariant) { TypeToken token = javaType.__getToken(); if (List.class.isAssignableFrom(token.getRawType()) && token.getType() instanceof ParameterizedType) { @@ -700,8 +700,8 @@ protected TypeCodec createCodec(@NonNull GenericType javaType, boolean isJ // Try to create a codec when we haven't found it in the cache. // Variant where the Java type is unknown. - @NonNull - protected TypeCodec createCodec(@NonNull DataType cqlType) { + @Nonnull + protected TypeCodec createCodec(@Nonnull DataType cqlType) { if (cqlType instanceof ListType) { DataType elementType = ((ListType) cqlType).getElementType(); TypeCodec elementCodec = codecFor(elementType); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/registry/DefaultCodecRegistry.java b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/registry/DefaultCodecRegistry.java index cfd053ea56e..13dae0b391c 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/registry/DefaultCodecRegistry.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/registry/DefaultCodecRegistry.java @@ -28,11 +28,11 @@ import com.datastax.oss.driver.shaded.guava.common.cache.RemovalListener; import com.datastax.oss.driver.shaded.guava.common.util.concurrent.ExecutionError; import com.datastax.oss.driver.shaded.guava.common.util.concurrent.UncheckedExecutionException; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Objects; import java.util.function.BiConsumer; import java.util.function.BiFunction; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +53,7 @@ public class DefaultCodecRegistry extends CachingCodecRegistry { * Creates a new instance that accepts user codecs, with the default built-in codecs and the * default cache behavior. */ - public DefaultCodecRegistry(@NonNull String logPrefix) { + public DefaultCodecRegistry(@Nonnull String logPrefix) { this(logPrefix, CodecRegistryConstants.PRIMITIVE_CODECS); } @@ -61,7 +61,7 @@ public DefaultCodecRegistry(@NonNull String logPrefix) { * Creates a new instance that accepts user codecs, with the given built-in codecs and the default * cache behavior. */ - public DefaultCodecRegistry(@NonNull String logPrefix, @NonNull TypeCodec... primitiveCodecs) { + public DefaultCodecRegistry(@Nonnull String logPrefix, @Nonnull TypeCodec... primitiveCodecs) { this(logPrefix, 0, null, 0, null, primitiveCodecs); } @@ -75,12 +75,12 @@ public DefaultCodecRegistry(@NonNull String logPrefix, @NonNull TypeCodec... * eviction is that useful anyway. */ public DefaultCodecRegistry( - @NonNull String logPrefix, + @Nonnull String logPrefix, int initialCacheCapacity, @Nullable BiFunction, Integer> cacheWeigher, int maximumCacheWeight, @Nullable BiConsumer> cacheRemovalListener, - @NonNull TypeCodec... primitiveCodecs) { + @Nonnull TypeCodec... primitiveCodecs) { super(logPrefix, primitiveCodecs); CacheBuilder cacheBuilder = CacheBuilder.newBuilder(); @@ -93,7 +93,7 @@ public DefaultCodecRegistry( CacheLoader> cacheLoader = new CacheLoader>() { @Override - public TypeCodec load(@NonNull CacheKey key) throws Exception { + public TypeCodec load(@Nonnull CacheKey key) throws Exception { return createCodec(key.cqlType, key.javaType, key.isJavaCovariant); } }; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/util/ArrayUtils.java b/core/src/main/java/com/datastax/oss/driver/internal/core/util/ArrayUtils.java index f5fcb98e8b7..b7276d95de6 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/util/ArrayUtils.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/util/ArrayUtils.java @@ -17,12 +17,12 @@ */ package com.datastax.oss.driver.internal.core.util; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.concurrent.ThreadLocalRandom; +import javax.annotation.Nonnull; public class ArrayUtils { - public static void swap(@NonNull ElementT[] elements, int i, int j) { + public static void swap(@Nonnull ElementT[] elements, int i, int j) { if (i != j) { ElementT tmp = elements[i]; elements[i] = elements[j]; @@ -35,7 +35,7 @@ public static void swap(@NonNull ElementT[] elements, int i, int j) { * the right (no-op if {@code targetIndex >= sourceIndex}). */ public static void bubbleUp( - @NonNull ElementT[] elements, int sourceIndex, int targetIndex) { + @Nonnull ElementT[] elements, int sourceIndex, int targetIndex) { for (int i = sourceIndex; i > targetIndex; i--) { swap(elements, i, i - 1); } @@ -46,7 +46,7 @@ public static void bubbleUp( * left (no-op if {@code targetIndex <= sourceIndex}). */ public static void bubbleDown( - @NonNull ElementT[] elements, int sourceIndex, int targetIndex) { + @Nonnull ElementT[] elements, int sourceIndex, int targetIndex) { for (int i = sourceIndex; i < targetIndex; i++) { swap(elements, i, i + 1); } @@ -61,7 +61,7 @@ public static void bubbleDown( * href="https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle#The_modern_algorithm">Modern * Fisher-Yates shuffle */ - public static void shuffleHead(@NonNull ElementT[] elements, int n) { + public static void shuffleHead(@Nonnull ElementT[] elements, int n) { shuffleHead(elements, n, ThreadLocalRandom.current()); } @@ -77,7 +77,7 @@ public static void shuffleHead(@NonNull ElementT[] elements, int n) { * Fisher-Yates shuffle */ public static void shuffleHead( - @NonNull ElementT[] elements, int n, @NonNull ThreadLocalRandom random) { + @Nonnull ElementT[] elements, int n, @Nonnull ThreadLocalRandom random) { if (n > elements.length) { throw new ArrayIndexOutOfBoundsException( String.format( @@ -93,7 +93,7 @@ public static void shuffleHead( /** Rotates the elements in the specified range by the specified amount (round-robin). */ public static void rotate( - @NonNull ElementT[] elements, int startIndex, int length, int amount) { + @Nonnull ElementT[] elements, int startIndex, int length, int amount) { if (length >= 2) { amount = amount % length; // Repeatedly shift by 1. This is not the most time-efficient but the array will typically be diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/util/Reflection.java b/core/src/main/java/com/datastax/oss/driver/internal/core/util/Reflection.java index 75a8f5b7380..392bc6999ea 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/util/Reflection.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/util/Reflection.java @@ -27,14 +27,14 @@ import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; import com.datastax.oss.driver.shaded.guava.common.collect.ListMultimap; import com.datastax.oss.driver.shaded.guava.common.collect.MultimapBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Optional; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,7 +51,7 @@ public class Reflection { * @return null if the class does not exist or could not be loaded. */ @Nullable - public static Class loadClass(@Nullable ClassLoader classLoader, @NonNull String className) { + public static Class loadClass(@Nullable ClassLoader classLoader, @Nonnull String className) { try { Class clazz; if (classLoader == null) { @@ -276,7 +276,7 @@ public static ImmutableList buildFromConfigList( return components.build(); } - @NonNull + @Nonnull private static ComponentT resolveClass( InternalDriverContext context, String profileName, diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/util/RoutingKey.java b/core/src/main/java/com/datastax/oss/driver/internal/core/util/RoutingKey.java index 7d8895d228f..3e6ddea0c63 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/util/RoutingKey.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/util/RoutingKey.java @@ -17,14 +17,14 @@ */ package com.datastax.oss.driver.internal.core.util; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; +import javax.annotation.Nonnull; public class RoutingKey { /** Assembles multiple routing key components into a single buffer. */ - @NonNull - public static ByteBuffer compose(@NonNull ByteBuffer... components) { + @Nonnull + public static ByteBuffer compose(@Nonnull ByteBuffer... components) { if (components.length == 1) return components[0]; int totalLength = 0; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/util/collection/CompositeQueryPlan.java b/core/src/main/java/com/datastax/oss/driver/internal/core/util/collection/CompositeQueryPlan.java index 10ca8c0c48d..b4df5e63fc4 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/util/collection/CompositeQueryPlan.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/util/collection/CompositeQueryPlan.java @@ -19,14 +19,14 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.shaded.guava.common.collect.Iterators; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.AbstractQueue; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Queue; import java.util.concurrent.atomic.AtomicInteger; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; /** A query plan that encompasses many child plans, and consumes them one by one. */ @@ -37,7 +37,7 @@ public class CompositeQueryPlan extends AbstractQueue implements QueryPlan private final AtomicInteger currentPlan = new AtomicInteger(0); @SafeVarargs - public CompositeQueryPlan(@NonNull Queue... plans) { + public CompositeQueryPlan(@Nonnull Queue... plans) { if (plans.length == 0) { throw new IllegalArgumentException("at least one child plan must be provided"); } @@ -67,7 +67,7 @@ public Node poll() { } } - @NonNull + @Nonnull @Override public Iterator iterator() { List> its = new ArrayList<>(plans.length); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/util/collection/EmptyQueryPlan.java b/core/src/main/java/com/datastax/oss/driver/internal/core/util/collection/EmptyQueryPlan.java index 53177147695..8054fed4125 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/util/collection/EmptyQueryPlan.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/util/collection/EmptyQueryPlan.java @@ -18,10 +18,10 @@ package com.datastax.oss.driver.internal.core.util.collection; import com.datastax.oss.driver.api.core.metadata.Node; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.AbstractQueue; import java.util.Collections; import java.util.Iterator; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -32,7 +32,7 @@ public Node poll() { return null; } - @NonNull + @Nonnull @Override public Iterator iterator() { return Collections.emptyIterator(); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/util/collection/QueryPlan.java b/core/src/main/java/com/datastax/oss/driver/internal/core/util/collection/QueryPlan.java index 371e100a0e2..c1b2c943aa6 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/util/collection/QueryPlan.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/util/collection/QueryPlan.java @@ -20,9 +20,9 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.api.core.session.Request; import com.datastax.oss.driver.api.core.session.Session; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Iterator; import java.util.Queue; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; /** @@ -61,7 +61,7 @@ public interface QueryPlan extends Queue { * queue at the time of the call, and are not affected by further modifications. Successive calls * to this method will return different objects. */ - @NonNull + @Nonnull @Override Iterator iterator(); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/util/collection/QueryPlanBase.java b/core/src/main/java/com/datastax/oss/driver/internal/core/util/collection/QueryPlanBase.java index 43f369f636a..2cb4dea773c 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/util/collection/QueryPlanBase.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/util/collection/QueryPlanBase.java @@ -19,13 +19,13 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.shaded.guava.common.collect.Iterators; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.AbstractQueue; import java.util.Arrays; import java.util.Collections; import java.util.Iterator; import java.util.concurrent.atomic.AtomicInteger; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.ThreadSafe; @ThreadSafe @@ -56,7 +56,7 @@ public Node poll() { return (i >= nodes.length) ? null : (Node) nodes[i]; } - @NonNull + @Nonnull @Override public Iterator iterator() { int i = nextIndex.get(); diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/util/collection/SimpleQueryPlan.java b/core/src/main/java/com/datastax/oss/driver/internal/core/util/collection/SimpleQueryPlan.java index 4e0df8d2354..6b2297e34f8 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/util/collection/SimpleQueryPlan.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/util/collection/SimpleQueryPlan.java @@ -18,7 +18,7 @@ package com.datastax.oss.driver.internal.core.util.collection; import com.datastax.oss.driver.api.core.metadata.Node; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; /** Query plan where nodes must be provided at construction time. */ @@ -36,7 +36,7 @@ public class SimpleQueryPlan extends QueryPlanBase { * * @param nodes the nodes to initially fill the queue with. */ - public SimpleQueryPlan(@NonNull Object... nodes) { + public SimpleQueryPlan(@Nonnull Object... nodes) { this.nodes = nodes; } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/util/concurrent/BlockingOperation.java b/core/src/main/java/com/datastax/oss/driver/internal/core/util/concurrent/BlockingOperation.java index 3f2d10b62e0..71a4e5425ba 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/util/concurrent/BlockingOperation.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/util/concurrent/BlockingOperation.java @@ -17,9 +17,9 @@ */ package com.datastax.oss.driver.internal.core.util.concurrent; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.util.concurrent.FastThreadLocalThread; import java.util.concurrent.ThreadFactory; +import javax.annotation.Nonnull; /** * Safeguards against bad usage patterns in client code that could introduce deadlocks in the @@ -56,7 +56,7 @@ public static void checkNotDriverThread() { */ public static class SafeThreadFactory implements ThreadFactory { @Override - public Thread newThread(@NonNull Runnable r) { + public Thread newThread(@Nonnull Runnable r) { return new InternalThread(r); } } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/util/concurrent/PromiseCombiner.java b/core/src/main/java/com/datastax/oss/driver/internal/core/util/concurrent/PromiseCombiner.java index b854820403d..810e7b4ad06 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/util/concurrent/PromiseCombiner.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/util/concurrent/PromiseCombiner.java @@ -17,12 +17,12 @@ */ package com.datastax.oss.driver.internal.core.util.concurrent; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; import io.netty.util.concurrent.Promise; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; +import javax.annotation.Nonnull; import net.jcip.annotations.ThreadSafe; /** @@ -40,7 +40,7 @@ public class PromiseCombiner { * @param parents The parent futures. */ public static void combine( - @NonNull Promise aggregatePromise, @NonNull Future... parents) { + @Nonnull Promise aggregatePromise, @Nonnull Future... parents) { PromiseCombinerListener listener = new PromiseCombinerListener(aggregatePromise, parents.length); for (Future parent : parents) { diff --git a/core/src/test/java/com/datastax/dse/driver/DseTestDataProviders.java b/core/src/test/java/com/datastax/dse/driver/DseTestDataProviders.java index 7d9aecc28ed..872f0399225 100644 --- a/core/src/test/java/com/datastax/dse/driver/DseTestDataProviders.java +++ b/core/src/test/java/com/datastax/dse/driver/DseTestDataProviders.java @@ -26,9 +26,9 @@ import com.datastax.oss.driver.TestDataProviders; import com.datastax.oss.driver.api.core.DefaultProtocolVersion; import com.tngtech.java.junit.dataprovider.DataProvider; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Arrays; import java.util.stream.Stream; +import javax.annotation.Nonnull; public class DseTestDataProviders { @@ -90,7 +90,7 @@ public static Object[][] allDseProtocolVersionsAndSupportedGraphProtocols() { return TestDataProviders.combine(allDseProtocolVersions(), supportedGraphProtocols()); } - @NonNull + @Nonnull private static Object[][] concat(Object[]... values) { return Stream.of(values) .flatMap(Arrays::stream) diff --git a/core/src/test/java/com/datastax/dse/driver/internal/core/cql/reactive/MockAsyncResultSet.java b/core/src/test/java/com/datastax/dse/driver/internal/core/cql/reactive/MockAsyncResultSet.java index 3783a2c6922..c31a7110a67 100644 --- a/core/src/test/java/com/datastax/dse/driver/internal/core/cql/reactive/MockAsyncResultSet.java +++ b/core/src/test/java/com/datastax/dse/driver/internal/core/cql/reactive/MockAsyncResultSet.java @@ -23,12 +23,12 @@ import com.datastax.oss.driver.api.core.cql.ColumnDefinitions; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.api.core.cql.Row; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Iterator; import java.util.List; import java.util.concurrent.CompletionStage; import java.util.stream.Collectors; import java.util.stream.IntStream; +import javax.annotation.Nonnull; import org.assertj.core.util.Lists; public class MockAsyncResultSet implements AsyncResultSet { @@ -63,7 +63,7 @@ public int remaining() { return remaining; } - @NonNull + @Nonnull @Override public List currentPage() { return Lists.newArrayList(rows); @@ -74,19 +74,19 @@ public boolean hasMorePages() { return nextPage != null; } - @NonNull + @Nonnull @Override public CompletionStage fetchNextPage() throws IllegalStateException { return nextPage; } - @NonNull + @Nonnull @Override public ColumnDefinitions getColumnDefinitions() { return columnDefinitions; } - @NonNull + @Nonnull @Override public ExecutionInfo getExecutionInfo() { return executionInfo; diff --git a/core/src/test/java/com/datastax/dse/driver/internal/core/cql/reactive/MockRow.java b/core/src/test/java/com/datastax/dse/driver/internal/core/cql/reactive/MockRow.java index 792bfb432f6..5e3b7a08a3c 100644 --- a/core/src/test/java/com/datastax/dse/driver/internal/core/cql/reactive/MockRow.java +++ b/core/src/test/java/com/datastax/dse/driver/internal/core/cql/reactive/MockRow.java @@ -29,10 +29,10 @@ import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry; import com.datastax.oss.driver.internal.core.cql.EmptyColumnDefinitions; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.util.Collections; import java.util.List; +import javax.annotation.Nonnull; class MockRow implements Row { @@ -47,61 +47,61 @@ public int size() { return 0; } - @NonNull + @Nonnull @Override public CodecRegistry codecRegistry() { return mock(CodecRegistry.class); } - @NonNull + @Nonnull @Override public ProtocolVersion protocolVersion() { return DefaultProtocolVersion.V4; } - @NonNull + @Nonnull @Override public ColumnDefinitions getColumnDefinitions() { return EmptyColumnDefinitions.INSTANCE; } - @NonNull + @Nonnull @Override - public List allIndicesOf(@NonNull String name) { + public List allIndicesOf(@Nonnull String name) { return Collections.singletonList(0); } @Override - public int firstIndexOf(@NonNull String name) { + public int firstIndexOf(@Nonnull String name) { return 0; } - @NonNull + @Nonnull @Override - public List allIndicesOf(@NonNull CqlIdentifier id) { + public List allIndicesOf(@Nonnull CqlIdentifier id) { return Collections.singletonList(0); } @Override - public int firstIndexOf(@NonNull CqlIdentifier id) { + public int firstIndexOf(@Nonnull CqlIdentifier id) { return 0; } - @NonNull + @Nonnull @Override public DataType getType(int i) { return DataTypes.INT; } - @NonNull + @Nonnull @Override - public DataType getType(@NonNull String name) { + public DataType getType(@Nonnull String name) { return DataTypes.INT; } - @NonNull + @Nonnull @Override - public DataType getType(@NonNull CqlIdentifier id) { + public DataType getType(@Nonnull CqlIdentifier id) { return DataTypes.INT; } @@ -116,7 +116,7 @@ public boolean isDetached() { } @Override - public void attach(@NonNull AttachmentPoint attachmentPoint) {} + public void attach(@Nonnull AttachmentPoint attachmentPoint) {} // equals and hashCode required for TCK tests that check that two subscribers // receive the exact same set of items. diff --git a/core/src/test/java/com/datastax/dse/driver/internal/core/cql/reactive/TestSubscriber.java b/core/src/test/java/com/datastax/dse/driver/internal/core/cql/reactive/TestSubscriber.java index aed7a4dfc8e..f489410c12b 100644 --- a/core/src/test/java/com/datastax/dse/driver/internal/core/cql/reactive/TestSubscriber.java +++ b/core/src/test/java/com/datastax/dse/driver/internal/core/cql/reactive/TestSubscriber.java @@ -20,12 +20,12 @@ import static org.assertj.core.api.Fail.fail; import com.datastax.oss.driver.shaded.guava.common.util.concurrent.Uninterruptibles; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; @@ -75,7 +75,7 @@ public Throwable getError() { return error; } - @NonNull + @Nonnull public List getElements() { return elements; } diff --git a/core/src/test/java/com/datastax/dse/driver/internal/core/graph/GraphStatementBuilderBaseTest.java b/core/src/test/java/com/datastax/dse/driver/internal/core/graph/GraphStatementBuilderBaseTest.java index 4799437e617..f020e9d375a 100644 --- a/core/src/test/java/com/datastax/dse/driver/internal/core/graph/GraphStatementBuilderBaseTest.java +++ b/core/src/test/java/com/datastax/dse/driver/internal/core/graph/GraphStatementBuilderBaseTest.java @@ -24,7 +24,7 @@ import com.datastax.dse.driver.api.core.graph.FluentGraphStatement; import com.datastax.dse.driver.api.core.graph.GraphStatementBuilderBase; import com.datastax.oss.driver.api.core.cql.Statement; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import org.junit.Test; public class GraphStatementBuilderBaseTest { @@ -32,7 +32,7 @@ public class GraphStatementBuilderBaseTest { private static class MockGraphStatementBuilder extends GraphStatementBuilderBase { - @NonNull + @Nonnull @Override public FluentGraphStatement build() { FluentGraphStatement rv = mock(FluentGraphStatement.class); diff --git a/core/src/test/java/com/datastax/dse/driver/internal/core/graph/schema/refresh/GraphSchemaRefreshTest.java b/core/src/test/java/com/datastax/dse/driver/internal/core/graph/schema/refresh/GraphSchemaRefreshTest.java index 0d05f129520..4a059f3fa0b 100644 --- a/core/src/test/java/com/datastax/dse/driver/internal/core/graph/schema/refresh/GraphSchemaRefreshTest.java +++ b/core/src/test/java/com/datastax/dse/driver/internal/core/graph/schema/refresh/GraphSchemaRefreshTest.java @@ -41,10 +41,10 @@ import com.datastax.oss.driver.internal.core.metadata.schema.refresh.SchemaRefresh; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Collections; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -358,7 +358,7 @@ private static DefaultDseKeyspaceMetadata newKeyspace(String name, String graphE } private static DefaultDseKeyspaceMetadata newKeyspace( - CqlIdentifier name, String graphEngine, @NonNull Map tables) { + CqlIdentifier name, String graphEngine, @Nonnull Map tables) { return new DefaultDseKeyspaceMetadata( name, false, @@ -373,8 +373,8 @@ private static DefaultDseKeyspaceMetadata newKeyspace( } private static DefaultDseTableMetadata newTable( - @NonNull CqlIdentifier keyspace, - @NonNull CqlIdentifier name, + @Nonnull CqlIdentifier keyspace, + @Nonnull CqlIdentifier name, @Nullable DseVertexMetadata vertex, @Nullable DseEdgeMetadata edge) { ImmutableList cols = @@ -401,9 +401,9 @@ private static DefaultDseTableMetadata newTable( } private static DefaultDseEdgeMetadata newEdgeMetadata( - @NonNull CqlIdentifier labelName, - @NonNull CqlIdentifier fromTable, - @NonNull CqlIdentifier toTable) { + @Nonnull CqlIdentifier labelName, + @Nonnull CqlIdentifier fromTable, + @Nonnull CqlIdentifier toTable) { return new DefaultDseEdgeMetadata( labelName, fromTable, diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/MockAsyncPagingIterable.java b/core/src/test/java/com/datastax/oss/driver/internal/core/MockAsyncPagingIterable.java index 731c558a81f..85aad60d7bd 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/MockAsyncPagingIterable.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/MockAsyncPagingIterable.java @@ -21,13 +21,13 @@ import com.datastax.oss.driver.api.core.cql.ColumnDefinitions; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; import com.datastax.oss.driver.shaded.guava.common.base.Preconditions; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayDeque; import java.util.Collections; import java.util.List; import java.util.Queue; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; public class MockAsyncPagingIterable implements AsyncPagingIterable> { @@ -50,7 +50,7 @@ public MockAsyncPagingIterable(List elements, int fetchSize, boolean a } } - @NonNull + @Nonnull @Override public Iterable currentPage() { return currentPage; @@ -66,7 +66,7 @@ public boolean hasMorePages() { return nextPage != null; } - @NonNull + @Nonnull @Override public CompletionStage> fetchNextPage() throws IllegalStateException { @@ -74,13 +74,13 @@ public CompletionStage> fetchNextPage() return CompletableFuture.completedFuture(nextPage); } - @NonNull + @Nonnull @Override public ColumnDefinitions getColumnDefinitions() { throw new UnsupportedOperationException("irrelevant"); } - @NonNull + @Nonnull @Override public ExecutionInfo getExecutionInfo() { throw new UnsupportedOperationException("irrelevant"); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/MockPagingIterable.java b/core/src/test/java/com/datastax/oss/driver/internal/core/MockPagingIterable.java index 885983ee98e..6fa095f0e4c 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/MockPagingIterable.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/MockPagingIterable.java @@ -20,9 +20,9 @@ import com.datastax.oss.driver.api.core.PagingIterable; import com.datastax.oss.driver.api.core.cql.ColumnDefinitions; import com.datastax.oss.driver.api.core.cql.ExecutionInfo; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Iterator; import java.util.List; +import javax.annotation.Nonnull; public class MockPagingIterable implements PagingIterable { @@ -32,7 +32,7 @@ public MockPagingIterable(Iterator iterator) { this.iterator = iterator; } - @NonNull + @Nonnull @Override public Iterator iterator() { return iterator; @@ -43,13 +43,13 @@ public boolean isFullyFetched() { return !iterator.hasNext(); } - @NonNull + @Nonnull @Override public ColumnDefinitions getColumnDefinitions() { throw new UnsupportedOperationException("irrelevant"); } - @NonNull + @Nonnull @Override public List getExecutionInfos() { throw new UnsupportedOperationException("irrelevant"); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/channel/EmbeddedEndPoint.java b/core/src/test/java/com/datastax/oss/driver/internal/core/channel/EmbeddedEndPoint.java index 5e463299a66..bbf871fecc7 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/channel/EmbeddedEndPoint.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/channel/EmbeddedEndPoint.java @@ -18,19 +18,19 @@ package com.datastax.oss.driver.internal.core.channel; import com.datastax.oss.driver.api.core.metadata.EndPoint; -import edu.umd.cs.findbugs.annotations.NonNull; import java.net.SocketAddress; +import javax.annotation.Nonnull; /** Endpoint implementation for unit tests that use an embedded Netty channel. */ public class EmbeddedEndPoint implements EndPoint { - @NonNull + @Nonnull @Override public SocketAddress resolve() { throw new UnsupportedOperationException("This should not get called from unit tests"); } - @NonNull + @Nonnull @Override public String asMetricPrefix() { throw new UnsupportedOperationException("This should not get called from unit tests"); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/channel/LocalEndPoint.java b/core/src/test/java/com/datastax/oss/driver/internal/core/channel/LocalEndPoint.java index c90731eece9..a88295316f5 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/channel/LocalEndPoint.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/channel/LocalEndPoint.java @@ -18,9 +18,9 @@ package com.datastax.oss.driver.internal.core.channel; import com.datastax.oss.driver.api.core.metadata.EndPoint; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.channel.local.LocalAddress; import java.net.SocketAddress; +import javax.annotation.Nonnull; /** Endpoint implementation for unit tests that use the local Netty transport. */ public class LocalEndPoint implements EndPoint { @@ -31,13 +31,13 @@ public LocalEndPoint(String id) { this.localAddress = new LocalAddress(id); } - @NonNull + @Nonnull @Override public SocketAddress resolve() { return localAddress; } - @NonNull + @Nonnull @Override public String asMetricPrefix() { throw new UnsupportedOperationException("This should not get called from unit tests"); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/config/MockOptions.java b/core/src/test/java/com/datastax/oss/driver/internal/core/config/MockOptions.java index 25c1e8b26fd..516d67445a5 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/config/MockOptions.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/config/MockOptions.java @@ -18,7 +18,7 @@ package com.datastax.oss.driver.internal.core.config; import com.datastax.oss.driver.api.core.config.DriverOption; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public enum MockOptions implements DriverOption { INT1("int1"), @@ -32,7 +32,7 @@ public enum MockOptions implements DriverOption { this.path = path; } - @NonNull + @Nonnull @Override public String getPath() { return path; diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/BasicLoadBalancingPolicyDistanceTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/BasicLoadBalancingPolicyDistanceTest.java index 5b2b6bf864d..f90f9627bde 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/BasicLoadBalancingPolicyDistanceTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/BasicLoadBalancingPolicyDistanceTest.java @@ -29,8 +29,8 @@ import com.datastax.oss.driver.api.core.metadata.Node; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableSet; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.UUID; +import javax.annotation.Nonnull; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -217,7 +217,7 @@ public void should_report_IGNORED_when_remote_node_up_and_too_many_nodes_for_dc_ assertThat(policy.getLiveNodes().dc("dc2")).containsExactly(node1, node2, node3); } - @NonNull + @Nonnull protected BasicLoadBalancingPolicy createPolicy() { return new BasicLoadBalancingPolicy(context, DriverExecutionProfile.DEFAULT_NAME); } diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/BasicLoadBalancingPolicyEventsTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/BasicLoadBalancingPolicyEventsTest.java index 9959ddbd1bc..60d14303d3f 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/BasicLoadBalancingPolicyEventsTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/BasicLoadBalancingPolicyEventsTest.java @@ -30,8 +30,8 @@ import com.datastax.oss.driver.api.core.loadbalancing.NodeDistanceEvaluator; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableSet; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.UUID; +import javax.annotation.Nonnull; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -159,7 +159,7 @@ public void should_ignore_up_node_when_remote_dc() { assertThat(policy.getLiveNodes().dc("dc2")).isEmpty(); } - @NonNull + @Nonnull protected BasicLoadBalancingPolicy createAndInitPolicy() { BasicLoadBalancingPolicy policy = new BasicLoadBalancingPolicy(context, DriverExecutionProfile.DEFAULT_NAME); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/BasicLoadBalancingPolicyInitTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/BasicLoadBalancingPolicyInitTest.java index 1863e7357e1..05bf9c905a8 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/BasicLoadBalancingPolicyInitTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/BasicLoadBalancingPolicyInitTest.java @@ -32,8 +32,8 @@ import com.datastax.oss.driver.api.core.metadata.NodeState; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableSet; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.UUID; +import javax.annotation.Nonnull; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; @@ -218,7 +218,7 @@ public void should_ignore_nodes_excluded_by_distance_reporter() { assertThat(policy.getLiveNodes().dc("dc1")).containsExactly(node2, node3); } - @NonNull + @Nonnull protected BasicLoadBalancingPolicy createPolicy() { return new BasicLoadBalancingPolicy(context, DriverExecutionProfile.DEFAULT_NAME); } diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DcInferringLoadBalancingPolicyDistanceTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DcInferringLoadBalancingPolicyDistanceTest.java index 80c414aa8f2..0ba7d4f6141 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DcInferringLoadBalancingPolicyDistanceTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DcInferringLoadBalancingPolicyDistanceTest.java @@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import com.datastax.oss.driver.api.core.config.DriverExecutionProfile; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; @@ -46,7 +46,7 @@ public void should_report_LOCAL_when_dc_agnostic() { .hasMessageContaining("node3=dc2")); } - @NonNull + @Nonnull @Override protected BasicLoadBalancingPolicy createPolicy() { return new DcInferringLoadBalancingPolicy(context, DriverExecutionProfile.DEFAULT_NAME); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DcInferringLoadBalancingPolicyEventsTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DcInferringLoadBalancingPolicyEventsTest.java index 218d6338df9..2e3502c0c7b 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DcInferringLoadBalancingPolicyEventsTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DcInferringLoadBalancingPolicyEventsTest.java @@ -22,13 +22,13 @@ import static org.mockito.Mockito.reset; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.UUID; +import javax.annotation.Nonnull; public class DcInferringLoadBalancingPolicyEventsTest extends BasicLoadBalancingPolicyEventsTest { @Override - @NonNull + @Nonnull protected BasicLoadBalancingPolicy createAndInitPolicy() { DcInferringLoadBalancingPolicy policy = new DcInferringLoadBalancingPolicy(context, DEFAULT_NAME); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DcInferringLoadBalancingPolicyInitTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DcInferringLoadBalancingPolicyInitTest.java index 20de3afe9c3..1c325a9c745 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DcInferringLoadBalancingPolicyInitTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DcInferringLoadBalancingPolicyInitTest.java @@ -33,8 +33,8 @@ import com.datastax.oss.driver.api.core.metadata.NodeState; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableSet; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.UUID; +import javax.annotation.Nonnull; import org.junit.Test; public class DcInferringLoadBalancingPolicyInitTest extends LoadBalancingPolicyTestBase { @@ -228,7 +228,7 @@ public void should_ignore_nodes_excluded_by_distance_reporter() { assertThat(policy.getLiveNodes().dc("dc1")).containsExactly(node2, node3); } - @NonNull + @Nonnull protected DcInferringLoadBalancingPolicy createPolicy() { return new DcInferringLoadBalancingPolicy(context, DriverExecutionProfile.DEFAULT_NAME); } diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicyDistanceTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicyDistanceTest.java index 9cf30e048e9..1d15fa72501 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicyDistanceTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicyDistanceTest.java @@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.catchThrowable; import com.datastax.oss.driver.api.core.config.DriverExecutionProfile; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; @@ -45,7 +45,7 @@ public void should_report_LOCAL_when_dc_agnostic() { .hasMessageContaining("Current DCs in this cluster are: dc1, dc2")); } - @NonNull + @Nonnull @Override protected BasicLoadBalancingPolicy createPolicy() { return new DefaultLoadBalancingPolicy(context, DriverExecutionProfile.DEFAULT_NAME); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicyEventsTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicyEventsTest.java index 17e926a29e0..7275d6ba74e 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicyEventsTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicyEventsTest.java @@ -22,13 +22,13 @@ import static org.mockito.Mockito.reset; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.UUID; +import javax.annotation.Nonnull; public class DefaultLoadBalancingPolicyEventsTest extends BasicLoadBalancingPolicyEventsTest { @Override - @NonNull + @Nonnull protected DefaultLoadBalancingPolicy createAndInitPolicy() { DefaultLoadBalancingPolicy policy = new DefaultLoadBalancingPolicy(context, DEFAULT_NAME); policy.init( diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicyInitTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicyInitTest.java index 7b875209743..3c6d97cf1b3 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicyInitTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/loadbalancing/DefaultLoadBalancingPolicyInitTest.java @@ -33,8 +33,8 @@ import com.datastax.oss.driver.api.core.metadata.NodeState; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableSet; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.UUID; +import javax.annotation.Nonnull; import org.junit.Test; public class DefaultLoadBalancingPolicyInitTest extends LoadBalancingPolicyTestBase { @@ -198,7 +198,7 @@ public void should_ignore_nodes_excluded_by_distance_reporter() { assertThat(policy.getLiveNodes().dc("dc1")).containsExactly(node2, node3); } - @NonNull + @Nonnull protected DefaultLoadBalancingPolicy createPolicy() { return new DefaultLoadBalancingPolicy(context, DriverExecutionProfile.DEFAULT_NAME); } diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/session/throttling/MockThrottled.java b/core/src/test/java/com/datastax/oss/driver/internal/core/session/throttling/MockThrottled.java index b7cd0ee8a54..942541e9d18 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/session/throttling/MockThrottled.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/session/throttling/MockThrottled.java @@ -19,9 +19,9 @@ import com.datastax.oss.driver.api.core.RequestThrottlingException; import com.datastax.oss.driver.api.core.session.throttling.Throttled; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; +import javax.annotation.Nonnull; class MockThrottled implements Throttled { @@ -33,7 +33,7 @@ public void onThrottleReady(boolean wasDelayed) { } @Override - public void onThrottleFailure(@NonNull RequestThrottlingException error) { + public void onThrottleFailure(@Nonnull RequestThrottlingException error) { started.toCompletableFuture().completeExceptionally(error); } } diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/type/codec/CqlIntToStringCodec.java b/core/src/test/java/com/datastax/oss/driver/internal/core/type/codec/CqlIntToStringCodec.java index 4f04f3defec..ebbecbba5b1 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/type/codec/CqlIntToStringCodec.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/type/codec/CqlIntToStringCodec.java @@ -20,7 +20,7 @@ import com.datastax.oss.driver.api.core.type.codec.MappingCodec; import com.datastax.oss.driver.api.core.type.codec.TypeCodecs; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nullable; /** * A sample user codec implementation that we use in our tests. diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/type/codec/registry/CachingCodecRegistryTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/type/codec/registry/CachingCodecRegistryTest.java index 231f67a93e7..1cfc0e8c119 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/type/codec/registry/CachingCodecRegistryTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/type/codec/registry/CachingCodecRegistryTest.java @@ -44,11 +44,11 @@ import com.datastax.oss.driver.shaded.guava.common.collect.Lists; import com.tngtech.java.junit.dataprovider.DataProviderRunner; import com.tngtech.java.junit.dataprovider.UseDataProvider; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.time.Period; import java.util.List; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -581,29 +581,29 @@ void lookup( } public static class TextToPeriodCodec implements TypeCodec { - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.of(Period.class); } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.TEXT; } @Override - public ByteBuffer encode(Period value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(Period value, @Nonnull ProtocolVersion protocolVersion) { throw new UnsupportedOperationException("not implemented for this test"); } @Override - public Period decode(ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public Period decode(ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { throw new UnsupportedOperationException("not implemented for this test"); } - @NonNull + @Nonnull @Override public String format(Period value) { throw new UnsupportedOperationException("not implemented for this test"); @@ -621,29 +621,29 @@ private static class B extends A {} private static class ACodec implements TypeCodec { - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.of(A.class); } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.INT; } @Override - public ByteBuffer encode(A value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(A value, @Nonnull ProtocolVersion protocolVersion) { throw new UnsupportedOperationException("irrelevant"); } @Override - public A decode(ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public A decode(ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { throw new UnsupportedOperationException("irrelevant"); } - @NonNull + @Nonnull @Override public String format(A value) { throw new UnsupportedOperationException("irrelevant"); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/util/concurrent/ScheduledTaskCapturingEventLoop.java b/core/src/test/java/com/datastax/oss/driver/internal/core/util/concurrent/ScheduledTaskCapturingEventLoop.java index 295fa545c76..a2716c3b753 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/util/concurrent/ScheduledTaskCapturingEventLoop.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/util/concurrent/ScheduledTaskCapturingEventLoop.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import com.datastax.oss.driver.shaded.guava.common.util.concurrent.Uninterruptibles; -import edu.umd.cs.findbugs.annotations.NonNull; import io.netty.channel.DefaultEventLoop; import io.netty.channel.EventLoopGroup; import io.netty.util.concurrent.ScheduledFuture; @@ -36,6 +35,7 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import javax.annotation.Nonnull; /** * Extend Netty's default event loop to capture scheduled tasks instead of running them. The tasks @@ -55,7 +55,7 @@ public ScheduledTaskCapturingEventLoop(EventLoopGroup parent) { super(parent); } - @NonNull + @Nonnull @Override public ScheduledFuture schedule(Callable callable, long delay, TimeUnit unit) { CapturedTask task = new CapturedTask<>(callable, delay, unit); @@ -64,7 +64,7 @@ public ScheduledFuture schedule(Callable callable, long delay, TimeUni return task.scheduledFuture; } - @NonNull + @Nonnull @Override public ScheduledFuture schedule(Runnable command, long delay, TimeUnit unit) { return schedule( @@ -76,7 +76,7 @@ public ScheduledFuture schedule(Runnable command, long delay, TimeUnit unit) unit); } - @NonNull + @Nonnull @Override public ScheduledFuture scheduleAtFixedRate( Runnable command, long initialDelay, long period, TimeUnit unit) { @@ -94,7 +94,7 @@ public ScheduledFuture scheduleAtFixedRate( return task.scheduledFuture; } - @NonNull + @Nonnull @Override public ScheduledFuture scheduleWithFixedDelay( Runnable command, long initialDelay, long delay, TimeUnit unit) { diff --git a/distribution/src/assembly/binary-tarball.xml b/distribution/src/assembly/binary-tarball.xml index 17364aa858a..7d22c03d9da 100644 --- a/distribution/src/assembly/binary-tarball.xml +++ b/distribution/src/assembly/binary-tarball.xml @@ -69,7 +69,7 @@ com.datastax.oss:java-driver-shaded-guava com.github.stephenc.jcip:jcip-annotations - com.github.spotbugs:spotbugs-annotations + com.google.code.findbugs:jsr305 true @@ -94,7 +94,7 @@ com.datastax.oss:java-driver-shaded-guava com.github.stephenc.jcip:jcip-annotations - com.github.spotbugs:spotbugs-annotations + com.google.code.findbugs:jsr305 true @@ -119,7 +119,7 @@ com.datastax.oss:java-driver-shaded-guava com.github.stephenc.jcip:jcip-annotations - com.github.spotbugs:spotbugs-annotations + com.google.code.findbugs:jsr305 true diff --git a/examples/src/main/java/com/datastax/oss/driver/examples/datatypes/CustomCodecs.java b/examples/src/main/java/com/datastax/oss/driver/examples/datatypes/CustomCodecs.java index a6d4c508a2e..b432dd6b711 100644 --- a/examples/src/main/java/com/datastax/oss/driver/examples/datatypes/CustomCodecs.java +++ b/examples/src/main/java/com/datastax/oss/driver/examples/datatypes/CustomCodecs.java @@ -29,13 +29,13 @@ import com.datastax.oss.driver.api.core.type.codec.MappingCodec; import com.datastax.oss.driver.api.core.type.codec.TypeCodecs; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.Nullable; import java.net.InetAddress; import java.nio.ByteBuffer; import java.time.ZonedDateTime; import java.util.Arrays; import java.util.List; import java.util.Optional; +import javax.annotation.Nullable; /** * Inserts and retrieves values using a few custom codecs. diff --git a/examples/src/main/java/com/datastax/oss/driver/examples/datatypes/TuplesMapped.java b/examples/src/main/java/com/datastax/oss/driver/examples/datatypes/TuplesMapped.java index 1d06fc447ce..3ac7af4770a 100644 --- a/examples/src/main/java/com/datastax/oss/driver/examples/datatypes/TuplesMapped.java +++ b/examples/src/main/java/com/datastax/oss/driver/examples/datatypes/TuplesMapped.java @@ -29,9 +29,9 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.codec.registry.MutableCodecRegistry; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Inserts and retrieves values in columns of tuples. @@ -102,11 +102,11 @@ public String toString() { /** The custom codec that will convert to and from {@link Coordinates}. */ public static class CoordinatesCodec extends MappingCodec { - public CoordinatesCodec(@NonNull TypeCodec innerCodec) { + public CoordinatesCodec(@Nonnull TypeCodec innerCodec) { super(innerCodec, GenericType.of(Coordinates.class)); } - @NonNull + @Nonnull @Override public TupleType getCqlType() { return (TupleType) super.getCqlType(); diff --git a/examples/src/main/java/com/datastax/oss/driver/examples/datatypes/UserDefinedTypesMapped.java b/examples/src/main/java/com/datastax/oss/driver/examples/datatypes/UserDefinedTypesMapped.java index ef97f507746..3016a67ec9e 100644 --- a/examples/src/main/java/com/datastax/oss/driver/examples/datatypes/UserDefinedTypesMapped.java +++ b/examples/src/main/java/com/datastax/oss/driver/examples/datatypes/UserDefinedTypesMapped.java @@ -28,9 +28,9 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.codec.registry.MutableCodecRegistry; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Objects; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Inserts and retrieves values in columns of user-defined types. @@ -103,11 +103,11 @@ public String toString() { /** The custom codec that will convert to and from {@link Coordinates}. */ public static class CoordinatesCodec extends MappingCodec { - public CoordinatesCodec(@NonNull TypeCodec innerCodec) { + public CoordinatesCodec(@Nonnull TypeCodec innerCodec) { super(innerCodec, GenericType.of(Coordinates.class)); } - @NonNull + @Nonnull @Override public UserDefinedType getCqlType() { return (UserDefinedType) super.getCqlType(); diff --git a/examples/src/main/java/com/datastax/oss/driver/examples/json/jsr/Jsr353JsonCodec.java b/examples/src/main/java/com/datastax/oss/driver/examples/json/jsr/Jsr353JsonCodec.java index 9b30d5d6c6b..c6c77d8d99a 100644 --- a/examples/src/main/java/com/datastax/oss/driver/examples/json/jsr/Jsr353JsonCodec.java +++ b/examples/src/main/java/com/datastax/oss/driver/examples/json/jsr/Jsr353JsonCodec.java @@ -24,8 +24,6 @@ import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.internal.core.util.Strings; import com.datastax.oss.protocol.internal.util.Bytes; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -33,6 +31,8 @@ import java.io.StringWriter; import java.nio.ByteBuffer; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonException; @@ -112,13 +112,13 @@ public Jsr353JsonCodec(@Nullable Map config) { writerFactory = Json.createWriterFactory(config); } - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.of(JsonStructure.class); } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.TEXT; @@ -127,7 +127,7 @@ public DataType getCqlType() { @Nullable @Override public ByteBuffer encode( - @Nullable JsonStructure value, @NonNull ProtocolVersion protocolVersion) { + @Nullable JsonStructure value, @Nonnull ProtocolVersion protocolVersion) { if (value == null) { return null; } @@ -143,7 +143,7 @@ public ByteBuffer encode( @Nullable @Override public JsonStructure decode( - @Nullable ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + @Nullable ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { if (bytes == null) { return null; } @@ -155,7 +155,7 @@ public JsonStructure decode( } } - @NonNull + @Nonnull @Override public String format(@Nullable JsonStructure value) { if (value == null) { diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 73c7e77b2c4..9363bc7fe16 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -84,8 +84,8 @@ test - com.github.spotbugs - spotbugs-annotations + com.google.code.findbugs + jsr305 test diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/AllNodesFailedIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/AllNodesFailedIT.java index ed453681a65..d67fbe6574e 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/core/AllNodesFailedIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/core/AllNodesFailedIT.java @@ -37,10 +37,10 @@ import com.datastax.oss.driver.categories.ParallelizableTests; import com.datastax.oss.driver.internal.core.retry.DefaultRetryPolicy; import com.datastax.oss.simulacron.common.cluster.ClusterSpec; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Iterator; import java.util.List; import java.util.Map.Entry; +import javax.annotation.Nonnull; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -90,8 +90,8 @@ public MultipleRetryPolicy(DriverContext context, String profileName) { @Override @Deprecated public RetryDecision onReadTimeout( - @NonNull Request request, - @NonNull ConsistencyLevel cl, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, int blockFor, int received, boolean dataPresent, diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/ConnectIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/ConnectIT.java index 67585bc691d..f212225abce 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/core/ConnectIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/core/ConnectIT.java @@ -41,13 +41,13 @@ import com.datastax.oss.simulacron.common.cluster.ClusterSpec; import com.datastax.oss.simulacron.server.BoundCluster; import com.datastax.oss.simulacron.server.RejectScope; -import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; import java.util.Map; import java.util.UUID; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.concurrent.TimeUnit; +import javax.annotation.Nonnull; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; @@ -200,7 +200,7 @@ public InitOnlyReconnectionPolicy(DriverContext context) { super(context); } - @NonNull + @Nonnull @Override public ReconnectionSchedule newControlConnectionSchedule(boolean isInitialConnection) { if (isInitialConnection) { diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/config/MapBasedConfigLoaderIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/config/MapBasedConfigLoaderIT.java index b8a6accce69..a847415b46d 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/core/config/MapBasedConfigLoaderIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/core/config/MapBasedConfigLoaderIT.java @@ -44,9 +44,9 @@ import com.datastax.oss.driver.categories.ParallelizableTests; import com.datastax.oss.driver.internal.core.config.ConfigChangeEvent; import com.datastax.oss.simulacron.common.cluster.ClusterSpec; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; import java.util.concurrent.TimeUnit; +import javax.annotation.Nonnull; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; @@ -153,8 +153,8 @@ public IgnoreAllPolicy( @Override @Deprecated public RetryDecision onReadTimeout( - @NonNull Request request, - @NonNull ConsistencyLevel cl, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, int blockFor, int received, boolean dataPresent, @@ -165,9 +165,9 @@ public RetryDecision onReadTimeout( @Override @Deprecated public RetryDecision onWriteTimeout( - @NonNull Request request, - @NonNull ConsistencyLevel cl, - @NonNull WriteType writeType, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, + @Nonnull WriteType writeType, int blockFor, int received, int retryCount) { @@ -177,8 +177,8 @@ public RetryDecision onWriteTimeout( @Override @Deprecated public RetryDecision onUnavailable( - @NonNull Request request, - @NonNull ConsistencyLevel cl, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, int required, int alive, int retryCount) { @@ -188,14 +188,14 @@ public RetryDecision onUnavailable( @Override @Deprecated public RetryDecision onRequestAborted( - @NonNull Request request, @NonNull Throwable error, int retryCount) { + @Nonnull Request request, @Nonnull Throwable error, int retryCount) { return RetryDecision.IGNORE; } @Override @Deprecated public RetryDecision onErrorResponse( - @NonNull Request request, @NonNull CoordinatorException error, int retryCount) { + @Nonnull Request request, @Nonnull CoordinatorException error, int retryCount) { return RetryDecision.IGNORE; } diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/connection/FrameLengthIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/connection/FrameLengthIT.java index 887a578f7c4..d87a33b8f2d 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/core/connection/FrameLengthIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/core/connection/FrameLengthIT.java @@ -40,11 +40,11 @@ import com.datastax.oss.driver.categories.ParallelizableTests; import com.datastax.oss.driver.internal.core.retry.DefaultRetryPolicy; import com.datastax.oss.simulacron.common.cluster.ClusterSpec; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.Buffer; import java.nio.ByteBuffer; import java.util.concurrent.CompletionStage; import java.util.concurrent.TimeUnit; +import javax.annotation.Nonnull; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; @@ -125,7 +125,7 @@ public AlwaysRetryAbortedPolicy(DriverContext context, String profileName) { @Override public RetryVerdict onRequestAbortedVerdict( - @NonNull Request request, @NonNull Throwable error, int retryCount) { + @Nonnull Request request, @Nonnull Throwable error, int retryCount) { return RetryVerdict.RETRY_NEXT; } } diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/context/LifecycleListenerIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/context/LifecycleListenerIT.java index 3bd4add3003..f045aef79ac 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/core/context/LifecycleListenerIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/core/context/LifecycleListenerIT.java @@ -34,10 +34,10 @@ import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; import com.datastax.oss.simulacron.common.cluster.ClusterSpec; import com.datastax.oss.simulacron.server.RejectScope; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; +import javax.annotation.Nonnull; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -118,7 +118,7 @@ public static class TestContext extends DefaultDriverContext { this.listeners = ImmutableList.of(listener); } - @NonNull + @Nonnull @Override public List getLifecycleListeners() { return listeners; diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/cql/PagingStateIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/cql/PagingStateIT.java index dcd801f19a4..c8e16783224 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/core/cql/PagingStateIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/core/cql/PagingStateIT.java @@ -34,8 +34,8 @@ import com.datastax.oss.driver.api.testinfra.session.SessionUtils; import com.datastax.oss.driver.categories.ParallelizableTests; import com.datastax.oss.driver.internal.core.type.codec.IntCodec; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.function.UnaryOperator; +import javax.annotation.Nullable; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/cql/PreparedStatementCachingIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/cql/PreparedStatementCachingIT.java index 92c6fd8a12e..04dd2da2341 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/core/cql/PreparedStatementCachingIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/core/cql/PreparedStatementCachingIT.java @@ -45,7 +45,6 @@ import com.datastax.oss.driver.shaded.guava.common.util.concurrent.Uninterruptibles; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import edu.umd.cs.findbugs.annotations.NonNull; import java.nio.ByteBuffer; import java.time.Duration; import java.util.List; @@ -59,6 +58,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; +import javax.annotation.Nonnull; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Rule; @@ -119,7 +119,7 @@ private static class TestCqlPrepareAsyncProcessor extends CqlPrepareAsyncProcess LoggerFactory.getLogger(PreparedStatementCachingIT.TestCqlPrepareAsyncProcessor.class); private static RemovalListener> - buildCacheRemoveCallback(@NonNull Optional context) { + buildCacheRemoveCallback(@Nonnull Optional context) { return (evt) -> { try { CompletableFuture future = evt.getValue(); @@ -132,7 +132,7 @@ private static class TestCqlPrepareAsyncProcessor extends CqlPrepareAsyncProcess }; } - public TestCqlPrepareAsyncProcessor(@NonNull Optional context) { + public TestCqlPrepareAsyncProcessor(@Nonnull Optional context) { // Default CqlPrepareAsyncProcessor uses weak values here as well. We avoid doing so // to prevent cache entries from unexpectedly disappearing mid-test. super( @@ -166,7 +166,7 @@ protected RequestProcessorRegistry buildRequestProcessorRegistry() { private static class TestSessionBuilder extends SessionBuilder { @Override - protected Object wrap(@NonNull CqlSession defaultSession) { + protected Object wrap(@Nonnull CqlSession defaultSession) { return defaultSession; } diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/cql/reactive/DefaultReactiveResultSetIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/cql/reactive/DefaultReactiveResultSetIT.java index cfb6a56fac2..5d1adcbe874 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/core/cql/reactive/DefaultReactiveResultSetIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/core/cql/reactive/DefaultReactiveResultSetIT.java @@ -37,11 +37,11 @@ import com.datastax.oss.driver.internal.core.cql.EmptyColumnDefinitions; import com.tngtech.java.junit.dataprovider.DataProvider; import com.tngtech.java.junit.dataprovider.DataProviderRunner; -import edu.umd.cs.findbugs.annotations.NonNull; import io.reactivex.Flowable; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import javax.annotation.Nonnull; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; @@ -284,7 +284,7 @@ public void should_write_batch_cas() { assertThat(wasApplied).hasSize(1).containsExactly(row.wasApplied()); } - @NonNull + @Nonnull private static BatchStatement createCASBatch() { // Build a batch with CAS operations on the same partition (conditional batch updates cannot // span multiple partitions). diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/cql/reactive/ReactiveRetryIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/cql/reactive/ReactiveRetryIT.java index e59c29f4262..b84cc4506e6 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/core/cql/reactive/ReactiveRetryIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/core/cql/reactive/ReactiveRetryIT.java @@ -49,8 +49,6 @@ import com.datastax.oss.simulacron.common.codec.ConsistencyLevel; import com.datastax.oss.simulacron.server.BoundCluster; import com.google.common.collect.Iterables; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import io.reactivex.Flowable; import java.util.ArrayDeque; import java.util.ArrayList; @@ -62,6 +60,8 @@ import java.util.Queue; import java.util.TreeSet; import java.util.UUID; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; @@ -174,29 +174,29 @@ public CyclingLoadBalancingPolicy(DriverContext context, String profileName) { } @Override - public void init(@NonNull Map nodes, @NonNull DistanceReporter distanceReporter) { + public void init(@Nonnull Map nodes, @Nonnull DistanceReporter distanceReporter) { this.nodes.addAll(nodes.values()); this.nodes.forEach(n -> distanceReporter.setDistance(n, NodeDistance.LOCAL)); iterator = Iterables.cycle(this.nodes).iterator(); } - @NonNull + @Nonnull @Override public Queue newQueryPlan(@Nullable Request request, @Nullable Session session) { return new ArrayDeque<>(Collections.singleton(iterator.next())); } @Override - public void onAdd(@NonNull Node node) {} + public void onAdd(@Nonnull Node node) {} @Override - public void onUp(@NonNull Node node) {} + public void onUp(@Nonnull Node node) {} @Override - public void onDown(@NonNull Node node) {} + public void onDown(@Nonnull Node node) {} @Override - public void onRemove(@NonNull Node node) {} + public void onRemove(@Nonnull Node node) {} @Override public void close() {} diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/NodeStateIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/NodeStateIT.java index e468e0a10d7..7ae7fb1a5e3 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/NodeStateIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/NodeStateIT.java @@ -56,7 +56,6 @@ import com.datastax.oss.simulacron.common.stubbing.CloseType; import com.datastax.oss.simulacron.server.BoundNode; import com.datastax.oss.simulacron.server.RejectScope; -import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.net.InetSocketAddress; import java.net.ServerSocket; @@ -74,6 +73,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; +import javax.annotation.Nonnull; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -677,7 +677,7 @@ public ConfigurableIgnoresPolicy( } @Override - public void init(@NonNull Map nodes, @NonNull DistanceReporter distanceReporter) { + public void init(@Nonnull Map nodes, @Nonnull DistanceReporter distanceReporter) { this.distanceReporter = distanceReporter; for (Node node : nodes.values()) { liveNodes.add(node); @@ -701,9 +701,9 @@ public void stopIgnoring(Node node) { } } - @NonNull + @Nonnull @Override - public Queue newQueryPlan(@NonNull Request request, @NonNull Session session) { + public Queue newQueryPlan(@Nonnull Request request, @Nonnull Session session) { Object[] snapshot = liveNodes.toArray(); Queue queryPlan = new ConcurrentLinkedQueue<>(); int start = offset.getAndIncrement(); // Note: offset overflow won't be an issue in tests @@ -714,7 +714,7 @@ public Queue newQueryPlan(@NonNull Request request, @NonNull Session sessi } @Override - public void onAdd(@NonNull Node node) { + public void onAdd(@Nonnull Node node) { if (ignoredNodes.contains(node)) { distanceReporter.setDistance(node, NodeDistance.IGNORED); } else { @@ -725,19 +725,19 @@ public void onAdd(@NonNull Node node) { } @Override - public void onUp(@NonNull Node node) { + public void onUp(@Nonnull Node node) { if (!ignoredNodes.contains(node)) { liveNodes.add(node); } } @Override - public void onDown(@NonNull Node node) { + public void onDown(@Nonnull Node node) { liveNodes.remove(node); } @Override - public void onRemove(@NonNull Node node) { + public void onRemove(@Nonnull Node node) { liveNodes.remove(node); } diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/retry/PerProfileRetryPolicyIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/retry/PerProfileRetryPolicyIT.java index b2e53bb09d0..d4a20eb2c2a 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/core/retry/PerProfileRetryPolicyIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/core/retry/PerProfileRetryPolicyIT.java @@ -45,9 +45,9 @@ import com.datastax.oss.driver.categories.ParallelizableTests; import com.datastax.oss.driver.internal.core.retry.DefaultRetryPolicy; import com.datastax.oss.simulacron.common.cluster.ClusterSpec; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; import java.util.Map; +import javax.annotation.Nonnull; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; @@ -156,8 +156,8 @@ public NoRetryPolicy(DriverContext context, String profileName) {} @Override @Deprecated public RetryDecision onReadTimeout( - @NonNull Request request, - @NonNull ConsistencyLevel cl, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, int blockFor, int received, boolean dataPresent, @@ -168,9 +168,9 @@ public RetryDecision onReadTimeout( @Override @Deprecated public RetryDecision onWriteTimeout( - @NonNull Request request, - @NonNull ConsistencyLevel cl, - @NonNull WriteType writeType, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, + @Nonnull WriteType writeType, int blockFor, int received, int retryCount) { @@ -180,8 +180,8 @@ public RetryDecision onWriteTimeout( @Override @Deprecated public RetryDecision onUnavailable( - @NonNull Request request, - @NonNull ConsistencyLevel cl, + @Nonnull Request request, + @Nonnull ConsistencyLevel cl, int required, int alive, int retryCount) { @@ -191,14 +191,14 @@ public RetryDecision onUnavailable( @Override @Deprecated public RetryDecision onRequestAborted( - @NonNull Request request, @NonNull Throwable error, int retryCount) { + @Nonnull Request request, @Nonnull Throwable error, int retryCount) { return RetryDecision.RETHROW; } @Override @Deprecated public RetryDecision onErrorResponse( - @NonNull Request request, @NonNull CoordinatorException error, int retryCount) { + @Nonnull Request request, @Nonnull CoordinatorException error, int retryCount) { return RetryDecision.RETHROW; } diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/session/AddedNodeIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/session/AddedNodeIT.java index 1ce3fd1ca0e..50541b31123 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/core/session/AddedNodeIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/core/session/AddedNodeIT.java @@ -28,10 +28,10 @@ import com.datastax.oss.driver.api.testinfra.session.SessionUtils; import com.datastax.oss.driver.internal.core.pool.ChannelPool; import com.datastax.oss.driver.internal.core.session.DefaultSession; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; +import javax.annotation.Nonnull; import org.junit.ClassRule; import org.junit.Test; @@ -69,18 +69,18 @@ static class AddListener implements NodeStateListener { volatile Node addedNode; @Override - public void onRemove(@NonNull Node node) {} + public void onRemove(@Nonnull Node node) {} @Override - public void onAdd(@NonNull Node node) { + public void onAdd(@Nonnull Node node) { addedNode = node; } @Override - public void onUp(@NonNull Node node) {} + public void onUp(@Nonnull Node node) {} @Override - public void onDown(@NonNull Node node) {} + public void onDown(@Nonnull Node node) {} @Override public void close() throws Exception {} diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/session/ListenersIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/session/ListenersIT.java index 0fa089483fd..a4d4b4716d1 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/core/session/ListenersIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/core/session/ListenersIT.java @@ -38,10 +38,10 @@ import com.datastax.oss.driver.categories.ParallelizableTests; import com.datastax.oss.driver.shaded.guava.common.util.concurrent.Uninterruptibles; import com.datastax.oss.simulacron.common.cluster.ClusterSpec; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collections; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import javax.annotation.Nonnull; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -161,12 +161,12 @@ public MyNodeStateListener(@SuppressWarnings("unused") DriverContext ignored) { new NodeStateListenerBase() { @Override - public void onSessionReady(@NonNull Session session) { + public void onSessionReady(@Nonnull Session session) { onSessionReadyCalled = true; } @Override - public void onUp(@NonNull Node node) { + public void onUp(@Nonnull Node node) { onUpCalled = true; } @@ -187,7 +187,7 @@ public static class MySchemaChangeListener extends SchemaChangeListenerBase { public MySchemaChangeListener(@SuppressWarnings("unused") DriverContext ignored) {} @Override - public void onSessionReady(@NonNull Session session) { + public void onSessionReady(@Nonnull Session session) { onSessionReadyLatch.countDown(); } @@ -205,7 +205,7 @@ public static class MyRequestTracker implements RequestTracker { public MyRequestTracker(@SuppressWarnings("unused") DriverContext ignored) {} @Override - public void onSessionReady(@NonNull Session session) { + public void onSessionReady(@Nonnull Session session) { onSessionReadyCalled = true; } diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/session/RemovedNodeIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/session/RemovedNodeIT.java index e0f33291544..06aa3b410c1 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/core/session/RemovedNodeIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/core/session/RemovedNodeIT.java @@ -28,10 +28,10 @@ import com.datastax.oss.driver.api.testinfra.session.SessionUtils; import com.datastax.oss.driver.internal.core.pool.ChannelPool; import com.datastax.oss.driver.internal.core.session.DefaultSession; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; +import javax.annotation.Nonnull; import org.junit.ClassRule; import org.junit.Test; @@ -75,18 +75,18 @@ static class RemovalListener implements NodeStateListener { volatile Node removedNode; @Override - public void onRemove(@NonNull Node node) { + public void onRemove(@Nonnull Node node) { removedNode = node; } @Override - public void onAdd(@NonNull Node node) {} + public void onAdd(@Nonnull Node node) {} @Override - public void onUp(@NonNull Node node) {} + public void onUp(@Nonnull Node node) {} @Override - public void onDown(@NonNull Node node) {} + public void onDown(@Nonnull Node node) {} @Override public void close() throws Exception {} diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/tracker/RequestNodeLoggerExample.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/tracker/RequestNodeLoggerExample.java index eae98339637..f7f84e22b1e 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/core/tracker/RequestNodeLoggerExample.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/core/tracker/RequestNodeLoggerExample.java @@ -24,7 +24,7 @@ import com.datastax.oss.driver.api.core.session.Request; import com.datastax.oss.driver.internal.core.tracker.RequestLogFormatter; import com.datastax.oss.driver.internal.core.tracker.RequestLogger; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public class RequestNodeLoggerExample extends RequestLogger { @@ -34,12 +34,12 @@ public RequestNodeLoggerExample(DriverContext context) { @Override public void onNodeError( - @NonNull Request request, - @NonNull Throwable error, + @Nonnull Request request, + @Nonnull Throwable error, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, - @NonNull Node node, - @NonNull String logPrefix) { + @Nonnull DriverExecutionProfile executionProfile, + @Nonnull Node node, + @Nonnull String logPrefix) { if (!executionProfile.getBoolean(DefaultDriverOption.REQUEST_LOGGER_ERROR_ENABLED)) { return; } @@ -71,11 +71,11 @@ public void onNodeError( @Override public void onNodeSuccess( - @NonNull Request request, + @Nonnull Request request, long latencyNanos, - @NonNull DriverExecutionProfile executionProfile, - @NonNull Node node, - @NonNull String logPrefix) { + @Nonnull DriverExecutionProfile executionProfile, + @Nonnull Node node, + @Nonnull String logPrefix) { boolean successEnabled = executionProfile.getBoolean(DefaultDriverOption.REQUEST_LOGGER_SUCCESS_ENABLED); boolean slowEnabled = diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/type/codec/CqlIntToStringCodec.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/type/codec/CqlIntToStringCodec.java index f509439fe35..2d19f91caee 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/core/type/codec/CqlIntToStringCodec.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/core/type/codec/CqlIntToStringCodec.java @@ -20,7 +20,7 @@ import com.datastax.oss.driver.api.core.type.codec.MappingCodec; import com.datastax.oss.driver.api.core.type.codec.TypeCodecs; import com.datastax.oss.driver.api.core.type.reflect.GenericType; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nullable; /** * A sample user codec implementation that we use in our tests. diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/type/codec/registry/CodecRegistryIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/type/codec/registry/CodecRegistryIT.java index 2f9a0872b37..61ddb501f50 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/core/type/codec/registry/CodecRegistryIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/core/type/codec/registry/CodecRegistryIT.java @@ -45,8 +45,6 @@ import com.datastax.oss.driver.internal.core.type.codec.UdtCodec; import com.datastax.oss.driver.internal.core.type.codec.extras.OptionalCodec; import com.google.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.util.HashMap; import java.util.Iterator; @@ -54,6 +52,8 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import org.assertj.core.util.Maps; import org.junit.BeforeClass; import org.junit.ClassRule; @@ -114,29 +114,29 @@ private static class FloatCIntCodec implements TypeCodec { private static final IntCodec intCodec = new IntCodec(); - @NonNull + @Nonnull @Override public GenericType getJavaType() { return GenericType.of(Float.class); } - @NonNull + @Nonnull @Override public DataType getCqlType() { return DataTypes.INT; } @Override - public ByteBuffer encode(Float value, @NonNull ProtocolVersion protocolVersion) { + public ByteBuffer encode(Float value, @Nonnull ProtocolVersion protocolVersion) { return intCodec.encode(value.intValue(), protocolVersion); } @Override - public Float decode(ByteBuffer bytes, @NonNull ProtocolVersion protocolVersion) { + public Float decode(ByteBuffer bytes, @Nonnull ProtocolVersion protocolVersion) { return intCodec.decode(bytes, protocolVersion).floatValue(); } - @NonNull + @Nonnull @Override public String format(Float value) { return intCodec.format(value.intValue()); @@ -442,11 +442,11 @@ public int hashCode() { private static class CoordinatesCodec extends MappingCodec { - public CoordinatesCodec(@NonNull TypeCodec innerCodec) { + public CoordinatesCodec(@Nonnull TypeCodec innerCodec) { super(innerCodec, GenericType.of(Coordinates.class)); } - @NonNull + @Nonnull @Override public UserDefinedType getCqlType() { return (UserDefinedType) super.getCqlType(); diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/example/guava/api/GuavaSessionBuilder.java b/integration-tests/src/test/java/com/datastax/oss/driver/example/guava/api/GuavaSessionBuilder.java index fe20d0fdc8a..d183b51ad10 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/example/guava/api/GuavaSessionBuilder.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/example/guava/api/GuavaSessionBuilder.java @@ -24,7 +24,7 @@ import com.datastax.oss.driver.api.core.session.SessionBuilder; import com.datastax.oss.driver.example.guava.internal.DefaultGuavaSession; import com.datastax.oss.driver.example.guava.internal.GuavaDriverContext; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public class GuavaSessionBuilder extends SessionBuilder { @@ -35,7 +35,7 @@ protected DriverContext buildContext( } @Override - protected GuavaSession wrap(@NonNull CqlSession defaultSession) { + protected GuavaSession wrap(@Nonnull CqlSession defaultSession) { return new DefaultGuavaSession(defaultSession); } } diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/example/guava/internal/KeyRequest.java b/integration-tests/src/test/java/com/datastax/oss/driver/example/guava/internal/KeyRequest.java index ef582cce1b9..1c0fc6f060e 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/example/guava/internal/KeyRequest.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/example/guava/internal/KeyRequest.java @@ -23,11 +23,11 @@ import com.datastax.oss.driver.api.core.metadata.token.Token; import com.datastax.oss.driver.api.core.session.Request; import com.datastax.oss.protocol.internal.util.collection.NullAllowingImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.ByteBuffer; import java.time.Duration; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** A custom request that simply wraps an integer key and uses it as a parameter for a query. */ public class KeyRequest implements Request { @@ -72,7 +72,7 @@ public Token getRoutingToken() { return null; } - @NonNull + @Nonnull @Override public Map getCustomPayload() { return NullAllowingImmutableMap.of(); diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/GuavaFutureProducerService.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/GuavaFutureProducerService.java index 759b01a4e20..db05bcec12a 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/GuavaFutureProducerService.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/GuavaFutureProducerService.java @@ -29,8 +29,8 @@ import com.datastax.oss.driver.shaded.guava.common.util.concurrent.Futures; import com.datastax.oss.driver.shaded.guava.common.util.concurrent.ListenableFuture; import com.datastax.oss.driver.shaded.guava.common.util.concurrent.SettableFuture; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class GuavaFutureProducerService implements MapperResultProducerService { @@ -47,8 +47,8 @@ public abstract static class ListenableFutureProducer implements MapperResultPro @Nullable @Override public ListenableFuture execute( - @NonNull Statement statement, - @NonNull MapperContext context, + @Nonnull Statement statement, + @Nonnull MapperContext context, @Nullable EntityHelper entityHelper) { SettableFuture result = SettableFuture.create(); context @@ -67,11 +67,11 @@ public ListenableFuture execute( @Nullable protected abstract Object convert( - @NonNull AsyncResultSet resultSet, @Nullable EntityHelper entityHelper); + @Nonnull AsyncResultSet resultSet, @Nullable EntityHelper entityHelper); @Nullable @Override - public ListenableFuture wrapError(@NonNull Exception e) { + public ListenableFuture wrapError(@Nonnull Exception e) { return Futures.immediateFailedFuture(e); } } @@ -82,14 +82,14 @@ public static class VoidListenableFutureProducer extends ListenableFutureProduce new GenericType>() {}; @Override - public boolean canProduce(@NonNull GenericType resultType) { + public boolean canProduce(@Nonnull GenericType resultType) { return resultType.equals(PRODUCED_TYPE); } @Nullable @Override protected Object convert( - @NonNull AsyncResultSet resultSet, @Nullable EntityHelper entityHelper) { + @Nonnull AsyncResultSet resultSet, @Nullable EntityHelper entityHelper) { // ignore results return null; } @@ -98,14 +98,14 @@ protected Object convert( public static class SingleEntityListenableFutureProducer extends ListenableFutureProducer { @Override - public boolean canProduce(@NonNull GenericType resultType) { + public boolean canProduce(@Nonnull GenericType resultType) { return resultType.getRawType().equals(ListenableFuture.class); } @Nullable @Override protected Object convert( - @NonNull AsyncResultSet resultSet, @Nullable EntityHelper entityHelper) { + @Nonnull AsyncResultSet resultSet, @Nullable EntityHelper entityHelper) { assert entityHelper != null; Row row = resultSet.one(); return (row == null) ? null : entityHelper.get(row, false); diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/NamingStrategyIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/NamingStrategyIT.java index 974e4bad7c3..adbf3377e8b 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/mapper/NamingStrategyIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/mapper/NamingStrategyIT.java @@ -40,7 +40,7 @@ import com.datastax.oss.driver.api.testinfra.session.SessionRule; import com.datastax.oss.driver.categories.ParallelizableTests; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; @@ -193,8 +193,8 @@ public void setEntityId(int entityId) { public static class TestNameConverter implements NameConverter { @Override - @NonNull - public String toCassandraName(@NonNull String javaName) { + @Nonnull + public String toCassandraName(@Nonnull String javaName) { // Pretty silly but we don't need this to be realistic return "test_" + javaName; } diff --git a/manual/core/custom_codecs/README.md b/manual/core/custom_codecs/README.md index e68e5d78029..3accd597737 100644 --- a/manual/core/custom_codecs/README.md +++ b/manual/core/custom_codecs/README.md @@ -556,11 +556,11 @@ All you have to do is create a `MappingCodec` subclass that piggybacks on an ex ```java public class CoordinatesCodec extends MappingCodec { - public CoordinatesCodec(@NonNull TypeCodec innerCodec) { + public CoordinatesCodec(@Nonnull TypeCodec innerCodec) { super(innerCodec, GenericType.of(Coordinates.class)); } - @NonNull @Override public UserDefinedType getCqlType() { + @Nonnull @Override public UserDefinedType getCqlType() { return (UserDefinedType) super.getCqlType(); } diff --git a/manual/core/integration/README.md b/manual/core/integration/README.md index 37e04b230a2..b7facb9a522 100644 --- a/manual/core/integration/README.md +++ b/manual/core/integration/README.md @@ -607,7 +607,7 @@ The driver team uses annotations to document certain aspects of the code: * thread safety with [Java Concurrency in Practice](http://jcip.net/annotations/doc/index.html) annotations `@Immutable`, `@ThreadSafe`, `@NotThreadSafe` and `@GuardedBy`; -* nullability with [SpotBugs](https://spotbugs.github.io/) annotations `@Nullable` and `@NonNull`. +* nullability with [SpotBugs](https://spotbugs.github.io/) annotations `@Nullable` and `@Nonnull`. This is mostly used during development; while these annotations are retained in class files, they serve no purpose at runtime. If you want to minimize the number of JARs in your classpath, you can @@ -624,8 +624,8 @@ exclude them: jcip-annotations - com.github.spotbugs - spotbugs-annotations + com.google.code.findbugs + jsr305 diff --git a/manual/core/metadata/node/README.md b/manual/core/metadata/node/README.md index 0f0b6176f42..90ed1a433d8 100644 --- a/manual/core/metadata/node/README.md +++ b/manual/core/metadata/node/README.md @@ -68,7 +68,7 @@ you can register one or more listeners to get notified when changes occur: NodeStateListener listener = new NodeStateListenerBase() { @Override - public void onUp(@NonNull Node node) { + public void onUp(@Nonnull Node node) { System.out.printf("%s went UP%n", node); } }; diff --git a/manual/developer/common/context/README.md b/manual/developer/common/context/README.md index 3c6143e970d..d1e5b70a4a6 100644 --- a/manual/developer/common/context/README.md +++ b/manual/developer/common/context/README.md @@ -67,7 +67,7 @@ public class DefaultDriverContext { return new DefaultNettyOptions(this); } - @NonNull + @Nonnull @Override public NettyOptions getNettyOptions() { return nettyOptionsRef.get(); @@ -104,7 +104,7 @@ public class CustomBuilder extends SessionBuilder { } @Override - protected CqlSession wrap(@NonNull CqlSession defaultSession) { + protected CqlSession wrap(@Nonnull CqlSession defaultSession) { // Nothing to do here, nothing changes on the session type return defaultSession; } diff --git a/mapper-processor/pom.xml b/mapper-processor/pom.xml index 9f6c2572554..e909714e35d 100644 --- a/mapper-processor/pom.xml +++ b/mapper-processor/pom.xml @@ -56,8 +56,8 @@ jcip-annotations - com.github.spotbugs - spotbugs-annotations + com.google.code.findbugs + jsr305 com.google.testing.compile diff --git a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoImplementationGenerator.java b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoImplementationGenerator.java index 7c10a4f9106..0c4a54ee41c 100644 --- a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoImplementationGenerator.java +++ b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoImplementationGenerator.java @@ -48,7 +48,6 @@ import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; -import edu.umd.cs.findbugs.annotations.NonNull; import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.Collections; @@ -61,6 +60,7 @@ import java.util.concurrent.CompletionStage; import java.util.function.BiConsumer; import java.util.stream.Collectors; +import javax.annotation.Nonnull; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; import javax.lang.model.element.ExecutableElement; @@ -401,7 +401,7 @@ protected JavaFile.Builder getContents() { return JavaFile.builder(implementationName.packageName(), classBuilder.build()); } - @NonNull + @Nonnull protected Class getDaoParentClass(boolean requiresReactive) { if (requiresReactive) { return ReactiveDaoBase.class; diff --git a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoMethodGenerator.java b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoMethodGenerator.java index 77ce2bf9161..b90a067f604 100644 --- a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoMethodGenerator.java +++ b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoMethodGenerator.java @@ -33,8 +33,6 @@ import com.datastax.oss.driver.internal.mapper.processor.util.generation.GeneratedCodePatterns; import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.MethodSpec; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.List; import java.util.Map; import java.util.Optional; @@ -42,6 +40,8 @@ import java.util.function.Function; import java.util.function.UnaryOperator; import java.util.stream.Collectors; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.ExecutableElement; @@ -75,7 +75,7 @@ public DaoMethodGenerator( @Nullable protected DaoReturnType parseAndValidateReturnType( - @NonNull Set validKinds, @NonNull String annotationName) { + @Nonnull Set validKinds, @Nonnull String annotationName) { DaoReturnType returnType = context .getCodeGeneratorFactory() diff --git a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoReturnTypeParser.java b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoReturnTypeParser.java index 76c073ddc68..a7685313603 100644 --- a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoReturnTypeParser.java +++ b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DaoReturnTypeParser.java @@ -17,14 +17,14 @@ */ package com.datastax.oss.driver.internal.mapper.processor.dao; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.Nonnull; import javax.lang.model.element.Name; import javax.lang.model.element.TypeElement; import javax.lang.model.type.TypeMirror; public interface DaoReturnTypeParser { - @NonNull + @Nonnull DaoReturnType parse( - @NonNull TypeMirror returnTypeMirror, @NonNull Map typeParameters); + @Nonnull TypeMirror returnTypeMirror, @Nonnull Map typeParameters); } diff --git a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DefaultDaoReturnTypeParser.java b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DefaultDaoReturnTypeParser.java index 0966a417b0a..2959b52778f 100644 --- a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DefaultDaoReturnTypeParser.java +++ b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/dao/DefaultDaoReturnTypeParser.java @@ -27,7 +27,6 @@ import com.datastax.oss.driver.api.core.cql.Row; import com.datastax.oss.driver.internal.mapper.processor.ProcessorContext; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -35,6 +34,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.stream.Stream; +import javax.annotation.Nonnull; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; import javax.lang.model.element.Name; @@ -138,10 +138,10 @@ protected DefaultDaoReturnTypeParser( this.futureOfEntityContainerMatches = futureOfEntityContainerMatches; } - @NonNull + @Nonnull @Override public DaoReturnType parse( - @NonNull TypeMirror returnTypeMirror, @NonNull Map typeParameters) { + @Nonnull TypeMirror returnTypeMirror, @Nonnull Map typeParameters) { // void or a primitive? DaoReturnType match = typeKindMatches.get(returnTypeMirror.getKind()); 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 index f030e2f7225..c37b8ee4579 100644 --- 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 @@ -25,11 +25,11 @@ import com.datastax.oss.driver.api.mapper.entity.saving.NullSavingStrategy; import com.datastax.oss.driver.internal.mapper.processor.ProcessorContext; import com.datastax.oss.driver.internal.mapper.processor.util.Classes; -import edu.umd.cs.findbugs.annotations.Nullable; import java.lang.annotation.Annotation; import java.util.List; import java.util.Optional; import java.util.function.Function; +import javax.annotation.Nullable; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; import javax.lang.model.element.ExecutableElement; diff --git a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/entity/DefaultEntityDefinition.java b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/entity/DefaultEntityDefinition.java index 9b87066bf28..bf05671ddfd 100644 --- a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/entity/DefaultEntityDefinition.java +++ b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/entity/DefaultEntityDefinition.java @@ -20,9 +20,9 @@ import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.CodeBlock; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.List; import java.util.Optional; +import javax.annotation.Nullable; public class DefaultEntityDefinition implements EntityDefinition { diff --git a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/entity/DefaultEntityFactory.java b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/entity/DefaultEntityFactory.java index 84d0ec61267..1075ed26ba5 100644 --- a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/entity/DefaultEntityFactory.java +++ b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/entity/DefaultEntityFactory.java @@ -41,7 +41,6 @@ import com.datastax.oss.driver.shaded.guava.common.collect.Maps; import com.datastax.oss.driver.shaded.guava.common.collect.Sets; import com.squareup.javapoet.ClassName; -import edu.umd.cs.findbugs.annotations.Nullable; import java.lang.annotation.Annotation; import java.util.Collections; import java.util.List; @@ -51,6 +50,7 @@ import java.util.SortedMap; import java.util.TreeMap; import java.util.stream.Collectors; +import javax.annotation.Nullable; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.Element; diff --git a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/entity/EntityDefinition.java b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/entity/EntityDefinition.java index 10ab8ef55f7..719d237984f 100644 --- a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/entity/EntityDefinition.java +++ b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/entity/EntityDefinition.java @@ -21,8 +21,8 @@ import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.CodeBlock; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.List; +import javax.annotation.Nullable; public interface EntityDefinition { diff --git a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/util/generation/GeneratedCodePatterns.java b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/util/generation/GeneratedCodePatterns.java index bc832008b31..7353a1389fe 100644 --- a/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/util/generation/GeneratedCodePatterns.java +++ b/mapper-processor/src/main/java/com/datastax/oss/driver/internal/mapper/processor/util/generation/GeneratedCodePatterns.java @@ -39,11 +39,11 @@ import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import javax.annotation.Nonnull; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.Modifier; import javax.lang.model.element.Name; @@ -141,7 +141,7 @@ public static void addFinalFieldAndConstructorArgument( * variable already exists. */ public static void bindParameters( - @NonNull List parameters, + @Nonnull List parameters, CodeBlock.Builder methodBuilder, BindableHandlingSharedCode enclosingClass, ProcessorContext context, @@ -169,8 +169,8 @@ public static void bindParameters( * variable already exists. */ public static void bindParameters( - @NonNull List parameters, - @NonNull List bindMarkerNames, + @Nonnull List parameters, + @Nonnull List bindMarkerNames, CodeBlock.Builder methodBuilder, BindableHandlingSharedCode enclosingClass, ProcessorContext context, diff --git a/mapper-processor/src/test/java/com/datastax/oss/driver/internal/mapper/processor/MapperProcessorTest.java b/mapper-processor/src/test/java/com/datastax/oss/driver/internal/mapper/processor/MapperProcessorTest.java index 3da206f09a2..85b264f3d62 100644 --- a/mapper-processor/src/test/java/com/datastax/oss/driver/internal/mapper/processor/MapperProcessorTest.java +++ b/mapper-processor/src/test/java/com/datastax/oss/driver/internal/mapper/processor/MapperProcessorTest.java @@ -24,10 +24,10 @@ import com.google.testing.compile.Compiler; import com.squareup.javapoet.JavaFile; import com.squareup.javapoet.TypeSpec; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.annotation.Nonnull; import javax.tools.JavaFileObject; public abstract class MapperProcessorTest { @@ -52,7 +52,7 @@ protected Compilation compileWithMapperProcessor( .compile(files); } - @NonNull + @Nonnull protected MapperProcessor getMapperProcessor() { return new MapperProcessor(); } diff --git a/mapper-runtime/pom.xml b/mapper-runtime/pom.xml index 0b9bf61928f..357b0c6bfcd 100644 --- a/mapper-runtime/pom.xml +++ b/mapper-runtime/pom.xml @@ -53,8 +53,8 @@ jcip-annotations - com.github.spotbugs - spotbugs-annotations + com.google.code.findbugs + jsr305 junit @@ -172,7 +172,7 @@ !net.jcip.annotations.*, !edu.umd.cs.findbugs.annotations.*, + -->!net.jcip.annotations.*, !javax.annotation.*, java.class.externalClassExposedInAPI + We don't consider this a problem + + + + java.annotation.removed + @edu.umd.cs.findbugs.annotations.Nullable + replace spotbugs with jsr305 + + + java.annotation.removed + @edu.umd.cs.findbugs.annotations.NonNull + replace spotbugs with jsr305 + + + java.annotation.removed + @edu.umd.cs.findbugs.annotations.CheckReturnValue + replace spotbugs with jsr305 + + + java.annotation.added + @javax.annotation.Nullable + replace spotbugs with jsr305 + + + java.annotation.added + @javax.annotation.Nonnull + replace spotbugs with jsr305 + + + java.annotation.added + @javax.annotation.CheckReturnValue + replace spotbugs with jsr305 diff --git a/query-builder/pom.xml b/query-builder/pom.xml index 504596140d6..e95861ad907 100644 --- a/query-builder/pom.xml +++ b/query-builder/pom.xml @@ -53,8 +53,8 @@ jcip-annotations - com.github.spotbugs - spotbugs-annotations + com.google.code.findbugs + jsr305 junit @@ -112,7 +112,7 @@ com.datastax.oss.driver.querybuilder - !net.jcip.annotations.*, !edu.umd.cs.findbugs.annotations.*, * + !net.jcip.annotations.*, !javax.annotation.*, * com.datastax.oss.driver.*.querybuilder.*, com.datastax.dse.driver.*.querybuilder.* diff --git a/query-builder/revapi.json b/query-builder/revapi.json index 9d0163b487e..f9cb4e7ed96 100644 --- a/query-builder/revapi.json +++ b/query-builder/revapi.json @@ -27,2730 +27,2730 @@ "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::ifExists()", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::ifExists()", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::ifRaw(java.lang.String)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::ifRaw(java.lang.String)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::if_(com.datastax.oss.driver.api.querybuilder.condition.Condition)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::if_(com.datastax.oss.driver.api.querybuilder.condition.Condition)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::if_(com.datastax.oss.driver.api.querybuilder.condition.Condition[])", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::if_(com.datastax.oss.driver.api.querybuilder.condition.Condition[])", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::if_(java.lang.Iterable)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::if_(java.lang.Iterable)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::ifExists() @ com.datastax.oss.driver.api.querybuilder.delete.Delete", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::ifExists() @ com.datastax.oss.driver.api.querybuilder.delete.Delete", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::ifRaw(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.delete.Delete", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::ifRaw(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.delete.Delete", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::if_(com.datastax.oss.driver.api.querybuilder.condition.Condition) @ com.datastax.oss.driver.api.querybuilder.delete.Delete", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::if_(com.datastax.oss.driver.api.querybuilder.condition.Condition) @ com.datastax.oss.driver.api.querybuilder.delete.Delete", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::if_(com.datastax.oss.driver.api.querybuilder.condition.Condition[]) @ com.datastax.oss.driver.api.querybuilder.delete.Delete", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::if_(com.datastax.oss.driver.api.querybuilder.condition.Condition[]) @ com.datastax.oss.driver.api.querybuilder.delete.Delete", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::if_(java.lang.Iterable) @ com.datastax.oss.driver.api.querybuilder.delete.Delete", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::if_(java.lang.Iterable) @ com.datastax.oss.driver.api.querybuilder.delete.Delete", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation) @ com.datastax.oss.driver.api.querybuilder.delete.Delete", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation) @ com.datastax.oss.driver.api.querybuilder.delete.Delete", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation[]) @ com.datastax.oss.driver.api.querybuilder.delete.Delete", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation[]) @ com.datastax.oss.driver.api.querybuilder.delete.Delete", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(java.lang.Iterable) @ com.datastax.oss.driver.api.querybuilder.delete.Delete", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(java.lang.Iterable) @ com.datastax.oss.driver.api.querybuilder.delete.Delete", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.delete.Delete", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.delete.Delete", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(java.lang.String, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.delete.Delete", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(java.lang.String, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.delete.Delete", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereRaw(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.delete.Delete", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereRaw(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.delete.Delete", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation) @ com.datastax.oss.driver.api.querybuilder.delete.DeleteSelection", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation) @ com.datastax.oss.driver.api.querybuilder.delete.DeleteSelection", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation[]) @ com.datastax.oss.driver.api.querybuilder.delete.DeleteSelection", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation[]) @ com.datastax.oss.driver.api.querybuilder.delete.DeleteSelection", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(java.lang.Iterable) @ com.datastax.oss.driver.api.querybuilder.delete.DeleteSelection", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(java.lang.Iterable) @ com.datastax.oss.driver.api.querybuilder.delete.DeleteSelection", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.delete.DeleteSelection", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.delete.DeleteSelection", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(java.lang.String, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.delete.DeleteSelection", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(java.lang.String, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.delete.DeleteSelection", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereRaw(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.delete.DeleteSelection", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereRaw(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.delete.DeleteSelection", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation[])", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation[])", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(java.lang.Iterable)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(java.lang.Iterable)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.querybuilder.term.Term)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.querybuilder.term.Term)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(java.lang.String, com.datastax.oss.driver.api.querybuilder.term.Term)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(java.lang.String, com.datastax.oss.driver.api.querybuilder.term.Term)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereRaw(java.lang.String)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereRaw(java.lang.String)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.KeyspaceOptions>>::withDurableWrites(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.AlterKeyspace", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.KeyspaceOptions>>::withDurableWrites(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.AlterKeyspace", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.AlterKeyspace", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.AlterKeyspace", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.KeyspaceOptions>>::withDurableWrites(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.AlterKeyspaceStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.KeyspaceOptions>>::withDurableWrites(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.AlterKeyspaceStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.AlterKeyspaceStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.AlterKeyspaceStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterMaterializedViewStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression() @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.AlterTableWithOptionsEnd", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.CreateIndex", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.CreateIndex", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.KeyspaceOptions>>::withDurableWrites(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.CreateKeyspace", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.KeyspaceOptions>>::withDurableWrites(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.CreateKeyspace", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.CreateKeyspace", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.CreateKeyspace", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(java.lang.String, com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(java.lang.String, com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(java.util.Map) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(java.util.Map) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrderByIds(java.util.Map) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrderByIds(java.util.Map) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedView", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(java.lang.String, com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(java.lang.String, com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(java.util.Map) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(java.util.Map) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrderByIds(java.util.Map) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrderByIds(java.util.Map) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewPrimaryKey", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewSelectionWithColumns", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewSelectionWithColumns", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation[]) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewSelectionWithColumns", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation[]) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewSelectionWithColumns", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(java.lang.Iterable) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewSelectionWithColumns", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(java.lang.Iterable) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewSelectionWithColumns", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewSelectionWithColumns", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewSelectionWithColumns", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(java.lang.String, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewSelectionWithColumns", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(java.lang.String, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewSelectionWithColumns", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereRaw(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewSelectionWithColumns", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereRaw(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewSelectionWithColumns", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhere", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhere", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation[]) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhere", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation[]) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhere", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(java.lang.Iterable) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhere", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(java.lang.Iterable) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhere", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhere", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhere", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(java.lang.String, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhere", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(java.lang.String, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhere", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereRaw(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhere", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereRaw(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhere", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhereStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhereStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation[]) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhereStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation[]) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhereStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(java.lang.Iterable) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhereStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(java.lang.Iterable) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhereStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhereStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhereStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(java.lang.String, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhereStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(java.lang.String, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhereStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereRaw(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhereStart", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereRaw(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateMaterializedViewWhereStart", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(java.lang.String, com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(java.lang.String, com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(java.util.Map) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(java.util.Map) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrderByIds(java.util.Map) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrderByIds(java.util.Map) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTable", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(java.lang.String, com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(java.lang.String, com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(java.util.Map) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(java.util.Map) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrderByIds(java.util.Map) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrderByIds(java.util.Map) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression() @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.CreateTableWithOptions", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.KeyspaceOptions>>::withDurableWrites(boolean)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.KeyspaceOptions>>::withDurableWrites(boolean)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.KeyspaceOptions>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.KeyspaceOptions>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression()", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression()", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression()", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression()", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression()", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression()", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression()", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression()", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withBloomFilterFpChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCDC(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCaching(boolean, com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(java.lang.String, com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(java.lang.String, com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(java.util.Map)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrder(java.util.Map)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrderByIds(java.util.Map)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>::withClusteringOrderByIds(java.util.Map)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withComment(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompaction(com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withCompression(java.lang.String, int, double) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDcLocalReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDefaultTimeToLiveSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression() @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression() @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withDeflateCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withGcGraceSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression() @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression() @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withLZ4Compression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMaxIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMemtableFlushPeriodInMs(int) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withMinIndexInterval(int) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression() @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withNoCompression() @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withReadRepairChance(double) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression() @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression() @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSnappyCompression(int, double) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.RelationOptions>>::withSpeculativeRetry(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.schema.RelationStructure>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withEnabled(boolean)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withEnabled(boolean)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withTombstoneCompactionIntervalInSeconds(int)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withTombstoneCompactionIntervalInSeconds(int)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withTombstoneThreshold(double)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withTombstoneThreshold(double)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withUncheckedTombstoneCompaction(boolean)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withUncheckedTombstoneCompaction(boolean)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withEnabled(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.LeveledCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withEnabled(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.LeveledCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.LeveledCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.LeveledCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.LeveledCompactionStrategy>>::withSSTableSizeInMB(int)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.LeveledCompactionStrategy>>::withSSTableSizeInMB(int)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withTombstoneCompactionIntervalInSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.LeveledCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withTombstoneCompactionIntervalInSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.LeveledCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withTombstoneThreshold(double) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.LeveledCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withTombstoneThreshold(double) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.LeveledCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withUncheckedTombstoneCompaction(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.LeveledCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withUncheckedTombstoneCompaction(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.LeveledCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withBucketHigh(double)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withBucketHigh(double)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withBucketLow(double)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withBucketLow(double)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withColdReadsToOmit(double)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withColdReadsToOmit(double)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withEnabled(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withEnabled(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withMaxThreshold(int)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withMaxThreshold(int)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withMinSSTableSizeInBytes(long)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withMinSSTableSizeInBytes(long)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withMinThreshold(int)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withMinThreshold(int)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withOnlyPurgeRepairedTombstones(boolean)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withOnlyPurgeRepairedTombstones(boolean)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withTombstoneCompactionIntervalInSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withTombstoneCompactionIntervalInSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withTombstoneThreshold(double) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withTombstoneThreshold(double) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withUncheckedTombstoneCompaction(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withUncheckedTombstoneCompaction(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withBucketHigh(double) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withBucketHigh(double) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withBucketLow(double) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withBucketLow(double) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withColdReadsToOmit(double) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withColdReadsToOmit(double) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>::withCompactionWindow(long, com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy.CompactionWindowUnit)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>::withCompactionWindow(long, com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy.CompactionWindowUnit)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withEnabled(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withEnabled(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withMaxThreshold(int) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withMaxThreshold(int) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withMinSSTableSizeInBytes(long) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withMinSSTableSizeInBytes(long) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withMinThreshold(int) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withMinThreshold(int) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withOnlyPurgeRepairedTombstones(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.SizeTieredCompactionStrategy>>::withOnlyPurgeRepairedTombstones(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.OptionProvider>>::withOption(java.lang.String, java.lang.Object) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>::withTimestampResolution(com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy.TimestampResolution)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>::withTimestampResolution(com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy.TimestampResolution)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withTombstoneCompactionIntervalInSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withTombstoneCompactionIntervalInSeconds(int) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withTombstoneThreshold(double) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withTombstoneThreshold(double) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withUncheckedTombstoneCompaction(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy>>::withUncheckedTombstoneCompaction(boolean) @ com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>::withUnsafeAggressiveSSTableExpiration(boolean)", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy>>::withUnsafeAggressiveSSTableExpiration(boolean)", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation) @ com.datastax.oss.driver.api.querybuilder.select.Select", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation) @ com.datastax.oss.driver.api.querybuilder.select.Select", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation[]) @ com.datastax.oss.driver.api.querybuilder.select.Select", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation[]) @ com.datastax.oss.driver.api.querybuilder.select.Select", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(java.lang.Iterable) @ com.datastax.oss.driver.api.querybuilder.select.Select", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(java.lang.Iterable) @ com.datastax.oss.driver.api.querybuilder.select.Select", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.select.Select", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.select.Select", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(java.lang.String, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.select.Select", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(java.lang.String, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.select.Select", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereRaw(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.select.Select", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereRaw(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.select.Select", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::ifExists() @ com.datastax.oss.driver.api.querybuilder.update.Update", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::ifExists() @ com.datastax.oss.driver.api.querybuilder.update.Update", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::ifRaw(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.update.Update", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::ifRaw(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.update.Update", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::if_(com.datastax.oss.driver.api.querybuilder.condition.Condition) @ com.datastax.oss.driver.api.querybuilder.update.Update", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::if_(com.datastax.oss.driver.api.querybuilder.condition.Condition) @ com.datastax.oss.driver.api.querybuilder.update.Update", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::if_(com.datastax.oss.driver.api.querybuilder.condition.Condition[]) @ com.datastax.oss.driver.api.querybuilder.update.Update", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::if_(com.datastax.oss.driver.api.querybuilder.condition.Condition[]) @ com.datastax.oss.driver.api.querybuilder.update.Update", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::if_(java.lang.Iterable) @ com.datastax.oss.driver.api.querybuilder.update.Update", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.condition.ConditionalStatement>>::if_(java.lang.Iterable) @ com.datastax.oss.driver.api.querybuilder.update.Update", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation) @ com.datastax.oss.driver.api.querybuilder.update.Update", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation) @ com.datastax.oss.driver.api.querybuilder.update.Update", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation[]) @ com.datastax.oss.driver.api.querybuilder.update.Update", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation[]) @ com.datastax.oss.driver.api.querybuilder.update.Update", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(java.lang.Iterable) @ com.datastax.oss.driver.api.querybuilder.update.Update", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(java.lang.Iterable) @ com.datastax.oss.driver.api.querybuilder.update.Update", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.update.Update", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.update.Update", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(java.lang.String, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.update.Update", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(java.lang.String, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.update.Update", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereRaw(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.update.Update", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereRaw(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.update.Update", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation) @ com.datastax.oss.driver.api.querybuilder.update.UpdateWithAssignments", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation) @ com.datastax.oss.driver.api.querybuilder.update.UpdateWithAssignments", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation[]) @ com.datastax.oss.driver.api.querybuilder.update.UpdateWithAssignments", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(com.datastax.oss.driver.api.querybuilder.relation.Relation[]) @ com.datastax.oss.driver.api.querybuilder.update.UpdateWithAssignments", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(java.lang.Iterable) @ com.datastax.oss.driver.api.querybuilder.update.UpdateWithAssignments", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::where(java.lang.Iterable) @ com.datastax.oss.driver.api.querybuilder.update.UpdateWithAssignments", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.update.UpdateWithAssignments", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.update.UpdateWithAssignments", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(java.lang.String, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.update.UpdateWithAssignments", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereCustomIndex(java.lang.String, com.datastax.oss.driver.api.querybuilder.term.Term) @ com.datastax.oss.driver.api.querybuilder.update.UpdateWithAssignments", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { "code": "java.annotation.added", "old": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereRaw(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.update.UpdateWithAssignments", "new": "method SelfT com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause>>::whereRaw(java.lang.String) @ com.datastax.oss.driver.api.querybuilder.update.UpdateWithAssignments", - "annotation": "@edu.umd.cs.findbugs.annotations.CheckReturnValue", + "annotation": "@javax.annotation.CheckReturnValue", "justification": "JAVA-2161: Annotate mutating methods with @CheckReturnValue" }, { diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/DseSchemaBuilder.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/DseSchemaBuilder.java index 456746204b5..85c4d51572e 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/DseSchemaBuilder.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/DseSchemaBuilder.java @@ -33,8 +33,8 @@ import com.datastax.oss.driver.api.querybuilder.SchemaBuilder; import com.datastax.oss.driver.api.querybuilder.schema.CreateAggregateStart; import com.datastax.oss.driver.api.querybuilder.schema.CreateFunctionStart; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * An extension of {@link com.datastax.oss.driver.api.querybuilder.SchemaBuilder} for building @@ -46,15 +46,15 @@ public class DseSchemaBuilder extends SchemaBuilder { * Starts a CREATE AGGREGATE query with the given aggregate name. This assumes the keyspace name * is already qualified for the Session or Statement. */ - @NonNull - public static CreateDseAggregateStart createDseAggregate(@NonNull CqlIdentifier aggregateId) { + @Nonnull + public static CreateDseAggregateStart createDseAggregate(@Nonnull CqlIdentifier aggregateId) { return new DefaultCreateDseAggregate(aggregateId); } /** Starts a CREATE AGGREGATE query with the given aggregate name for the given keyspace name. */ - @NonNull + @Nonnull public static CreateDseAggregateStart createDseAggregate( - @Nullable CqlIdentifier keyspaceId, @NonNull CqlIdentifier aggregateId) { + @Nullable CqlIdentifier keyspaceId, @Nonnull CqlIdentifier aggregateId) { return new DefaultCreateDseAggregate(keyspaceId, aggregateId); } @@ -62,8 +62,8 @@ public static CreateDseAggregateStart createDseAggregate( * Shortcut for {@link #createDseAggregate(CqlIdentifier) * createDseAggregate(CqlIdentifier.fromCql(aggregateName))}. */ - @NonNull - public static CreateDseAggregateStart createDseAggregate(@NonNull String aggregateName) { + @Nonnull + public static CreateDseAggregateStart createDseAggregate(@Nonnull String aggregateName) { return new DefaultCreateDseAggregate(CqlIdentifier.fromCql(aggregateName)); } @@ -71,9 +71,9 @@ public static CreateDseAggregateStart createDseAggregate(@NonNull String aggrega * Shortcut for {@link #createAggregate(CqlIdentifier, CqlIdentifier) * createDseAggregate(CqlIdentifier.fromCql(keyspaceName), CqlIdentifier.fromCql(aggregateName))}. */ - @NonNull + @Nonnull public static CreateDseAggregateStart createDseAggregate( - @Nullable String keyspaceName, @NonNull String aggregateName) { + @Nullable String keyspaceName, @Nonnull String aggregateName) { return new DefaultCreateDseAggregate( keyspaceName == null ? null : CqlIdentifier.fromCql(keyspaceName), CqlIdentifier.fromCql(aggregateName)); @@ -87,8 +87,8 @@ public static CreateDseAggregateStart createDseAggregate( * DSE-specific features, such as the {@code DETERMINISTIC} keyword, use {@link * #createDseAggregate(CqlIdentifier)}. */ - @NonNull - public static CreateAggregateStart createAggregate(@NonNull CqlIdentifier aggregateName) { + @Nonnull + public static CreateAggregateStart createAggregate(@Nonnull CqlIdentifier aggregateName) { return SchemaBuilder.createAggregate(aggregateName); } @@ -99,9 +99,9 @@ public static CreateAggregateStart createAggregate(@NonNull CqlIdentifier aggreg * DSE-specific features, such as the {@code DETERMINISTIC} keyword, use {@link * #createDseAggregate(CqlIdentifier, CqlIdentifier)}. */ - @NonNull + @Nonnull public static CreateAggregateStart createAggregate( - @Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier aggregateName) { + @Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier aggregateName) { return SchemaBuilder.createAggregate(keyspace, aggregateName); } @@ -113,8 +113,8 @@ public static CreateAggregateStart createAggregate( * DSE-specific features, such as the {@code DETERMINISTIC} keyword, use {@link * #createDseAggregate(String)}. */ - @NonNull - public static CreateAggregateStart createAggregate(@NonNull String aggregateName) { + @Nonnull + public static CreateAggregateStart createAggregate(@Nonnull String aggregateName) { return SchemaBuilder.createAggregate(aggregateName); } @@ -126,9 +126,9 @@ public static CreateAggregateStart createAggregate(@NonNull String aggregateName * DSE-specific features, such as the {@code DETERMINISTIC} keyword, use {@link * #createDseAggregate(String, String)}. */ - @NonNull + @Nonnull public static CreateAggregateStart createAggregate( - @Nullable String keyspace, @NonNull String aggregateName) { + @Nullable String keyspace, @Nonnull String aggregateName) { return SchemaBuilder.createAggregate(keyspace, aggregateName); } @@ -136,15 +136,15 @@ public static CreateAggregateStart createAggregate( * Starts a CREATE FUNCTION query with the given function name. This assumes the keyspace name is * already qualified for the Session or Statement. */ - @NonNull - public static CreateDseFunctionStart createDseFunction(@NonNull CqlIdentifier functionId) { + @Nonnull + public static CreateDseFunctionStart createDseFunction(@Nonnull CqlIdentifier functionId) { return new DefaultCreateDseFunction(functionId); } /** Starts a CREATE FUNCTION query with the given function name for the given keyspace name. */ - @NonNull + @Nonnull public static CreateDseFunctionStart createDseFunction( - @Nullable CqlIdentifier keyspaceId, @NonNull CqlIdentifier functionId) { + @Nullable CqlIdentifier keyspaceId, @Nonnull CqlIdentifier functionId) { return new DefaultCreateDseFunction(keyspaceId, functionId); } @@ -152,8 +152,8 @@ public static CreateDseFunctionStart createDseFunction( * Shortcut for {@link #createFunction(CqlIdentifier) * createFunction(CqlIdentifier.fromCql(functionName)} */ - @NonNull - public static CreateDseFunctionStart createDseFunction(@NonNull String functionName) { + @Nonnull + public static CreateDseFunctionStart createDseFunction(@Nonnull String functionName) { return new DefaultCreateDseFunction(CqlIdentifier.fromCql(functionName)); } @@ -161,9 +161,9 @@ public static CreateDseFunctionStart createDseFunction(@NonNull String functionN * Shortcut for {@link #createFunction(CqlIdentifier, CqlIdentifier) * createFunction(CqlIdentifier.fromCql(keyspaceName), CqlIdentifier.fromCql(functionName)} */ - @NonNull + @Nonnull public static CreateDseFunctionStart createDseFunction( - @Nullable String keyspaceName, @NonNull String functionName) { + @Nullable String keyspaceName, @Nonnull String functionName) { return new DefaultCreateDseFunction( keyspaceName == null ? null : CqlIdentifier.fromCql(keyspaceName), CqlIdentifier.fromCql(functionName)); @@ -177,8 +177,8 @@ public static CreateDseFunctionStart createDseFunction( * DSE-specific features, such as the {@code MONOTONIC} or {@code DETERMINISTIC} keywords, use * {@link #createDseFunction(CqlIdentifier)}. */ - @NonNull - public static CreateFunctionStart createFunction(@NonNull CqlIdentifier functionName) { + @Nonnull + public static CreateFunctionStart createFunction(@Nonnull CqlIdentifier functionName) { return SchemaBuilder.createFunction(functionName); } @@ -189,9 +189,9 @@ public static CreateFunctionStart createFunction(@NonNull CqlIdentifier function * DSE-specific features, such as the {@code MONOTONIC} or {@code DETERMINISTIC} keywords, use * {@link #createDseFunction(CqlIdentifier,CqlIdentifier)}. */ - @NonNull + @Nonnull public static CreateFunctionStart createFunction( - @Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier functionName) { + @Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier functionName) { return SchemaBuilder.createFunction(keyspace, functionName); } @@ -203,8 +203,8 @@ public static CreateFunctionStart createFunction( * DSE-specific features, such as the {@code MONOTONIC} or {@code DETERMINISTIC} keywords, use * {@link #createDseFunction(String)}. */ - @NonNull - public static CreateFunctionStart createFunction(@NonNull String functionName) { + @Nonnull + public static CreateFunctionStart createFunction(@Nonnull String functionName) { return SchemaBuilder.createFunction(functionName); } @@ -216,15 +216,15 @@ public static CreateFunctionStart createFunction(@NonNull String functionName) { * DSE-specific features, such as the {@code MONOTONIC} or {@code DETERMINISTIC} keywords, use * {@link #createDseFunction(String, String)}. */ - @NonNull + @Nonnull public static CreateFunctionStart createFunction( - @Nullable String keyspace, @NonNull String functionName) { + @Nullable String keyspace, @Nonnull String functionName) { return SchemaBuilder.createFunction(keyspace, functionName); } /** Starts a CREATE KEYSPACE query. */ - @NonNull - public static CreateDseKeyspaceStart createDseKeyspace(@NonNull CqlIdentifier keyspaceName) { + @Nonnull + public static CreateDseKeyspaceStart createDseKeyspace(@Nonnull CqlIdentifier keyspaceName) { return new DefaultCreateDseKeyspace(keyspaceName); } @@ -232,14 +232,14 @@ public static CreateDseKeyspaceStart createDseKeyspace(@NonNull CqlIdentifier ke * Shortcut for {@link #createDseKeyspace(CqlIdentifier) * createKeyspace(CqlIdentifier.fromCql(keyspaceName))} */ - @NonNull - public static CreateDseKeyspaceStart createDseKeyspace(@NonNull String keyspaceName) { + @Nonnull + public static CreateDseKeyspaceStart createDseKeyspace(@Nonnull String keyspaceName) { return createDseKeyspace(CqlIdentifier.fromCql(keyspaceName)); } /** Starts an ALTER KEYSPACE query. */ - @NonNull - public static AlterDseKeyspaceStart alterDseKeyspace(@NonNull CqlIdentifier keyspaceName) { + @Nonnull + public static AlterDseKeyspaceStart alterDseKeyspace(@Nonnull CqlIdentifier keyspaceName) { return new DefaultAlterDseKeyspace(keyspaceName); } @@ -247,8 +247,8 @@ public static AlterDseKeyspaceStart alterDseKeyspace(@NonNull CqlIdentifier keys * Shortcut for {@link #alterDseKeyspace(CqlIdentifier) * alterKeyspace(CqlIdentifier.fromCql(keyspaceName)}. */ - @NonNull - public static AlterDseKeyspaceStart alterDseKeyspace(@NonNull String keyspaceName) { + @Nonnull + public static AlterDseKeyspaceStart alterDseKeyspace(@Nonnull String keyspaceName) { return DseSchemaBuilder.alterDseKeyspace(CqlIdentifier.fromCql(keyspaceName)); } @@ -256,15 +256,15 @@ public static AlterDseKeyspaceStart alterDseKeyspace(@NonNull String keyspaceNam * Starts a CREATE TABLE query with the given table name. This assumes the keyspace name is * already qualified for the Session or Statement. */ - @NonNull - public static CreateDseTableStart createDseTable(@NonNull CqlIdentifier tableName) { + @Nonnull + public static CreateDseTableStart createDseTable(@Nonnull CqlIdentifier tableName) { return createDseTable(null, tableName); } /** Starts a CREATE TABLE query with the given table name for the given keyspace name. */ - @NonNull + @Nonnull public static CreateDseTableStart createDseTable( - @Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier tableName) { + @Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier tableName) { return new DefaultCreateDseTable(keyspace, tableName); } @@ -272,8 +272,8 @@ public static CreateDseTableStart createDseTable( * Shortcut for {@link #createDseTable(CqlIdentifier) * createDseTable(CqlIdentifier.fromCql(tableName)} */ - @NonNull - public static CreateDseTableStart createDseTable(@NonNull String tableName) { + @Nonnull + public static CreateDseTableStart createDseTable(@Nonnull String tableName) { return createDseTable(CqlIdentifier.fromCql(tableName)); } @@ -281,9 +281,9 @@ public static CreateDseTableStart createDseTable(@NonNull String tableName) { * Shortcut for {@link #createDseTable(CqlIdentifier,CqlIdentifier) * createDseTable(CqlIdentifier.fromCql(keyspaceName),CqlIdentifier.fromCql(tableName)} */ - @NonNull + @Nonnull public static CreateDseTableStart createDseTable( - @Nullable String keyspace, @NonNull String tableName) { + @Nullable String keyspace, @Nonnull String tableName) { return createDseTable( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(tableName)); @@ -293,15 +293,15 @@ public static CreateDseTableStart createDseTable( * Starts an ALTER TABLE query with the given table name. This assumes the keyspace name is * already qualified for the Session or Statement. */ - @NonNull - public static AlterDseTableStart alterDseTable(@NonNull CqlIdentifier tableName) { + @Nonnull + public static AlterDseTableStart alterDseTable(@Nonnull CqlIdentifier tableName) { return new DefaultAlterDseTable(tableName); } /** Starts an ALTER TABLE query with the given table name for the given keyspace name. */ - @NonNull + @Nonnull public static AlterDseTableStart alterDseTable( - @Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier tableName) { + @Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier tableName) { return new DefaultAlterDseTable(keyspace, tableName); } @@ -309,8 +309,8 @@ public static AlterDseTableStart alterDseTable( * Shortcut for {@link #alterDseTable(CqlIdentifier) * alterDseTable(CqlIdentifier.fromCql(tableName)} */ - @NonNull - public static AlterDseTableStart alterDseTable(@NonNull String tableName) { + @Nonnull + public static AlterDseTableStart alterDseTable(@Nonnull String tableName) { return alterDseTable(CqlIdentifier.fromCql(tableName)); } @@ -318,9 +318,9 @@ public static AlterDseTableStart alterDseTable(@NonNull String tableName) { * Shortcut for {@link #alterDseTable(CqlIdentifier,CqlIdentifier) * alterDseTable(CqlIdentifier.fromCql(keyspaceName),CqlIdentifier.fromCql(tableName)} */ - @NonNull + @Nonnull public static AlterDseTableStart alterDseTable( - @Nullable String keyspace, @NonNull String tableName) { + @Nullable String keyspace, @Nonnull String tableName) { return alterDseTable( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(tableName)); diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseKeyspace.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseKeyspace.java index c7aa795ae24..38c04d0469c 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseKeyspace.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseKeyspace.java @@ -20,28 +20,28 @@ import com.datastax.oss.driver.api.querybuilder.BuildableQuery; import com.datastax.oss.driver.api.querybuilder.schema.KeyspaceOptions; import com.datastax.oss.driver.api.querybuilder.schema.KeyspaceReplicationOptions; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.Nonnull; public interface AlterDseKeyspace extends BuildableQuery, KeyspaceOptions, KeyspaceReplicationOptions { - @NonNull + @Nonnull @Override - AlterDseKeyspace withOption(@NonNull String name, @NonNull Object value); + AlterDseKeyspace withOption(@Nonnull String name, @Nonnull Object value); /** * Adjusts durable writes configuration for this keyspace. If set to false, data written to the * keyspace will bypass the commit log. */ - @NonNull + @Nonnull @Override AlterDseKeyspace withDurableWrites(boolean durableWrites); /** Adjusts the graph engine that will be used to interpret this keyspace. */ - @NonNull + @Nonnull AlterDseKeyspace withGraphEngine(String graphEngine); /** @@ -49,9 +49,9 @@ public interface AlterDseKeyspace * strategy, otherwise it is advisable to use {@link #withSimpleStrategy(int)} or {@link * #withNetworkTopologyStrategy(Map)}. */ - @NonNull + @Nonnull @Override - AlterDseKeyspace withReplicationOptions(@NonNull Map replicationOptions); + AlterDseKeyspace withReplicationOptions(@Nonnull Map replicationOptions); /** * Adds SimpleStrategy replication options with the given replication factor. @@ -59,7 +59,7 @@ public interface AlterDseKeyspace *

    Note that using this will overwrite any previous use of this method or {@link * #withNetworkTopologyStrategy(Map)}. */ - @NonNull + @Nonnull @Override AlterDseKeyspace withSimpleStrategy(int replicationFactor); @@ -73,7 +73,7 @@ public interface AlterDseKeyspace * @param replications Mapping of data center name to replication factor to use for that data * center. */ - @NonNull + @Nonnull @Override - AlterDseKeyspace withNetworkTopologyStrategy(@NonNull Map replications); + AlterDseKeyspace withNetworkTopologyStrategy(@Nonnull Map replications); } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseKeyspaceStart.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseKeyspaceStart.java index 6a36d4b4d46..6114c63b613 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseKeyspaceStart.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseKeyspaceStart.java @@ -19,26 +19,26 @@ import com.datastax.oss.driver.api.querybuilder.schema.KeyspaceOptions; import com.datastax.oss.driver.api.querybuilder.schema.KeyspaceReplicationOptions; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.Nonnull; public interface AlterDseKeyspaceStart extends KeyspaceOptions, KeyspaceReplicationOptions { - @NonNull + @Nonnull @Override - AlterDseKeyspace withOption(@NonNull String name, @NonNull Object value); + AlterDseKeyspace withOption(@Nonnull String name, @Nonnull Object value); /** * Adjusts durable writes configuration for this keyspace. If set to false, data written to the * keyspace will bypass the commit log. */ - @NonNull + @Nonnull @Override AlterDseKeyspace withDurableWrites(boolean durableWrites); /** Adjusts the graph engine that will be used to interpret this keyspace. */ - @NonNull + @Nonnull AlterDseKeyspace withGraphEngine(String graphEngine); /** @@ -46,9 +46,9 @@ public interface AlterDseKeyspaceStart * strategy, otherwise it is advisable to use {@link #withSimpleStrategy(int)} or {@link * #withNetworkTopologyStrategy(Map)}. */ - @NonNull + @Nonnull @Override - AlterDseKeyspace withReplicationOptions(@NonNull Map replicationOptions); + AlterDseKeyspace withReplicationOptions(@Nonnull Map replicationOptions); /** * Adds SimpleStrategy replication options with the given replication factor. @@ -56,7 +56,7 @@ public interface AlterDseKeyspaceStart *

    Note that using this will overwrite any previous use of this method or {@link * #withNetworkTopologyStrategy(Map)}. */ - @NonNull + @Nonnull @Override AlterDseKeyspace withSimpleStrategy(int replicationFactor); @@ -70,7 +70,7 @@ public interface AlterDseKeyspaceStart * @param replications Mapping of data center name to replication factor to use for that data * center. */ - @NonNull + @Nonnull @Override - AlterDseKeyspace withNetworkTopologyStrategy(@NonNull Map replications); + AlterDseKeyspace withNetworkTopologyStrategy(@Nonnull Map replications); } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseTableAddColumn.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseTableAddColumn.java index c5f05a661b9..1f831ccd06a 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseTableAddColumn.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseTableAddColumn.java @@ -21,7 +21,7 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.querybuilder.SchemaBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface AlterDseTableAddColumn { /** @@ -30,17 +30,17 @@ public interface AlterDseTableAddColumn { *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull + @Nonnull AlterDseTableAddColumnEnd addColumn( - @NonNull CqlIdentifier columnName, @NonNull DataType dataType); + @Nonnull CqlIdentifier columnName, @Nonnull DataType dataType); /** * Shortcut for {@link #addColumn(CqlIdentifier, DataType) * addColumn(CqlIdentifier.asCql(columnName), dataType)}. */ - @NonNull + @Nonnull default AlterDseTableAddColumnEnd addColumn( - @NonNull String columnName, @NonNull DataType dataType) { + @Nonnull String columnName, @Nonnull DataType dataType) { return addColumn(CqlIdentifier.fromCql(columnName), dataType); } @@ -50,17 +50,17 @@ default AlterDseTableAddColumnEnd addColumn( *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull + @Nonnull AlterDseTableAddColumnEnd addStaticColumn( - @NonNull CqlIdentifier columnName, @NonNull DataType dataType); + @Nonnull CqlIdentifier columnName, @Nonnull DataType dataType); /** * Shortcut for {@link #addStaticColumn(CqlIdentifier, DataType) * addStaticColumn(CqlIdentifier.asCql(columnName), dataType)}. */ - @NonNull + @Nonnull default AlterDseTableAddColumnEnd addStaticColumn( - @NonNull String columnName, @NonNull DataType dataType) { + @Nonnull String columnName, @Nonnull DataType dataType) { return addStaticColumn(CqlIdentifier.fromCql(columnName), dataType); } } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseTableDropColumn.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseTableDropColumn.java index 50e672f8e6e..8a8c7cce5a5 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseTableDropColumn.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseTableDropColumn.java @@ -18,19 +18,19 @@ package com.datastax.dse.driver.api.querybuilder.schema; import com.datastax.oss.driver.api.core.CqlIdentifier; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface AlterDseTableDropColumn { /** * Adds column(s) to drop to ALTER TABLE specification. This may be repeated with successive calls * to drop columns. */ - @NonNull - AlterDseTableDropColumnEnd dropColumns(@NonNull CqlIdentifier... columnNames); + @Nonnull + AlterDseTableDropColumnEnd dropColumns(@Nonnull CqlIdentifier... columnNames); /** Shortcut for {@link #dropColumns(CqlIdentifier...)}. */ - @NonNull - default AlterDseTableDropColumnEnd dropColumns(@NonNull String... columnNames) { + @Nonnull + default AlterDseTableDropColumnEnd dropColumns(@Nonnull String... columnNames) { CqlIdentifier ids[] = new CqlIdentifier[columnNames.length]; for (int i = 0; i < columnNames.length; i++) { ids[i] = CqlIdentifier.fromCql(columnNames[i]); @@ -42,16 +42,16 @@ default AlterDseTableDropColumnEnd dropColumns(@NonNull String... columnNames) { * Adds a column to drop to ALTER TABLE specification. This may be repeated with successive calls * to drop columns. Shortcut for {@link #dropColumns(CqlIdentifier...) #dropColumns(columnName)}. */ - @NonNull - default AlterDseTableDropColumnEnd dropColumn(@NonNull CqlIdentifier columnName) { + @Nonnull + default AlterDseTableDropColumnEnd dropColumn(@Nonnull CqlIdentifier columnName) { return dropColumns(columnName); } /** * Shortcut for {@link #dropColumn(CqlIdentifier) dropColumn(CqlIdentifier.fromCql(columnName))}. */ - @NonNull - default AlterDseTableDropColumnEnd dropColumn(@NonNull String columnName) { + @Nonnull + default AlterDseTableDropColumnEnd dropColumn(@Nonnull String columnName) { return dropColumns(CqlIdentifier.fromCql(columnName)); } } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseTableRenameColumn.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseTableRenameColumn.java index 7a24a76f4ab..376ea2c2967 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseTableRenameColumn.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseTableRenameColumn.java @@ -18,7 +18,7 @@ package com.datastax.dse.driver.api.querybuilder.schema; import com.datastax.oss.driver.api.core.CqlIdentifier; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface AlterDseTableRenameColumn { @@ -26,15 +26,15 @@ public interface AlterDseTableRenameColumn { * Adds a column rename to ALTER TABLE specification. This may be repeated with successive calls * to rename columns. */ - @NonNull - AlterDseTableRenameColumnEnd renameColumn(@NonNull CqlIdentifier from, @NonNull CqlIdentifier to); + @Nonnull + AlterDseTableRenameColumnEnd renameColumn(@Nonnull CqlIdentifier from, @Nonnull CqlIdentifier to); /** * Shortcut for {@link #renameColumn(CqlIdentifier, CqlIdentifier) * renameField(CqlIdentifier.fromCql(from),CqlIdentifier.fromCql(to))}. */ - @NonNull - default AlterDseTableRenameColumnEnd renameColumn(@NonNull String from, @NonNull String to) { + @Nonnull + default AlterDseTableRenameColumnEnd renameColumn(@Nonnull String from, @Nonnull String to) { return renameColumn(CqlIdentifier.fromCql(from), CqlIdentifier.fromCql(to)); } } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseTableStart.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseTableStart.java index bb34bb3fb38..f96cecf0074 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseTableStart.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/AlterDseTableStart.java @@ -22,8 +22,8 @@ import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.querybuilder.BuildableQuery; import com.datastax.oss.driver.api.querybuilder.SchemaBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public interface AlterDseTableStart extends AlterDseTableWithOptions, @@ -33,7 +33,7 @@ public interface AlterDseTableStart DseTableGraphOptions { /** Completes ALTER TABLE specifying that compact storage should be removed from the table. */ - @NonNull + @Nonnull BuildableQuery dropCompactStorage(); /** @@ -42,28 +42,28 @@ public interface AlterDseTableStart *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull - BuildableQuery alterColumn(@NonNull CqlIdentifier columnName, @NonNull DataType dataType); + @Nonnull + BuildableQuery alterColumn(@Nonnull CqlIdentifier columnName, @Nonnull DataType dataType); /** * Shortcut for {@link #alterColumn(CqlIdentifier, DataType) * alterColumn(CqlIdentifier.fromCql(columnName,dataType)}. */ - @NonNull - default BuildableQuery alterColumn(@NonNull String columnName, @NonNull DataType dataType) { + @Nonnull + default BuildableQuery alterColumn(@Nonnull String columnName, @Nonnull DataType dataType) { return alterColumn(CqlIdentifier.fromCql(columnName), dataType); } /** Removes the named vertex label from this table. */ - @NonNull + @Nonnull BuildableQuery withoutVertexLabel(@Nullable CqlIdentifier vertexLabelId); /** * Shortcut for {@link #withoutVertexLabel(CqlIdentifier) * withoutVertexLabel(CqlIdentifier.fromCql(vertexLabelName))}. */ - @NonNull - default BuildableQuery withoutVertexLabel(@NonNull String vertexLabelName) { + @Nonnull + default BuildableQuery withoutVertexLabel(@Nonnull String vertexLabelName) { return withoutVertexLabel(CqlIdentifier.fromCql(vertexLabelName)); } @@ -72,21 +72,21 @@ default BuildableQuery withoutVertexLabel(@NonNull String vertexLabelName) { * *

    This is a shortcut for {@link #withoutVertexLabel(CqlIdentifier) withoutVertexLabel(null)}. */ - @NonNull + @Nonnull default BuildableQuery withoutVertexLabel() { return withoutVertexLabel((CqlIdentifier) null); } /** Removes the named edge label from this table. */ - @NonNull + @Nonnull BuildableQuery withoutEdgeLabel(@Nullable CqlIdentifier edgeLabelId); /** * Shortcut for {@link #withoutEdgeLabel(CqlIdentifier) * withoutEdgeLabel(CqlIdentifier.fromCql(edgeLabelName))}. */ - @NonNull - default BuildableQuery withoutEdgeLabel(@NonNull String edgeLabelName) { + @Nonnull + default BuildableQuery withoutEdgeLabel(@Nonnull String edgeLabelName) { return withoutEdgeLabel(CqlIdentifier.fromCql(edgeLabelName)); } @@ -95,7 +95,7 @@ default BuildableQuery withoutEdgeLabel(@NonNull String edgeLabelName) { * *

    This is a shortcut for {@link #withoutVertexLabel(CqlIdentifier) withoutEdgeLabel(null)}. */ - @NonNull + @Nonnull default BuildableQuery withoutEdgeLabel() { return withoutEdgeLabel((CqlIdentifier) null); } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseAggregateEnd.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseAggregateEnd.java index e28c887cd22..b40ec019989 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseAggregateEnd.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseAggregateEnd.java @@ -20,7 +20,7 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.querybuilder.BuildableQuery; import com.datastax.oss.driver.api.querybuilder.term.Term; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateDseAggregateEnd extends BuildableQuery { @@ -28,22 +28,22 @@ public interface CreateDseAggregateEnd extends BuildableQuery { * Adds INITCOND to the aggregate query. Defines the initial condition, values, of the first * parameter in the SFUNC. */ - @NonNull - CreateDseAggregateEnd withInitCond(@NonNull Term term); + @Nonnull + CreateDseAggregateEnd withInitCond(@Nonnull Term term); /** * Adds FINALFUNC to the create aggregate query. This is used to specify what type is returned * from the state function. */ - @NonNull - CreateDseAggregateEnd withFinalFunc(@NonNull CqlIdentifier finalFunc); + @Nonnull + CreateDseAggregateEnd withFinalFunc(@Nonnull CqlIdentifier finalFunc); /** * Shortcut for {@link #withFinalFunc(CqlIdentifier) * withFinalFunc(CqlIdentifier.fromCql(finalFuncName))}. */ - @NonNull - default CreateDseAggregateEnd withFinalFunc(@NonNull String finalFuncName) { + @Nonnull + default CreateDseAggregateEnd withFinalFunc(@Nonnull String finalFuncName) { return withFinalFunc(CqlIdentifier.fromCql(finalFuncName)); } @@ -52,6 +52,6 @@ default CreateDseAggregateEnd withFinalFunc(@NonNull String finalFuncName) { * aggregate always returns the same output for a given input. Requires an initial condition and * returns a single value. */ - @NonNull + @Nonnull CreateDseAggregateEnd deterministic(); } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseAggregateStart.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseAggregateStart.java index 76bece6ca5f..3dafe026ed3 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseAggregateStart.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseAggregateStart.java @@ -21,21 +21,21 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.querybuilder.SchemaBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateDseAggregateStart { /** * Adds IF NOT EXISTS to the create aggregate specification. This indicates that the aggregate * should not be created if it already exists. */ - @NonNull + @Nonnull CreateDseAggregateStart ifNotExists(); /** * Adds OR REPLACE to the create aggregate specification. This indicates that the aggregate should * replace an existing aggregate with the same name if it exists. */ - @NonNull + @Nonnull CreateDseAggregateStart orReplace(); /** @@ -46,16 +46,16 @@ public interface CreateDseAggregateStart { *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull - CreateDseAggregateStart withParameter(@NonNull DataType paramType); + @Nonnull + CreateDseAggregateStart withParameter(@Nonnull DataType paramType); /** Adds SFUNC to the create aggregate specification. This is the state function for each row. */ - @NonNull - CreateDseAggregateStateFunc withSFunc(@NonNull CqlIdentifier sfuncName); + @Nonnull + CreateDseAggregateStateFunc withSFunc(@Nonnull CqlIdentifier sfuncName); /** Shortcut for {@link #withSFunc(CqlIdentifier) withSFunc(CqlIdentifier.fromCql(sfuncName))}. */ - @NonNull - default CreateDseAggregateStateFunc withSFunc(@NonNull String sfuncName) { + @Nonnull + default CreateDseAggregateStateFunc withSFunc(@Nonnull String sfuncName) { return withSFunc(CqlIdentifier.fromCql(sfuncName)); } } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseAggregateStateFunc.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseAggregateStateFunc.java index deb3b49a34a..a37a382cad5 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseAggregateStateFunc.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseAggregateStateFunc.java @@ -21,7 +21,7 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.querybuilder.SchemaBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateDseAggregateStateFunc { @@ -32,6 +32,6 @@ public interface CreateDseAggregateStateFunc { *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull - CreateDseAggregateEnd withSType(@NonNull DataType dataType); + @Nonnull + CreateDseAggregateEnd withSType(@Nonnull DataType dataType); } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseFunctionStart.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseFunctionStart.java index 64a741d62a9..eb5dc17d623 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseFunctionStart.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseFunctionStart.java @@ -21,7 +21,7 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.querybuilder.SchemaBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateDseFunctionStart { @@ -29,14 +29,14 @@ public interface CreateDseFunctionStart { * Adds IF NOT EXISTS to the create function specification. This indicates that the function * should not be created if it already exists. */ - @NonNull + @Nonnull CreateDseFunctionStart ifNotExists(); /** * Adds OR REPLACE to the create function specification. This indicates that the function should * replace an existing function with the same name if it exists. */ - @NonNull + @Nonnull CreateDseFunctionStart orReplace(); /** @@ -47,17 +47,17 @@ public interface CreateDseFunctionStart { *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull + @Nonnull CreateDseFunctionStart withParameter( - @NonNull CqlIdentifier paramName, @NonNull DataType paramType); + @Nonnull CqlIdentifier paramName, @Nonnull DataType paramType); /** * Shortcut for {@link #withParameter(CqlIdentifier, DataType) * withParameter(CqlIdentifier.asCql(paramName), dataType)}. */ - @NonNull + @Nonnull default CreateDseFunctionStart withParameter( - @NonNull String paramName, @NonNull DataType paramType) { + @Nonnull String paramName, @Nonnull DataType paramType) { return withParameter(CqlIdentifier.fromCql(paramName), paramType); } @@ -65,13 +65,13 @@ default CreateDseFunctionStart withParameter( * Adds RETURNS NULL ON NULL to the create function specification. This indicates that the body of * the function should be skipped when null input is provided. */ - @NonNull + @Nonnull CreateDseFunctionWithNullOption returnsNullOnNull(); /** * Adds CALLED ON NULL to the create function specification. This indicates that the body of the * function not be skipped when null input is provided. */ - @NonNull + @Nonnull CreateDseFunctionWithNullOption calledOnNull(); } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseFunctionWithLanguage.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseFunctionWithLanguage.java index 10935061404..7f12d1dc7a9 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseFunctionWithLanguage.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseFunctionWithLanguage.java @@ -17,7 +17,7 @@ */ package com.datastax.dse.driver.api.querybuilder.schema; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateDseFunctionWithLanguage { @@ -29,8 +29,8 @@ public interface CreateDseFunctionWithLanguage { * postgres-style string literal, which is surrounded in two dollar signs, i.e. $$ myBody $$ * . */ - @NonNull - CreateDseFunctionEnd as(@NonNull String functionBody); + @Nonnull + CreateDseFunctionEnd as(@Nonnull String functionBody); /** * Adds AS to the create function specification and quotes the function body. Assumes that if the @@ -39,8 +39,8 @@ public interface CreateDseFunctionWithLanguage { * ' myBody '. If the function body is already quoted {@link #as(String)} should be used * instead. */ - @NonNull - default CreateDseFunctionEnd asQuoted(@NonNull String functionBody) { + @Nonnull + default CreateDseFunctionEnd asQuoted(@Nonnull String functionBody) { if (functionBody.contains("'")) { return as("$$ " + functionBody + " $$"); } else { diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseFunctionWithNullOption.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseFunctionWithNullOption.java index 2a44c002852..c77da492ed6 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseFunctionWithNullOption.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseFunctionWithNullOption.java @@ -21,7 +21,7 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.querybuilder.SchemaBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateDseFunctionWithNullOption { /** @@ -31,6 +31,6 @@ public interface CreateDseFunctionWithNullOption { *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull - CreateDseFunctionWithType returnsType(@NonNull DataType dataType); + @Nonnull + CreateDseFunctionWithType returnsType(@Nonnull DataType dataType); } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseFunctionWithType.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseFunctionWithType.java index b70facf51a1..76d080e55cf 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseFunctionWithType.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseFunctionWithType.java @@ -18,21 +18,21 @@ package com.datastax.dse.driver.api.querybuilder.schema; import com.datastax.oss.driver.api.core.CqlIdentifier; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateDseFunctionWithType { /** * Adds LANGUAGE to the create function specification. This is used to specify what language is * used in the function body. */ - @NonNull - CreateDseFunctionWithLanguage withLanguage(@NonNull String language); + @Nonnull + CreateDseFunctionWithLanguage withLanguage(@Nonnull String language); /** * Adds "LANGUAGE java" to create function specification. Shortcut for {@link * #withLanguage(String) withLanguage("java")}. */ - @NonNull + @Nonnull default CreateDseFunctionWithLanguage withJavaLanguage() { return withLanguage("java"); } @@ -41,7 +41,7 @@ default CreateDseFunctionWithLanguage withJavaLanguage() { * Adds "LANGUAGE javascript" to create function specification. Shortcut for {@link * #withLanguage(String) withLanguage("javascript")}. */ - @NonNull + @Nonnull default CreateDseFunctionWithLanguage withJavaScriptLanguage() { return withLanguage("javascript"); } @@ -50,14 +50,14 @@ default CreateDseFunctionWithLanguage withJavaScriptLanguage() { * Adds "DETERMINISTIC" to create function specification. This is used to specify that this * function always returns the same output for a given input. */ - @NonNull + @Nonnull CreateDseFunctionWithType deterministic(); /** * Adds "MONOTONIC" to create function specification. This is used to specify that this function * is either entirely non-increasing, or entirely non-decreasing. */ - @NonNull + @Nonnull CreateDseFunctionWithType monotonic(); /** @@ -65,15 +65,15 @@ default CreateDseFunctionWithLanguage withJavaScriptLanguage() { * function has only a single column that is monotonic. If the function is fully monotonic, use * {@link #monotonic()} instead. */ - @NonNull - CreateDseFunctionWithType monotonicOn(@NonNull CqlIdentifier monotonicColumn); + @Nonnull + CreateDseFunctionWithType monotonicOn(@Nonnull CqlIdentifier monotonicColumn); /** * Shortcut for {@link #monotonicOn(CqlIdentifier) * monotonicOn(CqlIdentifier.fromCql(monotonicColumn))}. */ - @NonNull - default CreateDseFunctionWithType monotonicOn(@NonNull String monotonicColumn) { + @Nonnull + default CreateDseFunctionWithType monotonicOn(@Nonnull String monotonicColumn) { return monotonicOn(CqlIdentifier.fromCql(monotonicColumn)); } } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseKeyspace.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseKeyspace.java index 0fcb87bafbd..2738aeb64b3 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseKeyspace.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseKeyspace.java @@ -19,26 +19,26 @@ import com.datastax.oss.driver.api.querybuilder.BuildableQuery; import com.datastax.oss.driver.api.querybuilder.schema.KeyspaceOptions; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateDseKeyspace extends BuildableQuery, KeyspaceOptions { - @NonNull + @Nonnull @Override - CreateDseKeyspace withOption(@NonNull String name, @NonNull Object value); + CreateDseKeyspace withOption(@Nonnull String name, @Nonnull Object value); /** * Adjusts durable writes configuration for this keyspace. If set to false, data written to the * keyspace will bypass the commit log. */ - @NonNull + @Nonnull @Override default CreateDseKeyspace withDurableWrites(boolean durableWrites) { return withOption("durable_writes", durableWrites); } /** Adjusts the graph engine that will be used to interpret this keyspace. */ - @NonNull + @Nonnull default CreateDseKeyspace withGraphEngine(String graphEngine) { return this.withOption("graph_engine", graphEngine); } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseKeyspaceStart.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseKeyspaceStart.java index c0ee240c8ff..09ba1ac85b2 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseKeyspaceStart.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseKeyspaceStart.java @@ -19,15 +19,15 @@ import com.datastax.oss.driver.api.querybuilder.schema.KeyspaceReplicationOptions; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.Nonnull; public interface CreateDseKeyspaceStart extends KeyspaceReplicationOptions { /** * Adds IF NOT EXISTS to the create keyspace specification. This indicates that the keyspace * should not be created it already exists. */ - @NonNull + @Nonnull CreateDseKeyspaceStart ifNotExists(); /** @@ -35,9 +35,9 @@ public interface CreateDseKeyspaceStart extends KeyspaceReplicationOptions replicationOptions); + CreateDseKeyspace withReplicationOptions(@Nonnull Map replicationOptions); /** * Adds SimpleStrategy replication options with the given replication factor. @@ -45,7 +45,7 @@ public interface CreateDseKeyspaceStart extends KeyspaceReplicationOptionsNote that using this will overwrite any previous use of this method or {@link * #withNetworkTopologyStrategy(Map)}. */ - @NonNull + @Nonnull @Override default CreateDseKeyspace withSimpleStrategy(int replicationFactor) { ImmutableMap replication = @@ -67,10 +67,10 @@ default CreateDseKeyspace withSimpleStrategy(int replicationFactor) { * @param replications Mapping of data center name to replication factor to use for that data * center. */ - @NonNull + @Nonnull @Override default CreateDseKeyspace withNetworkTopologyStrategy( - @NonNull Map replications) { + @Nonnull Map replications) { ImmutableMap.Builder replicationBuilder = ImmutableMap.builder().put("class", "NetworkTopologyStrategy"); diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseTable.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseTable.java index fa6d008c114..404e9a0d040 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseTable.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseTable.java @@ -22,7 +22,7 @@ import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.querybuilder.BuildableQuery; import com.datastax.oss.driver.api.querybuilder.SchemaBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateDseTable extends BuildableQuery, OngoingDsePartitionKey, CreateDseTableWithOptions { @@ -38,17 +38,17 @@ public interface CreateDseTable *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull + @Nonnull CreateDseTable withClusteringColumn( - @NonNull CqlIdentifier columnName, @NonNull DataType dataType); + @Nonnull CqlIdentifier columnName, @Nonnull DataType dataType); /** * Shortcut for {@link #withClusteringColumn(CqlIdentifier, DataType) * withClusteringColumn(CqlIdentifier.asCql(columnName), dataType)}. */ - @NonNull + @Nonnull default CreateDseTable withClusteringColumn( - @NonNull String columnName, @NonNull DataType dataType) { + @Nonnull String columnName, @Nonnull DataType dataType) { return withClusteringColumn(CqlIdentifier.fromCql(columnName), dataType); } @@ -58,15 +58,15 @@ default CreateDseTable withClusteringColumn( *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull - CreateDseTable withColumn(@NonNull CqlIdentifier columnName, @NonNull DataType dataType); + @Nonnull + CreateDseTable withColumn(@Nonnull CqlIdentifier columnName, @Nonnull DataType dataType); /** * Shortcut for {@link #withColumn(CqlIdentifier, DataType) * withColumn(CqlIdentifier.asCql(columnName), dataType)}. */ - @NonNull - default CreateDseTable withColumn(@NonNull String columnName, @NonNull DataType dataType) { + @Nonnull + default CreateDseTable withColumn(@Nonnull String columnName, @Nonnull DataType dataType) { return withColumn(CqlIdentifier.fromCql(columnName), dataType); } @@ -79,15 +79,15 @@ default CreateDseTable withColumn(@NonNull String columnName, @NonNull DataType *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull - CreateDseTable withStaticColumn(@NonNull CqlIdentifier columnName, @NonNull DataType dataType); + @Nonnull + CreateDseTable withStaticColumn(@Nonnull CqlIdentifier columnName, @Nonnull DataType dataType); /** * Shortcut for {@link #withStaticColumn(CqlIdentifier, DataType) * withStaticColumn(CqlIdentifier.asCql(columnName), dataType)}. */ - @NonNull - default CreateDseTable withStaticColumn(@NonNull String columnName, @NonNull DataType dataType) { + @Nonnull + default CreateDseTable withStaticColumn(@Nonnull String columnName, @Nonnull DataType dataType) { return withStaticColumn(CqlIdentifier.fromCql(columnName), dataType); } } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseTableStart.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseTableStart.java index 030668262df..4715e9ee453 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseTableStart.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseTableStart.java @@ -17,7 +17,7 @@ */ package com.datastax.dse.driver.api.querybuilder.schema; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateDseTableStart extends OngoingDsePartitionKey { @@ -25,6 +25,6 @@ public interface CreateDseTableStart extends OngoingDsePartitionKey { * Adds IF NOT EXISTS to the create table specification. This indicates that the table should not * be created if it already exists. */ - @NonNull + @Nonnull CreateDseTableStart ifNotExists(); } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseTableWithOptions.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseTableWithOptions.java index 3d7b44ef905..475688798f7 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseTableWithOptions.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/CreateDseTableWithOptions.java @@ -18,7 +18,7 @@ package com.datastax.dse.driver.api.querybuilder.schema; import com.datastax.oss.driver.api.querybuilder.BuildableQuery; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateDseTableWithOptions extends BuildableQuery, @@ -26,6 +26,6 @@ public interface CreateDseTableWithOptions DseTableGraphOptions { /** Enables COMPACT STORAGE in the CREATE TABLE statement. */ - @NonNull + @Nonnull CreateDseTableWithOptions withCompactStorage(); } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/DseGraphEdgeSide.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/DseGraphEdgeSide.java index 7cfe8285919..6febff9ac69 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/DseGraphEdgeSide.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/DseGraphEdgeSide.java @@ -19,20 +19,20 @@ import com.datastax.dse.driver.internal.querybuilder.schema.DefaultDseGraphEdgeSide; import com.datastax.oss.driver.api.core.CqlIdentifier; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; +import javax.annotation.Nonnull; public interface DseGraphEdgeSide { /** Starts the definition of a graph edge side by designating the from/to table. */ - @NonNull - static DseGraphEdgeSide table(@NonNull CqlIdentifier tableId) { + @Nonnull + static DseGraphEdgeSide table(@Nonnull CqlIdentifier tableId) { return new DefaultDseGraphEdgeSide(tableId); } /** Shortcut for {@link #table(CqlIdentifier) table(CqlIdentifier.fromCql(tableName))}. */ - @NonNull - static DseGraphEdgeSide table(@NonNull String tableName) { + @Nonnull + static DseGraphEdgeSide table(@Nonnull String tableName) { return table(CqlIdentifier.fromCql(tableName)); } @@ -41,15 +41,15 @@ static DseGraphEdgeSide table(@NonNull String tableName) { * *

    Call this method multiple times if the partition key is composite. */ - @NonNull - DseGraphEdgeSide withPartitionKey(@NonNull CqlIdentifier columnId); + @Nonnull + DseGraphEdgeSide withPartitionKey(@Nonnull CqlIdentifier columnId); /** * Shortcut for {@link #withPartitionKey(CqlIdentifier) * withPartitionKey(CqlIdentifier.fromCql(columnName))}. */ - @NonNull - default DseGraphEdgeSide withPartitionKey(@NonNull String columnName) { + @Nonnull + default DseGraphEdgeSide withPartitionKey(@Nonnull String columnName) { return withPartitionKey(CqlIdentifier.fromCql(columnName)); } @@ -58,24 +58,24 @@ default DseGraphEdgeSide withPartitionKey(@NonNull String columnName) { * *

    Call this method multiple times to add more than one clustering column. */ - @NonNull - DseGraphEdgeSide withClusteringColumn(@NonNull CqlIdentifier columnId); + @Nonnull + DseGraphEdgeSide withClusteringColumn(@Nonnull CqlIdentifier columnId); /** * Shortcut for {@link #withClusteringColumn(CqlIdentifier) * withClusteringColumn(CqlIdentifier.fromCql(columnName))}. */ - @NonNull - default DseGraphEdgeSide withClusteringColumn(@NonNull String columnName) { + @Nonnull + default DseGraphEdgeSide withClusteringColumn(@Nonnull String columnName) { return withClusteringColumn(CqlIdentifier.fromCql(columnName)); } - @NonNull + @Nonnull CqlIdentifier getTableId(); - @NonNull + @Nonnull List getPartitionKeyColumns(); - @NonNull + @Nonnull List getClusteringColumns(); } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/DseRelationStructure.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/DseRelationStructure.java index f26039e45b4..71456db446f 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/DseRelationStructure.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/DseRelationStructure.java @@ -20,8 +20,8 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder; import com.datastax.oss.driver.internal.core.CqlIdentifiers; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.Nonnull; public interface DseRelationStructure> extends DseRelationOptions { @@ -33,8 +33,8 @@ public interface DseRelationStructure> * defined for a given identifier, it will be removed and the new ordering will appear in its * position in the provided map. */ - @NonNull - SelfT withClusteringOrderByIds(@NonNull Map orderings); + @Nonnull + SelfT withClusteringOrderByIds(@Nonnull Map orderings); /** * Shortcut for {@link #withClusteringOrderByIds(Map)} with the columns specified as @@ -43,8 +43,8 @@ public interface DseRelationStructure> *

    Note that it's possible for two different case-sensitive names to resolve to the same * identifier, for example "foo" and "Foo"; if this happens, a runtime exception will be thrown. */ - @NonNull - default SelfT withClusteringOrder(@NonNull Map orderings) { + @Nonnull + default SelfT withClusteringOrder(@Nonnull Map orderings) { return withClusteringOrderByIds(CqlIdentifiers.wrapKeys(orderings)); } @@ -54,15 +54,15 @@ default SelfT withClusteringOrder(@NonNull Map ordering *

    If clustering order was already defined for this identifier, it will be removed and the new * clause will be appended at the end of the current clustering order. */ - @NonNull - SelfT withClusteringOrder(@NonNull CqlIdentifier columnName, @NonNull ClusteringOrder order); + @Nonnull + SelfT withClusteringOrder(@Nonnull CqlIdentifier columnName, @Nonnull ClusteringOrder order); /** * Shortcut for {@link #withClusteringOrder(CqlIdentifier, ClusteringOrder) * withClusteringOrder(CqlIdentifier.fromCql(columnName), order)}. */ - @NonNull - default SelfT withClusteringOrder(@NonNull String columnName, @NonNull ClusteringOrder order) { + @Nonnull + default SelfT withClusteringOrder(@Nonnull String columnName, @Nonnull ClusteringOrder order) { return withClusteringOrder(CqlIdentifier.fromCql(columnName), order); } } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/DseTableGraphOptions.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/DseTableGraphOptions.java index df1008ff053..8ddf9baa74a 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/DseTableGraphOptions.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/DseTableGraphOptions.java @@ -18,21 +18,21 @@ package com.datastax.dse.driver.api.querybuilder.schema; import com.datastax.oss.driver.api.core.CqlIdentifier; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public interface DseTableGraphOptions { /** Adds a vertex label to this table. */ - @NonNull + @Nonnull NextT withVertexLabel(@Nullable CqlIdentifier vertexLabelId); /** * Shortcut for {@link #withVertexLabel(CqlIdentifier) * withVertexLabel(CqlIdentifier.fromCql(vertexLabel))}. */ - @NonNull - default NextT withVertexLabel(@NonNull String vertexLabelName) { + @Nonnull + default NextT withVertexLabel(@Nonnull String vertexLabelName) { return withVertexLabel(CqlIdentifier.fromCql(vertexLabelName)); } @@ -41,7 +41,7 @@ default NextT withVertexLabel(@NonNull String vertexLabelName) { * *

    This is a shortcut for {@link #withVertexLabel(CqlIdentifier) withVertexLabel(null)}. */ - @NonNull + @Nonnull default NextT withVertexLabel() { return withVertexLabel((CqlIdentifier) null); } @@ -62,19 +62,19 @@ default NextT withVertexLabel() { * .withClusteringColumn("software_version")) * } */ - @NonNull + @Nonnull NextT withEdgeLabel( @Nullable CqlIdentifier edgeLabelId, - @NonNull DseGraphEdgeSide from, - @NonNull DseGraphEdgeSide to); + @Nonnull DseGraphEdgeSide from, + @Nonnull DseGraphEdgeSide to); /** * Shortcut for {@link #withEdgeLabel(CqlIdentifier, DseGraphEdgeSide, DseGraphEdgeSide) * withEdgeLabel(CqlIdentifier.fromCql(edgeLabelName), from, to)}. */ - @NonNull + @Nonnull default NextT withEdgeLabel( - @NonNull String edgeLabelName, @NonNull DseGraphEdgeSide from, @NonNull DseGraphEdgeSide to) { + @Nonnull String edgeLabelName, @Nonnull DseGraphEdgeSide from, @Nonnull DseGraphEdgeSide to) { return withEdgeLabel(CqlIdentifier.fromCql(edgeLabelName), from, to); } @@ -84,8 +84,8 @@ default NextT withEdgeLabel( *

    This is a shortcut for {@link #withEdgeLabel(CqlIdentifier, DseGraphEdgeSide, * DseGraphEdgeSide) withEdgeLabel(null, from, to)}. */ - @NonNull - default NextT withEdgeLabel(@NonNull DseGraphEdgeSide from, @NonNull DseGraphEdgeSide to) { + @Nonnull + default NextT withEdgeLabel(@Nonnull DseGraphEdgeSide from, @Nonnull DseGraphEdgeSide to) { return withEdgeLabel((CqlIdentifier) null, from, to); } } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/OngoingDsePartitionKey.java b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/OngoingDsePartitionKey.java index d535939994b..da75390ea03 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/OngoingDsePartitionKey.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/api/querybuilder/schema/OngoingDsePartitionKey.java @@ -22,7 +22,7 @@ import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.querybuilder.SchemaBuilder; import com.datastax.oss.driver.api.querybuilder.schema.CreateTable; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface OngoingDsePartitionKey { @@ -37,15 +37,15 @@ public interface OngoingDsePartitionKey { *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull - CreateDseTable withPartitionKey(@NonNull CqlIdentifier columnName, @NonNull DataType dataType); + @Nonnull + CreateDseTable withPartitionKey(@Nonnull CqlIdentifier columnName, @Nonnull DataType dataType); /** * Shortcut for {@link #withPartitionKey(CqlIdentifier, DataType) * withPartitionKey(CqlIdentifier.asCql(columnName), dataType)}. */ - @NonNull - default CreateDseTable withPartitionKey(@NonNull String columnName, @NonNull DataType dataType) { + @Nonnull + default CreateDseTable withPartitionKey(@Nonnull String columnName, @Nonnull DataType dataType) { return withPartitionKey(CqlIdentifier.fromCql(columnName), dataType); } } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultAlterDseKeyspace.java b/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultAlterDseKeyspace.java index 6fa2a64eaf3..6043f0d19ab 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultAlterDseKeyspace.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultAlterDseKeyspace.java @@ -23,8 +23,8 @@ import com.datastax.oss.driver.internal.querybuilder.ImmutableCollections; import com.datastax.oss.driver.internal.querybuilder.schema.OptionsUtils; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -33,35 +33,35 @@ public class DefaultAlterDseKeyspace implements AlterDseKeyspaceStart, AlterDseK private final CqlIdentifier keyspaceName; private final ImmutableMap options; - public DefaultAlterDseKeyspace(@NonNull CqlIdentifier keyspaceName) { + public DefaultAlterDseKeyspace(@Nonnull CqlIdentifier keyspaceName) { this(keyspaceName, ImmutableMap.of()); } public DefaultAlterDseKeyspace( - @NonNull CqlIdentifier keyspaceName, @NonNull ImmutableMap options) { + @Nonnull CqlIdentifier keyspaceName, @Nonnull ImmutableMap options) { this.keyspaceName = keyspaceName; this.options = options; } - @NonNull + @Nonnull @Override public AlterDseKeyspace withDurableWrites(boolean durableWrites) { return withOption("durable_writes", durableWrites); } - @NonNull + @Nonnull @Override public AlterDseKeyspace withGraphEngine(String graphEngine) { return this.withOption("graph_engine", graphEngine); } - @NonNull + @Nonnull @Override - public AlterDseKeyspace withReplicationOptions(@NonNull Map replicationOptions) { + public AlterDseKeyspace withReplicationOptions(@Nonnull Map replicationOptions) { return withOption("replication", replicationOptions); } - @NonNull + @Nonnull @Override public AlterDseKeyspace withSimpleStrategy(int replicationFactor) { ImmutableMap replication = @@ -73,9 +73,9 @@ public AlterDseKeyspace withSimpleStrategy(int replicationFactor) { return withReplicationOptions(replication); } - @NonNull + @Nonnull @Override - public AlterDseKeyspace withNetworkTopologyStrategy(@NonNull Map replications) { + public AlterDseKeyspace withNetworkTopologyStrategy(@Nonnull Map replications) { ImmutableMap.Builder replicationBuilder = ImmutableMap.builder().put("class", "NetworkTopologyStrategy"); @@ -86,26 +86,26 @@ public AlterDseKeyspace withNetworkTopologyStrategy(@NonNull Map getOptions() { return options; } - @NonNull + @Nonnull public CqlIdentifier getKeyspace() { return keyspaceName; } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultAlterDseTable.java b/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultAlterDseTable.java index 5f2ad10b7d1..eb2c2ccea6b 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultAlterDseTable.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultAlterDseTable.java @@ -33,9 +33,9 @@ import com.datastax.oss.driver.internal.querybuilder.schema.OptionsUtils; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableSet; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; @Immutable @@ -62,11 +62,11 @@ public class DefaultAlterDseTable private final ImmutableMap options; private final boolean dropCompactStorage; - public DefaultAlterDseTable(@NonNull CqlIdentifier tableName) { + public DefaultAlterDseTable(@Nonnull CqlIdentifier tableName) { this(null, tableName); } - public DefaultAlterDseTable(@Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier tableName) { + public DefaultAlterDseTable(@Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier tableName) { this( keyspace, tableName, @@ -85,18 +85,18 @@ public DefaultAlterDseTable(@Nullable CqlIdentifier keyspace, @NonNull CqlIdenti public DefaultAlterDseTable( @Nullable CqlIdentifier keyspace, - @NonNull CqlIdentifier tableName, + @Nonnull CqlIdentifier tableName, boolean dropCompactStorage, - @NonNull ImmutableMap columnsToAddInOrder, - @NonNull ImmutableSet columnsToAdd, - @NonNull ImmutableSet columnsToAddStatic, - @NonNull ImmutableSet columnsToDrop, - @NonNull ImmutableMap columnsToRename, + @Nonnull ImmutableMap columnsToAddInOrder, + @Nonnull ImmutableSet columnsToAdd, + @Nonnull ImmutableSet columnsToAddStatic, + @Nonnull ImmutableSet columnsToDrop, + @Nonnull ImmutableMap columnsToRename, @Nullable CqlIdentifier columnToAlter, @Nullable DataType columnToAlterType, @Nullable DseTableVertexOperation vertexOperation, @Nullable DseTableEdgeOperation edgeOperation, - @NonNull ImmutableMap options) { + @Nonnull ImmutableMap options) { this.keyspace = keyspace; this.tableName = tableName; this.dropCompactStorage = dropCompactStorage; @@ -112,10 +112,10 @@ public DefaultAlterDseTable( this.options = options; } - @NonNull + @Nonnull @Override public AlterDseTableAddColumnEnd addColumn( - @NonNull CqlIdentifier columnName, @NonNull DataType dataType) { + @Nonnull CqlIdentifier columnName, @Nonnull DataType dataType) { return new DefaultAlterDseTable( keyspace, tableName, @@ -132,10 +132,10 @@ public AlterDseTableAddColumnEnd addColumn( options); } - @NonNull + @Nonnull @Override public AlterDseTableAddColumnEnd addStaticColumn( - @NonNull CqlIdentifier columnName, @NonNull DataType dataType) { + @Nonnull CqlIdentifier columnName, @Nonnull DataType dataType) { return new DefaultAlterDseTable( keyspace, tableName, @@ -152,7 +152,7 @@ public AlterDseTableAddColumnEnd addStaticColumn( options); } - @NonNull + @Nonnull @Override public BuildableQuery dropCompactStorage() { return new DefaultAlterDseTable( @@ -171,9 +171,9 @@ public BuildableQuery dropCompactStorage() { options); } - @NonNull + @Nonnull @Override - public AlterDseTableDropColumnEnd dropColumns(@NonNull CqlIdentifier... columnNames) { + public AlterDseTableDropColumnEnd dropColumns(@Nonnull CqlIdentifier... columnNames) { ImmutableSet.Builder builder = ImmutableSet.builder().addAll(columnsToDrop); for (CqlIdentifier columnName : columnNames) { @@ -196,10 +196,10 @@ public AlterDseTableDropColumnEnd dropColumns(@NonNull CqlIdentifier... columnNa options); } - @NonNull + @Nonnull @Override public AlterDseTableRenameColumnEnd renameColumn( - @NonNull CqlIdentifier from, @NonNull CqlIdentifier to) { + @Nonnull CqlIdentifier from, @Nonnull CqlIdentifier to) { return new DefaultAlterDseTable( keyspace, tableName, @@ -216,9 +216,9 @@ public AlterDseTableRenameColumnEnd renameColumn( options); } - @NonNull + @Nonnull @Override - public BuildableQuery alterColumn(@NonNull CqlIdentifier columnName, @NonNull DataType dataType) { + public BuildableQuery alterColumn(@Nonnull CqlIdentifier columnName, @Nonnull DataType dataType) { return new DefaultAlterDseTable( keyspace, tableName, @@ -235,7 +235,7 @@ public BuildableQuery alterColumn(@NonNull CqlIdentifier columnName, @NonNull Da options); } - @NonNull + @Nonnull @Override public BuildableQuery withVertexLabel(@Nullable CqlIdentifier vertexLabelId) { return new DefaultAlterDseTable( @@ -254,7 +254,7 @@ public BuildableQuery withVertexLabel(@Nullable CqlIdentifier vertexLabelId) { options); } - @NonNull + @Nonnull @Override public BuildableQuery withoutVertexLabel(@Nullable CqlIdentifier vertexLabelId) { return new DefaultAlterDseTable( @@ -273,12 +273,12 @@ public BuildableQuery withoutVertexLabel(@Nullable CqlIdentifier vertexLabelId) options); } - @NonNull + @Nonnull @Override public BuildableQuery withEdgeLabel( @Nullable CqlIdentifier edgeLabelId, - @NonNull DseGraphEdgeSide from, - @NonNull DseGraphEdgeSide to) { + @Nonnull DseGraphEdgeSide from, + @Nonnull DseGraphEdgeSide to) { return new DefaultAlterDseTable( keyspace, tableName, @@ -295,7 +295,7 @@ public BuildableQuery withEdgeLabel( options); } - @NonNull + @Nonnull @Override public BuildableQuery withoutEdgeLabel(@Nullable CqlIdentifier edgeLabelId) { return new DefaultAlterDseTable( @@ -314,9 +314,9 @@ public BuildableQuery withoutEdgeLabel(@Nullable CqlIdentifier edgeLabelId) { options); } - @NonNull + @Nonnull @Override - public AlterDseTableWithOptionsEnd withOption(@NonNull String name, @NonNull Object value) { + public AlterDseTableWithOptionsEnd withOption(@Nonnull String name, @Nonnull Object value) { return new DefaultAlterDseTable( keyspace, tableName, @@ -333,7 +333,7 @@ public AlterDseTableWithOptionsEnd withOption(@NonNull String name, @NonNull Obj ImmutableCollections.append(options, name, value)); } - @NonNull + @Nonnull @Override public String asCql() { StringBuilder builder = new StringBuilder("ALTER TABLE "); @@ -418,7 +418,7 @@ public String toString() { return asCql(); } - @NonNull + @Nonnull @Override public Map getOptions() { return options; @@ -429,32 +429,32 @@ public CqlIdentifier getKeyspace() { return keyspace; } - @NonNull + @Nonnull public CqlIdentifier getTable() { return tableName; } - @NonNull + @Nonnull public ImmutableMap getColumnsToAddInOrder() { return columnsToAddInOrder; } - @NonNull + @Nonnull public ImmutableSet getColumnsToAddRegular() { return columnsToAdd; } - @NonNull + @Nonnull public ImmutableSet getColumnsToAddStatic() { return columnsToAddStatic; } - @NonNull + @Nonnull public ImmutableSet getColumnsToDrop() { return columnsToDrop; } - @NonNull + @Nonnull public ImmutableMap getColumnsToRename() { return columnsToRename; } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultCreateDseAggregate.java b/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultCreateDseAggregate.java index 38c13f6e7d5..5e338530681 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultCreateDseAggregate.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultCreateDseAggregate.java @@ -26,8 +26,8 @@ import com.datastax.oss.driver.internal.querybuilder.CqlHelper; import com.datastax.oss.driver.internal.querybuilder.ImmutableCollections; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; /** @@ -51,21 +51,21 @@ public class DefaultCreateDseAggregate private final Term term; private final boolean deterministic; - public DefaultCreateDseAggregate(@NonNull CqlIdentifier functionName) { + public DefaultCreateDseAggregate(@Nonnull CqlIdentifier functionName) { this(null, functionName); } public DefaultCreateDseAggregate( - @Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier functionName) { + @Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier functionName) { this(keyspace, functionName, false, false, ImmutableList.of(), null, null, null, null, false); } public DefaultCreateDseAggregate( @Nullable CqlIdentifier keyspace, - @NonNull CqlIdentifier functionName, + @Nonnull CqlIdentifier functionName, boolean orReplace, boolean ifNotExists, - @NonNull ImmutableList parameters, + @Nonnull ImmutableList parameters, @Nullable CqlIdentifier sFunc, @Nullable DataType sType, @Nullable CqlIdentifier finalFunc, @@ -83,7 +83,7 @@ public DefaultCreateDseAggregate( this.deterministic = deterministic; } - @NonNull + @Nonnull @Override public String asCql() { StringBuilder builder = new StringBuilder(); @@ -133,9 +133,9 @@ public String asCql() { return builder.toString(); } - @NonNull + @Nonnull @Override - public CreateDseAggregateEnd withInitCond(@NonNull Term term) { + public CreateDseAggregateEnd withInitCond(@Nonnull Term term) { return new DefaultCreateDseAggregate( keyspace, functionName, @@ -149,7 +149,7 @@ public CreateDseAggregateEnd withInitCond(@NonNull Term term) { deterministic); } - @NonNull + @Nonnull @Override public CreateDseAggregateStart ifNotExists() { return new DefaultCreateDseAggregate( @@ -165,7 +165,7 @@ public CreateDseAggregateStart ifNotExists() { deterministic); } - @NonNull + @Nonnull @Override public CreateDseAggregateStart orReplace() { return new DefaultCreateDseAggregate( @@ -181,9 +181,9 @@ public CreateDseAggregateStart orReplace() { deterministic); } - @NonNull + @Nonnull @Override - public CreateDseAggregateStart withParameter(@NonNull DataType paramType) { + public CreateDseAggregateStart withParameter(@Nonnull DataType paramType) { return new DefaultCreateDseAggregate( keyspace, functionName, @@ -197,9 +197,9 @@ public CreateDseAggregateStart withParameter(@NonNull DataType paramType) { deterministic); } - @NonNull + @Nonnull @Override - public CreateDseAggregateStateFunc withSFunc(@NonNull CqlIdentifier sFunc) { + public CreateDseAggregateStateFunc withSFunc(@Nonnull CqlIdentifier sFunc) { return new DefaultCreateDseAggregate( keyspace, functionName, @@ -213,9 +213,9 @@ public CreateDseAggregateStateFunc withSFunc(@NonNull CqlIdentifier sFunc) { deterministic); } - @NonNull + @Nonnull @Override - public CreateDseAggregateEnd withSType(@NonNull DataType sType) { + public CreateDseAggregateEnd withSType(@Nonnull DataType sType) { return new DefaultCreateDseAggregate( keyspace, functionName, @@ -229,9 +229,9 @@ public CreateDseAggregateEnd withSType(@NonNull DataType sType) { deterministic); } - @NonNull + @Nonnull @Override - public CreateDseAggregateEnd withFinalFunc(@NonNull CqlIdentifier finalFunc) { + public CreateDseAggregateEnd withFinalFunc(@Nonnull CqlIdentifier finalFunc) { return new DefaultCreateDseAggregate( keyspace, functionName, @@ -245,7 +245,7 @@ public CreateDseAggregateEnd withFinalFunc(@NonNull CqlIdentifier finalFunc) { deterministic); } - @NonNull + @Nonnull @Override public CreateDseAggregateEnd deterministic() { return new DefaultCreateDseAggregate( @@ -271,7 +271,7 @@ public CqlIdentifier getKeyspace() { return keyspace; } - @NonNull + @Nonnull public CqlIdentifier getFunctionName() { return functionName; } @@ -284,7 +284,7 @@ public boolean isIfNotExists() { return ifNotExists; } - @NonNull + @Nonnull public ImmutableList getParameters() { return parameters; } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultCreateDseFunction.java b/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultCreateDseFunction.java index 679629bf893..0bdd73cb3d1 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultCreateDseFunction.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultCreateDseFunction.java @@ -27,9 +27,9 @@ import com.datastax.oss.driver.internal.querybuilder.CqlHelper; import com.datastax.oss.driver.internal.querybuilder.ImmutableCollections; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; /** @@ -106,7 +106,7 @@ public DefaultCreateDseFunction( this.monotonicOn = monotonicOn; } - @NonNull + @Nonnull @Override public String asCql() { StringBuilder builder = new StringBuilder(); @@ -188,9 +188,9 @@ public String toString() { return asCql(); } - @NonNull + @Nonnull @Override - public CreateDseFunctionEnd as(@NonNull String functionBody) { + public CreateDseFunctionEnd as(@Nonnull String functionBody) { return new DefaultCreateDseFunction( keyspace, functionName, @@ -206,9 +206,9 @@ public CreateDseFunctionEnd as(@NonNull String functionBody) { monotonicOn); } - @NonNull + @Nonnull @Override - public CreateDseFunctionWithLanguage withLanguage(@NonNull String language) { + public CreateDseFunctionWithLanguage withLanguage(@Nonnull String language) { return new DefaultCreateDseFunction( keyspace, functionName, @@ -224,7 +224,7 @@ public CreateDseFunctionWithLanguage withLanguage(@NonNull String language) { monotonicOn); } - @NonNull + @Nonnull @Override public CreateDseFunctionStart ifNotExists() { return new DefaultCreateDseFunction( @@ -242,7 +242,7 @@ public CreateDseFunctionStart ifNotExists() { monotonicOn); } - @NonNull + @Nonnull @Override public CreateDseFunctionStart orReplace() { return new DefaultCreateDseFunction( @@ -260,10 +260,10 @@ public CreateDseFunctionStart orReplace() { monotonicOn); } - @NonNull + @Nonnull @Override public CreateDseFunctionStart withParameter( - @NonNull CqlIdentifier paramName, @NonNull DataType paramType) { + @Nonnull CqlIdentifier paramName, @Nonnull DataType paramType) { return new DefaultCreateDseFunction( keyspace, functionName, @@ -279,7 +279,7 @@ public CreateDseFunctionStart withParameter( monotonicOn); } - @NonNull + @Nonnull @Override public CreateDseFunctionWithNullOption returnsNullOnNull() { return new DefaultCreateDseFunction( @@ -297,7 +297,7 @@ public CreateDseFunctionWithNullOption returnsNullOnNull() { monotonicOn); } - @NonNull + @Nonnull @Override public CreateDseFunctionWithNullOption calledOnNull() { return new DefaultCreateDseFunction( @@ -315,7 +315,7 @@ public CreateDseFunctionWithNullOption calledOnNull() { monotonicOn); } - @NonNull + @Nonnull @Override public CreateDseFunctionWithType deterministic() { return new DefaultCreateDseFunction( @@ -333,7 +333,7 @@ public CreateDseFunctionWithType deterministic() { monotonicOn); } - @NonNull + @Nonnull @Override public CreateDseFunctionWithType monotonic() { return new DefaultCreateDseFunction( @@ -351,9 +351,9 @@ public CreateDseFunctionWithType monotonic() { null); } - @NonNull + @Nonnull @Override - public CreateDseFunctionWithType monotonicOn(@NonNull CqlIdentifier monotonicColumn) { + public CreateDseFunctionWithType monotonicOn(@Nonnull CqlIdentifier monotonicColumn) { return new DefaultCreateDseFunction( keyspace, functionName, @@ -369,9 +369,9 @@ public CreateDseFunctionWithType monotonicOn(@NonNull CqlIdentifier monotonicCol monotonicColumn); } - @NonNull + @Nonnull @Override - public CreateDseFunctionWithType returnsType(@NonNull DataType returnType) { + public CreateDseFunctionWithType returnsType(@Nonnull DataType returnType) { return new DefaultCreateDseFunction( keyspace, functionName, @@ -392,7 +392,7 @@ public CqlIdentifier getKeyspace() { return keyspace; } - @NonNull + @Nonnull public CqlIdentifier getFunction() { return functionName; } @@ -405,7 +405,7 @@ public boolean isIfNotExists() { return ifNotExists; } - @NonNull + @Nonnull public ImmutableMap getParameters() { return parameters; } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultCreateDseKeyspace.java b/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultCreateDseKeyspace.java index 3b542254dab..9a35e7a8269 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultCreateDseKeyspace.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultCreateDseKeyspace.java @@ -23,8 +23,8 @@ import com.datastax.oss.driver.internal.querybuilder.ImmutableCollections; import com.datastax.oss.driver.internal.querybuilder.schema.OptionsUtils; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.Nonnull; import net.jcip.annotations.Immutable; @Immutable @@ -34,39 +34,39 @@ public class DefaultCreateDseKeyspace implements CreateDseKeyspace, CreateDseKey private final boolean ifNotExists; private final ImmutableMap options; - public DefaultCreateDseKeyspace(@NonNull CqlIdentifier keyspaceName) { + public DefaultCreateDseKeyspace(@Nonnull CqlIdentifier keyspaceName) { this(keyspaceName, false, ImmutableMap.of()); } public DefaultCreateDseKeyspace( - @NonNull CqlIdentifier keyspaceName, + @Nonnull CqlIdentifier keyspaceName, boolean ifNotExists, - @NonNull ImmutableMap options) { + @Nonnull ImmutableMap options) { this.keyspaceName = keyspaceName; this.ifNotExists = ifNotExists; this.options = options; } - @NonNull + @Nonnull @Override - public CreateDseKeyspace withOption(@NonNull String name, @NonNull Object value) { + public CreateDseKeyspace withOption(@Nonnull String name, @Nonnull Object value) { return new DefaultCreateDseKeyspace( keyspaceName, ifNotExists, ImmutableCollections.append(options, name, value)); } - @NonNull + @Nonnull @Override public CreateDseKeyspaceStart ifNotExists() { return new DefaultCreateDseKeyspace(keyspaceName, true, options); } - @NonNull + @Nonnull @Override - public CreateDseKeyspace withReplicationOptions(@NonNull Map replicationOptions) { + public CreateDseKeyspace withReplicationOptions(@Nonnull Map replicationOptions) { return withOption("replication", replicationOptions); } - @NonNull + @Nonnull @Override public String asCql() { StringBuilder builder = new StringBuilder(); @@ -86,13 +86,13 @@ public String toString() { return asCql(); } - @NonNull + @Nonnull @Override public Map getOptions() { return options; } - @NonNull + @Nonnull public CqlIdentifier getKeyspace() { return keyspaceName; } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultCreateDseTable.java b/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultCreateDseTable.java index 86169cdd29b..7ac0dfbcd31 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultCreateDseTable.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultCreateDseTable.java @@ -31,9 +31,9 @@ import com.datastax.oss.driver.internal.querybuilder.schema.OptionsUtils; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableSet; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.jcip.annotations.Immutable; @Immutable @@ -60,7 +60,7 @@ public class DefaultCreateDseTable private final DseTableVertexOperation vertexOperation; private final DseTableEdgeOperation edgeOperation; - public DefaultCreateDseTable(@Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier tableName) { + public DefaultCreateDseTable(@Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier tableName) { this( keyspace, tableName, @@ -79,18 +79,18 @@ public DefaultCreateDseTable(@Nullable CqlIdentifier keyspace, @NonNull CqlIdent public DefaultCreateDseTable( @Nullable CqlIdentifier keyspace, - @NonNull CqlIdentifier tableName, + @Nonnull CqlIdentifier tableName, boolean ifNotExists, boolean compactStorage, - @NonNull ImmutableMap columnsInOrder, - @NonNull ImmutableSet partitionKeyColumns, - @NonNull ImmutableSet clusteringKeyColumns, - @NonNull ImmutableSet staticColumns, - @NonNull ImmutableSet regularColumns, - @NonNull ImmutableMap orderings, + @Nonnull ImmutableMap columnsInOrder, + @Nonnull ImmutableSet partitionKeyColumns, + @Nonnull ImmutableSet clusteringKeyColumns, + @Nonnull ImmutableSet staticColumns, + @Nonnull ImmutableSet regularColumns, + @Nonnull ImmutableMap orderings, @Nullable DseTableVertexOperation vertexOperation, @Nullable DseTableEdgeOperation edgeOperation, - @NonNull ImmutableMap options) { + @Nonnull ImmutableMap options) { this.keyspace = keyspace; this.tableName = tableName; this.ifNotExists = ifNotExists; @@ -106,7 +106,7 @@ public DefaultCreateDseTable( this.edgeOperation = edgeOperation; } - @NonNull + @Nonnull @Override public CreateDseTableStart ifNotExists() { return new DefaultCreateDseTable( @@ -125,10 +125,10 @@ public CreateDseTableStart ifNotExists() { options); } - @NonNull + @Nonnull @Override public CreateDseTable withPartitionKey( - @NonNull CqlIdentifier columnName, @NonNull DataType dataType) { + @Nonnull CqlIdentifier columnName, @Nonnull DataType dataType) { return new DefaultCreateDseTable( keyspace, tableName, @@ -145,10 +145,10 @@ public CreateDseTable withPartitionKey( options); } - @NonNull + @Nonnull @Override public CreateDseTable withClusteringColumn( - @NonNull CqlIdentifier columnName, @NonNull DataType dataType) { + @Nonnull CqlIdentifier columnName, @Nonnull DataType dataType) { return new DefaultCreateDseTable( keyspace, tableName, @@ -165,9 +165,9 @@ public CreateDseTable withClusteringColumn( options); } - @NonNull + @Nonnull @Override - public CreateDseTable withColumn(@NonNull CqlIdentifier columnName, @NonNull DataType dataType) { + public CreateDseTable withColumn(@Nonnull CqlIdentifier columnName, @Nonnull DataType dataType) { return new DefaultCreateDseTable( keyspace, tableName, @@ -184,10 +184,10 @@ public CreateDseTable withColumn(@NonNull CqlIdentifier columnName, @NonNull Dat options); } - @NonNull + @Nonnull @Override public CreateDseTable withStaticColumn( - @NonNull CqlIdentifier columnName, @NonNull DataType dataType) { + @Nonnull CqlIdentifier columnName, @Nonnull DataType dataType) { return new DefaultCreateDseTable( keyspace, tableName, @@ -204,7 +204,7 @@ public CreateDseTable withStaticColumn( options); } - @NonNull + @Nonnull @Override public CreateDseTableWithOptions withCompactStorage() { return new DefaultCreateDseTable( @@ -223,23 +223,23 @@ public CreateDseTableWithOptions withCompactStorage() { options); } - @NonNull + @Nonnull @Override public CreateDseTableWithOptions withClusteringOrderByIds( - @NonNull Map orderings) { + @Nonnull Map orderings) { return withClusteringOrders(ImmutableCollections.concat(this.orderings, orderings)); } - @NonNull + @Nonnull @Override public CreateDseTableWithOptions withClusteringOrder( - @NonNull CqlIdentifier columnName, @NonNull ClusteringOrder order) { + @Nonnull CqlIdentifier columnName, @Nonnull ClusteringOrder order) { return withClusteringOrders(ImmutableCollections.append(orderings, columnName, order)); } - @NonNull + @Nonnull public CreateDseTableWithOptions withClusteringOrders( - @NonNull ImmutableMap orderings) { + @Nonnull ImmutableMap orderings) { return new DefaultCreateDseTable( keyspace, tableName, @@ -256,7 +256,7 @@ public CreateDseTableWithOptions withClusteringOrders( options); } - @NonNull + @Nonnull @Override public CreateDseTableWithOptions withVertexLabel(@Nullable CqlIdentifier vertexLabelId) { return new DefaultCreateDseTable( @@ -275,12 +275,12 @@ public CreateDseTableWithOptions withVertexLabel(@Nullable CqlIdentifier vertexL options); } - @NonNull + @Nonnull @Override public CreateDseTableWithOptions withEdgeLabel( @Nullable CqlIdentifier edgeLabelId, - @NonNull DseGraphEdgeSide from, - @NonNull DseGraphEdgeSide to) { + @Nonnull DseGraphEdgeSide from, + @Nonnull DseGraphEdgeSide to) { return new DefaultCreateDseTable( keyspace, tableName, @@ -297,9 +297,9 @@ public CreateDseTableWithOptions withEdgeLabel( options); } - @NonNull + @Nonnull @Override - public CreateDseTable withOption(@NonNull String name, @NonNull Object value) { + public CreateDseTable withOption(@Nonnull String name, @Nonnull Object value) { return new DefaultCreateDseTable( keyspace, tableName, @@ -316,7 +316,7 @@ public CreateDseTable withOption(@NonNull String name, @NonNull Object value) { ImmutableCollections.append(options, name, value)); } - @NonNull + @Nonnull @Override public String asCql() { StringBuilder builder = new StringBuilder(); @@ -423,7 +423,7 @@ public String toString() { return asCql(); } - @NonNull + @Nonnull @Override public Map getOptions() { return options; @@ -434,7 +434,7 @@ public CqlIdentifier getKeyspace() { return keyspace; } - @NonNull + @Nonnull public CqlIdentifier getTable() { return tableName; } @@ -447,32 +447,32 @@ public boolean isCompactStorage() { return compactStorage; } - @NonNull + @Nonnull public ImmutableMap getColumnsInOrder() { return columnsInOrder; } - @NonNull + @Nonnull public ImmutableSet getPartitionKeyColumns() { return partitionKeyColumns; } - @NonNull + @Nonnull public ImmutableSet getClusteringKeyColumns() { return clusteringKeyColumns; } - @NonNull + @Nonnull public ImmutableSet getStaticColumns() { return staticColumns; } - @NonNull + @Nonnull public ImmutableSet getRegularColumns() { return regularColumns; } - @NonNull + @Nonnull public ImmutableMap getOrderings() { return orderings; } diff --git a/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultDseGraphEdgeSide.java b/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultDseGraphEdgeSide.java index 32f43ab8ff2..86b9dbace9f 100644 --- a/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultDseGraphEdgeSide.java +++ b/query-builder/src/main/java/com/datastax/dse/driver/internal/querybuilder/schema/DefaultDseGraphEdgeSide.java @@ -21,8 +21,8 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.internal.querybuilder.ImmutableCollections; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; +import javax.annotation.Nonnull; public class DefaultDseGraphEdgeSide implements DseGraphEdgeSide { @@ -43,33 +43,33 @@ private DefaultDseGraphEdgeSide( this.clusteringColumns = clusteringColumns; } - @NonNull + @Nonnull @Override - public DseGraphEdgeSide withPartitionKey(@NonNull CqlIdentifier columnId) { + public DseGraphEdgeSide withPartitionKey(@Nonnull CqlIdentifier columnId) { return new DefaultDseGraphEdgeSide( tableId, ImmutableCollections.append(partitionKeyColumns, columnId), clusteringColumns); } - @NonNull + @Nonnull @Override - public DseGraphEdgeSide withClusteringColumn(@NonNull CqlIdentifier columnId) { + public DseGraphEdgeSide withClusteringColumn(@Nonnull CqlIdentifier columnId) { return new DefaultDseGraphEdgeSide( tableId, partitionKeyColumns, ImmutableCollections.append(clusteringColumns, columnId)); } - @NonNull + @Nonnull @Override public CqlIdentifier getTableId() { return tableId; } - @NonNull + @Nonnull @Override public List getPartitionKeyColumns() { return partitionKeyColumns; } - @NonNull + @Nonnull @Override public List getClusteringColumns() { return clusteringColumns; diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/BuildableQuery.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/BuildableQuery.java index 729b73deead..ebef63d032b 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/BuildableQuery.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/BuildableQuery.java @@ -21,8 +21,8 @@ import com.datastax.oss.driver.api.core.cql.SimpleStatement; import com.datastax.oss.driver.api.core.cql.SimpleStatementBuilder; import com.datastax.oss.driver.api.core.cql.Statement; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.Nonnull; /** * End state for the query builder DSL, which allows the generation of a CQL query. @@ -38,7 +38,7 @@ public interface BuildableQuery { *

    Use this if you plan to pass the query to {@link CqlSession#execute(String)} or {@link * CqlSession#prepare(String)} without any further customization. */ - @NonNull + @Nonnull String asCql(); /** @@ -53,7 +53,7 @@ public interface BuildableQuery { * In addition, some implementations might try to infer additional statement properties (such as * {@link Statement#isIdempotent()}). */ - @NonNull + @Nonnull default SimpleStatement build() { return SimpleStatement.newInstance(asCql()); } @@ -71,8 +71,8 @@ default SimpleStatement build() { * In addition, some implementations might try to infer additional statement properties (such as * {@link Statement#isIdempotent()}). */ - @NonNull - default SimpleStatement build(@NonNull Object... values) { + @Nonnull + default SimpleStatement build(@Nonnull Object... values) { return SimpleStatement.newInstance(asCql(), values); } @@ -89,8 +89,8 @@ default SimpleStatement build(@NonNull Object... values) { * In addition, some implementations might try to infer additional statement properties (such as * {@link Statement#isIdempotent()}). */ - @NonNull - default SimpleStatement build(@NonNull Map namedValues) { + @Nonnull + default SimpleStatement build(@Nonnull Map namedValues) { return SimpleStatement.newInstance(asCql(), namedValues); } @@ -114,7 +114,7 @@ default SimpleStatement build(@NonNull Map namedValues) { * In addition, some implementations might try to infer additional statement properties (such as * {@link Statement#isIdempotent()}). */ - @NonNull + @Nonnull default SimpleStatementBuilder builder() { return SimpleStatement.builder(asCql()); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/CqlSnippet.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/CqlSnippet.java index ba06391e628..2df1c253430 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/CqlSnippet.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/CqlSnippet.java @@ -17,9 +17,9 @@ */ package com.datastax.oss.driver.api.querybuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** An element in the query builder DSL, that will generate part of a CQL query. */ public interface CqlSnippet { - void appendTo(@NonNull StringBuilder builder); + void appendTo(@Nonnull StringBuilder builder); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/QueryBuilder.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/QueryBuilder.java index 8df2b7efdd0..87362d1b4b7 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/QueryBuilder.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/QueryBuilder.java @@ -52,17 +52,17 @@ import com.datastax.oss.driver.internal.querybuilder.term.TypeHintTerm; import com.datastax.oss.driver.internal.querybuilder.truncate.DefaultTruncate; import com.datastax.oss.driver.internal.querybuilder.update.DefaultUpdate; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Arrays; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** A Domain-Specific Language to build CQL queries using Java code. */ public class QueryBuilder { /** Starts a SELECT query for a qualified table. */ - @NonNull + @Nonnull public static SelectFrom selectFrom( - @Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier table) { + @Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier table) { return new DefaultSelect(keyspace, table); } @@ -70,28 +70,28 @@ public static SelectFrom selectFrom( * Shortcut for {@link #selectFrom(CqlIdentifier, CqlIdentifier) * selectFrom(CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(table))} */ - @NonNull - public static SelectFrom selectFrom(@Nullable String keyspace, @NonNull String table) { + @Nonnull + public static SelectFrom selectFrom(@Nullable String keyspace, @Nonnull String table) { return selectFrom( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(table)); } /** Starts a SELECT query for an unqualified table. */ - @NonNull - public static SelectFrom selectFrom(@NonNull CqlIdentifier table) { + @Nonnull + public static SelectFrom selectFrom(@Nonnull CqlIdentifier table) { return selectFrom(null, table); } /** Shortcut for {@link #selectFrom(CqlIdentifier) selectFrom(CqlIdentifier.fromCql(table))} */ - @NonNull - public static SelectFrom selectFrom(@NonNull String table) { + @Nonnull + public static SelectFrom selectFrom(@Nonnull String table) { return selectFrom(CqlIdentifier.fromCql(table)); } /** Starts an INSERT query for a qualified table. */ - @NonNull + @Nonnull public static InsertInto insertInto( - @Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier table) { + @Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier table) { return new DefaultInsert(keyspace, table); } @@ -99,27 +99,27 @@ public static InsertInto insertInto( * Shortcut for {@link #insertInto(CqlIdentifier, CqlIdentifier) * insertInto(CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(table))}. */ - @NonNull - public static InsertInto insertInto(@Nullable String keyspace, @NonNull String table) { + @Nonnull + public static InsertInto insertInto(@Nullable String keyspace, @Nonnull String table) { return insertInto( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(table)); } /** Starts an INSERT query for an unqualified table. */ - @NonNull - public static InsertInto insertInto(@NonNull CqlIdentifier table) { + @Nonnull + public static InsertInto insertInto(@Nonnull CqlIdentifier table) { return insertInto(null, table); } /** Shortcut for {@link #insertInto(CqlIdentifier) insertInto(CqlIdentifier.fromCql(table))}. */ - @NonNull - public static InsertInto insertInto(@NonNull String table) { + @Nonnull + public static InsertInto insertInto(@Nonnull String table) { return insertInto(CqlIdentifier.fromCql(table)); } /** Starts an UPDATE query for a qualified table. */ - @NonNull - public static UpdateStart update(@Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier table) { + @Nonnull + public static UpdateStart update(@Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier table) { return new DefaultUpdate(keyspace, table); } @@ -127,28 +127,28 @@ public static UpdateStart update(@Nullable CqlIdentifier keyspace, @NonNull CqlI * Shortcut for {@link #update(CqlIdentifier, CqlIdentifier) * update(CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(table))} */ - @NonNull - public static UpdateStart update(@Nullable String keyspace, @NonNull String table) { + @Nonnull + public static UpdateStart update(@Nullable String keyspace, @Nonnull String table) { return update( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(table)); } /** Starts an UPDATE query for an unqualified table. */ - @NonNull - public static UpdateStart update(@NonNull CqlIdentifier table) { + @Nonnull + public static UpdateStart update(@Nonnull CqlIdentifier table) { return update(null, table); } /** Shortcut for {@link #update(CqlIdentifier) update(CqlIdentifier.fromCql(table))} */ - @NonNull - public static UpdateStart update(@NonNull String table) { + @Nonnull + public static UpdateStart update(@Nonnull String table) { return update(CqlIdentifier.fromCql(table)); } /** Starts a DELETE query for a qualified table. */ - @NonNull + @Nonnull public static DeleteSelection deleteFrom( - @Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier table) { + @Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier table) { return new DefaultDelete(keyspace, table); } @@ -156,21 +156,21 @@ public static DeleteSelection deleteFrom( * Shortcut for {@link #deleteFrom(CqlIdentifier, CqlIdentifier) * deleteFrom(CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(table))} */ - @NonNull - public static DeleteSelection deleteFrom(@Nullable String keyspace, @NonNull String table) { + @Nonnull + public static DeleteSelection deleteFrom(@Nullable String keyspace, @Nonnull String table) { return deleteFrom( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(table)); } /** Starts a DELETE query for an unqualified table. */ - @NonNull - public static DeleteSelection deleteFrom(@NonNull CqlIdentifier table) { + @Nonnull + public static DeleteSelection deleteFrom(@Nonnull CqlIdentifier table) { return deleteFrom(null, table); } /** Shortcut for {@link #deleteFrom(CqlIdentifier) deleteFrom(CqlIdentifier.fromCql(table))} */ - @NonNull - public static DeleteSelection deleteFrom(@NonNull String table) { + @Nonnull + public static DeleteSelection deleteFrom(@Nonnull String table) { return deleteFrom(CqlIdentifier.fromCql(table)); } @@ -180,63 +180,63 @@ public static DeleteSelection deleteFrom(@NonNull String table) { * *

    For example, this can be used as the right operand of {@link Relation#columns(String...)}. */ - @NonNull - public static Term tuple(@NonNull Iterable components) { + @Nonnull + public static Term tuple(@Nonnull Iterable components) { return new TupleTerm(components); } /** Var-arg equivalent of {@link #tuple(Iterable)}. */ - @NonNull - public static Term tuple(@NonNull Term... components) { + @Nonnull + public static Term tuple(@Nonnull Term... components) { return tuple(Arrays.asList(components)); } /** The sum of two terms, as in {@code WHERE k = left + right}. */ - @NonNull - public static Term add(@NonNull Term left, @NonNull Term right) { + @Nonnull + public static Term add(@Nonnull Term left, @Nonnull Term right) { return new BinaryArithmeticTerm(ArithmeticOperator.SUM, left, right); } /** The difference of two terms, as in {@code WHERE k = left - right}. */ - @NonNull - public static Term subtract(@NonNull Term left, @NonNull Term right) { + @Nonnull + public static Term subtract(@Nonnull Term left, @Nonnull Term right) { return new BinaryArithmeticTerm(ArithmeticOperator.DIFFERENCE, left, right); } /** The product of two terms, as in {@code WHERE k = left * right}. */ - @NonNull - public static Term multiply(@NonNull Term left, @NonNull Term right) { + @Nonnull + public static Term multiply(@Nonnull Term left, @Nonnull Term right) { return new BinaryArithmeticTerm(ArithmeticOperator.PRODUCT, left, right); } /** The quotient of two terms, as in {@code WHERE k = left / right}. */ - @NonNull - public static Term divide(@NonNull Term left, @NonNull Term right) { + @Nonnull + public static Term divide(@Nonnull Term left, @Nonnull Term right) { return new BinaryArithmeticTerm(ArithmeticOperator.QUOTIENT, left, right); } /** The remainder of two terms, as in {@code WHERE k = left % right}. */ - @NonNull - public static Term remainder(@NonNull Term left, @NonNull Term right) { + @Nonnull + public static Term remainder(@Nonnull Term left, @Nonnull Term right) { return new BinaryArithmeticTerm(ArithmeticOperator.REMAINDER, left, right); } /** The opposite of a term, as in {@code WHERE k = -argument}. */ - @NonNull - public static Term negate(@NonNull Term argument) { + @Nonnull + public static Term negate(@Nonnull Term argument) { return new OppositeTerm(argument); } /** A function call as a term, as in {@code WHERE k = f(arguments)}. */ - @NonNull + @Nonnull public static Term function( - @NonNull CqlIdentifier functionId, @NonNull Iterable arguments) { + @Nonnull CqlIdentifier functionId, @Nonnull Iterable arguments) { return function(null, functionId, arguments); } /** Var-arg equivalent of {@link #function(CqlIdentifier, Iterable)}. */ - @NonNull - public static Term function(@NonNull CqlIdentifier functionId, @NonNull Term... arguments) { + @Nonnull + public static Term function(@Nonnull CqlIdentifier functionId, @Nonnull Term... arguments) { return function(functionId, Arrays.asList(arguments)); } @@ -244,8 +244,8 @@ public static Term function(@NonNull CqlIdentifier functionId, @NonNull Term... * Shortcut for {@link #function(CqlIdentifier, Iterable) * function(CqlIdentifier.fromCql(functionName), arguments)}. */ - @NonNull - public static Term function(@NonNull String functionName, @NonNull Iterable arguments) { + @Nonnull + public static Term function(@Nonnull String functionName, @Nonnull Iterable arguments) { return function(CqlIdentifier.fromCql(functionName), arguments); } @@ -253,26 +253,26 @@ public static Term function(@NonNull String functionName, @NonNull Iterable arguments) { + @Nonnull CqlIdentifier functionId, + @Nonnull Iterable arguments) { return new FunctionTerm(keyspaceId, functionId, arguments); } /** Var-arg equivalent of {@link #function(CqlIdentifier, CqlIdentifier, Iterable)}. */ - @NonNull + @Nonnull public static Term function( @Nullable CqlIdentifier keyspaceId, - @NonNull CqlIdentifier functionId, - @NonNull Term... arguments) { + @Nonnull CqlIdentifier functionId, + @Nonnull Term... arguments) { return function(keyspaceId, functionId, Arrays.asList(arguments)); } @@ -280,11 +280,11 @@ public static Term function( * Shortcut for {@link #function(CqlIdentifier, CqlIdentifier, Iterable) * function(CqlIdentifier.fromCql(keyspaceName), CqlIdentifier.fromCql(functionName), arguments)}. */ - @NonNull + @Nonnull public static Term function( @Nullable String keyspaceName, - @NonNull String functionName, - @NonNull Iterable arguments) { + @Nonnull String functionName, + @Nonnull Iterable arguments) { return function( keyspaceName == null ? null : CqlIdentifier.fromCql(keyspaceName), CqlIdentifier.fromCql(functionName), @@ -295,9 +295,9 @@ public static Term function( * Shortcut for {@link #function(CqlIdentifier, CqlIdentifier, Term...) * function(CqlIdentifier.fromCql(keyspaceName), CqlIdentifier.fromCql(functionName), arguments)}. */ - @NonNull + @Nonnull public static Term function( - @Nullable String keyspaceName, @NonNull String functionName, @NonNull Term... arguments) { + @Nullable String keyspaceName, @Nonnull String functionName, @Nonnull Term... arguments) { return function( keyspaceName == null ? null : CqlIdentifier.fromCql(keyspaceName), CqlIdentifier.fromCql(functionName), @@ -310,68 +310,68 @@ public static Term function( *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link #udt(CqlIdentifier)}. */ - @NonNull - public static Term typeHint(@NonNull Term term, @NonNull DataType targetType) { + @Nonnull + public static Term typeHint(@Nonnull Term term, @Nonnull DataType targetType) { return new TypeHintTerm(term, targetType); } /** A call to the built-in {@code now} function as a term. */ - @NonNull + @Nonnull public static Term now() { return function("now"); } /** A call to the built-in {@code currentTimestamp} function as a term. */ - @NonNull + @Nonnull public static Term currentTimestamp() { return function("currenttimestamp"); } /** A call to the built-in {@code currentDate} function as a term. */ - @NonNull + @Nonnull public static Term currentDate() { return function("currentdate"); } /** A call to the built-in {@code currentTime} function as a term. */ - @NonNull + @Nonnull public static Term currentTime() { return function("currenttime"); } /** A call to the built-in {@code currentTimeUuid} function as a term. */ - @NonNull + @Nonnull public static Term currentTimeUuid() { return function("currenttimeuuid"); } /** A call to the built-in {@code minTimeUuid} function as a term. */ - @NonNull - public static Term minTimeUuid(@NonNull Term argument) { + @Nonnull + public static Term minTimeUuid(@Nonnull Term argument) { return function("mintimeuuid", argument); } /** A call to the built-in {@code maxTimeUuid} function as a term. */ - @NonNull - public static Term maxTimeUuid(@NonNull Term argument) { + @Nonnull + public static Term maxTimeUuid(@Nonnull Term argument) { return function("maxtimeuuid", argument); } /** A call to the built-in {@code toDate} function as a term. */ - @NonNull - public static Term toDate(@NonNull Term argument) { + @Nonnull + public static Term toDate(@Nonnull Term argument) { return function("todate", argument); } /** A call to the built-in {@code toTimestamp} function as a term. */ - @NonNull - public static Term toTimestamp(@NonNull Term argument) { + @Nonnull + public static Term toTimestamp(@Nonnull Term argument) { return function("totimestamp", argument); } /** A call to the built-in {@code toUnixTimestamp} function as a term. */ - @NonNull - public static Term toUnixTimestamp(@NonNull Term argument) { + @Nonnull + public static Term toUnixTimestamp(@Nonnull Term argument) { return function("tounixtimestamp", argument); } @@ -390,7 +390,7 @@ public static Term toUnixTimestamp(@NonNull Term argument) { * @throws CodecNotFoundException if there is no default CQL mapping for the Java type of {@code * value}. */ - @NonNull + @Nonnull public static Literal literal(@Nullable Object value) { return literal(value, CodecRegistry.DEFAULT); } @@ -406,8 +406,8 @@ public static Literal literal(@Nullable Object value) { * @throws CodecNotFoundException if {@code codecRegistry} does not contain any codec that can * handle {@code value}. */ - @NonNull - public static Literal literal(@Nullable Object value, @NonNull CodecRegistry codecRegistry) { + @Nonnull + public static Literal literal(@Nullable Object value, @Nonnull CodecRegistry codecRegistry) { if (value instanceof Murmur3Token) { value = ((Murmur3Token) value).getValue(); } else if (value instanceof ByteOrderedToken) { @@ -437,7 +437,7 @@ public static Literal literal(@Nullable Object value, @NonNull CodecRegistry cod *

    This is an alternative to {@link #literal(Object)} for custom type mappings. The value will * be turned into a string with {@link TypeCodec#format(Object)}, and inlined in the query. */ - @NonNull + @Nonnull public static Literal literal(@Nullable T value, @Nullable TypeCodec codec) { // Don't handle Token here, if the user calls this directly we assume they passed a codec that // can handle the value @@ -452,25 +452,25 @@ public static Literal literal(@Nullable T value, @Nullable TypeCodec code * fail at execution time; on the other hand, it can be used as a workaround to handle new CQL * features that are not yet covered by the query builder. */ - @NonNull - public static Raw raw(@NonNull String raw) { + @Nonnull + public static Raw raw(@Nonnull String raw) { return new DefaultRaw(raw); } /** Creates an anonymous bind marker, which appears as {@code ?} in the generated CQL. */ - @NonNull + @Nonnull public static BindMarker bindMarker() { return bindMarker((CqlIdentifier) null); } /** Creates a named bind marker, which appears as {@code :id} in the generated CQL. */ - @NonNull + @Nonnull public static BindMarker bindMarker(@Nullable CqlIdentifier id) { return new DefaultBindMarker(id); } /** Shortcut for {@link #bindMarker(CqlIdentifier) bindMarker(CqlIdentifier.fromCql(name))} */ - @NonNull + @Nonnull public static BindMarker bindMarker(@Nullable String name) { return bindMarker(name == null ? null : CqlIdentifier.fromCql(name)); } @@ -479,14 +479,14 @@ public static BindMarker bindMarker(@Nullable String name) { * Shortcut to reference a UDT in methods that use a {@link DataType}, such as {@link * #typeHint(Term, DataType)} and {@link Selector#cast(Selector, DataType)}. */ - @NonNull - public static UserDefinedType udt(@NonNull CqlIdentifier name) { + @Nonnull + public static UserDefinedType udt(@Nonnull CqlIdentifier name) { return new ShallowUserDefinedType(null, name, false); } /** Shortcut for {@link #udt(CqlIdentifier) udt(CqlIdentifier.fromCql(name))}. */ - @NonNull - public static UserDefinedType udt(@NonNull String name) { + @Nonnull + public static UserDefinedType udt(@Nonnull String name) { return udt(CqlIdentifier.fromCql(name)); } @@ -496,7 +496,7 @@ public static UserDefinedType udt(@NonNull String name) { * @param table the name of the table to truncate. * @return the truncation query. */ - public static Truncate truncate(@NonNull CqlIdentifier table) { + public static Truncate truncate(@Nonnull CqlIdentifier table) { return truncate(null, table); } @@ -509,7 +509,7 @@ public static Truncate truncate(@NonNull CqlIdentifier table) { * @param table the name of the table to truncate. * @return the truncation query. */ - public static Truncate truncate(@NonNull String table) { + public static Truncate truncate(@Nonnull String table) { return truncate(null, CqlIdentifier.fromCql(table)); } @@ -520,7 +520,7 @@ public static Truncate truncate(@NonNull String table) { * @param table the name of the table to truncate. * @return the truncation query. */ - public static Truncate truncate(@Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier table) { + public static Truncate truncate(@Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier table) { return new DefaultTruncate(keyspace, table); } @@ -534,7 +534,7 @@ public static Truncate truncate(@Nullable CqlIdentifier keyspace, @NonNull CqlId * @param table the name of the table to truncate. * @return the truncation query. */ - public static Truncate truncate(@Nullable String keyspace, @NonNull String table) { + public static Truncate truncate(@Nullable String keyspace, @Nonnull String table) { return truncate( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(table)); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/SchemaBuilder.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/SchemaBuilder.java index 27fabf29219..9ecef9a4c49 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/SchemaBuilder.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/SchemaBuilder.java @@ -56,15 +56,15 @@ import com.datastax.oss.driver.internal.querybuilder.schema.compaction.DefaultLeveledCompactionStrategy; import com.datastax.oss.driver.internal.querybuilder.schema.compaction.DefaultSizeTieredCompactionStrategy; import com.datastax.oss.driver.internal.querybuilder.schema.compaction.DefaultTimeWindowCompactionStrategy; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** A Domain-Specific Language to build CQL DDL queries using Java code. */ public class SchemaBuilder { /** Starts a CREATE KEYSPACE query. */ - @NonNull - public static CreateKeyspaceStart createKeyspace(@NonNull CqlIdentifier keyspaceName) { + @Nonnull + public static CreateKeyspaceStart createKeyspace(@Nonnull CqlIdentifier keyspaceName) { return new DefaultCreateKeyspace(keyspaceName); } @@ -72,14 +72,14 @@ public static CreateKeyspaceStart createKeyspace(@NonNull CqlIdentifier keyspace * Shortcut for {@link #createKeyspace(CqlIdentifier) * createKeyspace(CqlIdentifier.fromCql(keyspaceName))} */ - @NonNull - public static CreateKeyspaceStart createKeyspace(@NonNull String keyspaceName) { + @Nonnull + public static CreateKeyspaceStart createKeyspace(@Nonnull String keyspaceName) { return createKeyspace(CqlIdentifier.fromCql(keyspaceName)); } /** Starts an ALTER KEYSPACE query. */ - @NonNull - public static AlterKeyspaceStart alterKeyspace(@NonNull CqlIdentifier keyspaceName) { + @Nonnull + public static AlterKeyspaceStart alterKeyspace(@Nonnull CqlIdentifier keyspaceName) { return new DefaultAlterKeyspace(keyspaceName); } @@ -87,14 +87,14 @@ public static AlterKeyspaceStart alterKeyspace(@NonNull CqlIdentifier keyspaceNa * Shortcut for {@link #alterKeyspace(CqlIdentifier) * alterKeyspace(CqlIdentifier.fromCql(keyspaceName)}. */ - @NonNull - public static AlterKeyspaceStart alterKeyspace(@NonNull String keyspaceName) { + @Nonnull + public static AlterKeyspaceStart alterKeyspace(@Nonnull String keyspaceName) { return alterKeyspace(CqlIdentifier.fromCql(keyspaceName)); } /** Starts a DROP KEYSPACE query. */ - @NonNull - public static Drop dropKeyspace(@NonNull CqlIdentifier keyspaceName) { + @Nonnull + public static Drop dropKeyspace(@Nonnull CqlIdentifier keyspaceName) { return new DefaultDropKeyspace(keyspaceName); } @@ -102,8 +102,8 @@ public static Drop dropKeyspace(@NonNull CqlIdentifier keyspaceName) { * Shortcut for {@link #dropKeyspace(CqlIdentifier) * dropKeyspace(CqlIdentifier.fromCql(keyspaceName)}. */ - @NonNull - public static Drop dropKeyspace(@NonNull String keyspaceName) { + @Nonnull + public static Drop dropKeyspace(@Nonnull String keyspaceName) { return dropKeyspace(CqlIdentifier.fromCql(keyspaceName)); } @@ -111,23 +111,23 @@ public static Drop dropKeyspace(@NonNull String keyspaceName) { * Starts a CREATE TABLE query with the given table name. This assumes the keyspace name is * already qualified for the Session or Statement. */ - @NonNull - public static CreateTableStart createTable(@NonNull CqlIdentifier tableName) { + @Nonnull + public static CreateTableStart createTable(@Nonnull CqlIdentifier tableName) { return new DefaultCreateTable(tableName); } /** Starts a CREATE TABLE query with the given table name for the given keyspace name. */ - @NonNull + @Nonnull public static CreateTableStart createTable( - @Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier tableName) { + @Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier tableName) { return new DefaultCreateTable(keyspace, tableName); } /** * Shortcut for {@link #createTable(CqlIdentifier) createTable(CqlIdentifier.fromCql(tableName)} */ - @NonNull - public static CreateTableStart createTable(@NonNull String tableName) { + @Nonnull + public static CreateTableStart createTable(@Nonnull String tableName) { return createTable(CqlIdentifier.fromCql(tableName)); } @@ -135,8 +135,8 @@ public static CreateTableStart createTable(@NonNull String tableName) { * Shortcut for {@link #createTable(CqlIdentifier,CqlIdentifier) * createTable(CqlIdentifier.fromCql(keyspaceName),CqlIdentifier.fromCql(tableName)} */ - @NonNull - public static CreateTableStart createTable(@Nullable String keyspace, @NonNull String tableName) { + @Nonnull + public static CreateTableStart createTable(@Nullable String keyspace, @Nonnull String tableName) { return createTable( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(tableName)); @@ -146,21 +146,21 @@ public static CreateTableStart createTable(@Nullable String keyspace, @NonNull S * Starts an ALTER TABLE query with the given table name. This assumes the keyspace name is * already qualified for the Session or Statement. */ - @NonNull - public static AlterTableStart alterTable(@NonNull CqlIdentifier tableName) { + @Nonnull + public static AlterTableStart alterTable(@Nonnull CqlIdentifier tableName) { return new DefaultAlterTable(tableName); } /** Starts an ALTER TABLE query with the given table name for the given keyspace name. */ - @NonNull + @Nonnull public static AlterTableStart alterTable( - @Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier tableName) { + @Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier tableName) { return new DefaultAlterTable(keyspace, tableName); } /** Shortcut for {@link #alterTable(CqlIdentifier) alterTable(CqlIdentifier.fromCql(tableName)} */ - @NonNull - public static AlterTableStart alterTable(@NonNull String tableName) { + @Nonnull + public static AlterTableStart alterTable(@Nonnull String tableName) { return alterTable(CqlIdentifier.fromCql(tableName)); } @@ -168,8 +168,8 @@ public static AlterTableStart alterTable(@NonNull String tableName) { * Shortcut for {@link #alterTable(CqlIdentifier,CqlIdentifier) * alterTable(CqlIdentifier.fromCql(keyspaceName),CqlIdentifier.fromCql(tableName)} */ - @NonNull - public static AlterTableStart alterTable(@Nullable String keyspace, @NonNull String tableName) { + @Nonnull + public static AlterTableStart alterTable(@Nullable String keyspace, @Nonnull String tableName) { return alterTable( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(tableName)); @@ -179,20 +179,20 @@ public static AlterTableStart alterTable(@Nullable String keyspace, @NonNull Str * Starts a DROP TABLE query. This assumes the keyspace name is already qualified for the Session * or Statement. */ - @NonNull - public static Drop dropTable(@NonNull CqlIdentifier tableName) { + @Nonnull + public static Drop dropTable(@Nonnull CqlIdentifier tableName) { return new DefaultDrop(tableName, "TABLE"); } /** Shortcut for {@link #dropTable(CqlIdentifier) dropTable(CqlIdentifier.fromCql(tableName)}. */ - @NonNull - public static Drop dropTable(@NonNull String tableName) { + @Nonnull + public static Drop dropTable(@Nonnull String tableName) { return dropTable(CqlIdentifier.fromCql(tableName)); } /** Starts a DROP TABLE query for the given table name for the given keyspace name. */ - @NonNull - public static Drop dropTable(@Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier tableName) { + @Nonnull + public static Drop dropTable(@Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier tableName) { return new DefaultDrop(keyspace, tableName, "TABLE"); } @@ -200,8 +200,8 @@ public static Drop dropTable(@Nullable CqlIdentifier keyspace, @NonNull CqlIdent * Shortcut for {@link #dropTable(CqlIdentifier,CqlIdentifier) * dropTable(CqlIdentifier.fromCql(keyspace),CqlIdentifier.fromCql(tableName)}. */ - @NonNull - public static Drop dropTable(@Nullable String keyspace, @NonNull String tableName) { + @Nonnull + public static Drop dropTable(@Nullable String keyspace, @Nonnull String tableName) { return dropTable( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(tableName)); @@ -211,18 +211,18 @@ public static Drop dropTable(@Nullable String keyspace, @NonNull String tableNam * Starts a CREATE MATERIALIZED VIEW query with the given view name. This assumes the keyspace * name is already qualified for the Session or Statement. */ - @NonNull + @Nonnull public static CreateMaterializedViewStart createMaterializedView( - @NonNull CqlIdentifier viewName) { + @Nonnull CqlIdentifier viewName) { return new DefaultCreateMaterializedView(viewName); } /** * Starts a CREATE MATERIALIZED VIEW query with the given view name for the given keyspace name. */ - @NonNull + @Nonnull public static CreateMaterializedViewStart createMaterializedView( - @Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier viewName) { + @Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier viewName) { return new DefaultCreateMaterializedView(keyspace, viewName); } @@ -230,8 +230,8 @@ public static CreateMaterializedViewStart createMaterializedView( * Shortcut for {@link #createMaterializedView(CqlIdentifier) * createMaterializedView(CqlIdentifier.fromCql(viewName)} */ - @NonNull - public static CreateMaterializedViewStart createMaterializedView(@NonNull String viewName) { + @Nonnull + public static CreateMaterializedViewStart createMaterializedView(@Nonnull String viewName) { return createMaterializedView(CqlIdentifier.fromCql(viewName)); } @@ -239,9 +239,9 @@ public static CreateMaterializedViewStart createMaterializedView(@NonNull String * Shortcut for {@link #createMaterializedView(CqlIdentifier,CqlIdentifier) * createMaterializedView(CqlIdentifier.fromCql(keyspaceName),CqlIdentifier.fromCql(viewName)} */ - @NonNull + @Nonnull public static CreateMaterializedViewStart createMaterializedView( - @Nullable String keyspace, @NonNull String viewName) { + @Nullable String keyspace, @Nonnull String viewName) { return createMaterializedView( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(viewName)); } @@ -250,17 +250,17 @@ public static CreateMaterializedViewStart createMaterializedView( * Starts an ALTER MATERIALIZED VIEW query with the given view name. This assumes the keyspace * name is already qualified for the Session or Statement. */ - @NonNull - public static AlterMaterializedViewStart alterMaterializedView(@NonNull CqlIdentifier viewName) { + @Nonnull + public static AlterMaterializedViewStart alterMaterializedView(@Nonnull CqlIdentifier viewName) { return new DefaultAlterMaterializedView(viewName); } /** * Starts an ALTER MATERIALIZED VIEW query with the given view name for the given keyspace name. */ - @NonNull + @Nonnull public static AlterMaterializedViewStart alterMaterializedView( - @Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier viewName) { + @Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier viewName) { return new DefaultAlterMaterializedView(keyspace, viewName); } @@ -268,8 +268,8 @@ public static AlterMaterializedViewStart alterMaterializedView( * Shortcut for {@link #alterMaterializedView(CqlIdentifier) * alterMaterializedView(CqlIdentifier.fromCql(viewName)} */ - @NonNull - public static AlterMaterializedViewStart alterMaterializedView(@NonNull String viewName) { + @Nonnull + public static AlterMaterializedViewStart alterMaterializedView(@Nonnull String viewName) { return alterMaterializedView(CqlIdentifier.fromCql(viewName)); } @@ -277,9 +277,9 @@ public static AlterMaterializedViewStart alterMaterializedView(@NonNull String v * Shortcut for {@link #alterMaterializedView(CqlIdentifier,CqlIdentifier) * alterMaterializedView(CqlIdentifier.fromCql(keyspaceName),CqlIdentifier.fromCql(viewName)} */ - @NonNull + @Nonnull public static AlterMaterializedViewStart alterMaterializedView( - @Nullable String keyspace, @NonNull String viewName) { + @Nullable String keyspace, @Nonnull String viewName) { return alterMaterializedView( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(viewName)); } @@ -288,8 +288,8 @@ public static AlterMaterializedViewStart alterMaterializedView( * Starts a DROP MATERIALIZED VIEW query. This assumes the keyspace name is already qualified for * the Session or Statement. */ - @NonNull - public static Drop dropMaterializedView(@NonNull CqlIdentifier viewName) { + @Nonnull + public static Drop dropMaterializedView(@Nonnull CqlIdentifier viewName) { return new DefaultDrop(viewName, "MATERIALIZED VIEW"); } @@ -297,15 +297,15 @@ public static Drop dropMaterializedView(@NonNull CqlIdentifier viewName) { * Shortcut for {@link #dropMaterializedView(CqlIdentifier) * dropMaterializedView(CqlIdentifier.fromCql(viewName)}. */ - @NonNull - public static Drop dropMaterializedView(@NonNull String viewName) { + @Nonnull + public static Drop dropMaterializedView(@Nonnull String viewName) { return dropMaterializedView(CqlIdentifier.fromCql(viewName)); } /** Starts a DROP MATERIALIZED VIEW query for the given view name for the given keyspace name. */ - @NonNull + @Nonnull public static Drop dropMaterializedView( - @Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier viewName) { + @Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier viewName) { return new DefaultDrop(keyspace, viewName, "MATERIALIZED VIEW"); } @@ -313,8 +313,8 @@ public static Drop dropMaterializedView( * Shortcut for {@link #dropMaterializedView(CqlIdentifier,CqlIdentifier) * dropMaterializedView(CqlIdentifier.fromCql(keyspace),CqlIdentifier.fromCql(viewName)}. */ - @NonNull - public static Drop dropMaterializedView(@Nullable String keyspace, @NonNull String viewName) { + @Nonnull + public static Drop dropMaterializedView(@Nullable String keyspace, @Nonnull String viewName) { return dropMaterializedView( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(viewName)); } @@ -323,21 +323,21 @@ public static Drop dropMaterializedView(@Nullable String keyspace, @NonNull Stri * Starts a CREATE TYPE query with the given type name. This assumes the keyspace name is already * qualified for the Session or Statement. */ - @NonNull - public static CreateTypeStart createType(@NonNull CqlIdentifier typeName) { + @Nonnull + public static CreateTypeStart createType(@Nonnull CqlIdentifier typeName) { return new DefaultCreateType(typeName); } /** Starts a CREATE TYPE query with the given type name for the given keyspace name. */ - @NonNull + @Nonnull public static CreateTypeStart createType( - @Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier typeName) { + @Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier typeName) { return new DefaultCreateType(keyspace, typeName); } /** Shortcut for {@link #createType(CqlIdentifier) createType(CqlIdentifier.fromCql(typeName)}. */ - @NonNull - public static CreateTypeStart createType(@NonNull String typeName) { + @Nonnull + public static CreateTypeStart createType(@Nonnull String typeName) { return createType(CqlIdentifier.fromCql(typeName)); } @@ -345,8 +345,8 @@ public static CreateTypeStart createType(@NonNull String typeName) { * Shortcut for {@link #createType(CqlIdentifier,CqlIdentifier) * createType(CqlIdentifier.fromCql(keyspace),CqlIdentifier.fromCql(typeName)}. */ - @NonNull - public static CreateTypeStart createType(@Nullable String keyspace, @NonNull String typeName) { + @Nonnull + public static CreateTypeStart createType(@Nullable String keyspace, @Nonnull String typeName) { return createType( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(typeName)); } @@ -355,21 +355,21 @@ public static CreateTypeStart createType(@Nullable String keyspace, @NonNull Str * Starts an ALTER TYPE query with the given type name. This assumes the keyspace name is already * qualified for the Session or Statement. */ - @NonNull - public static AlterTypeStart alterType(@NonNull CqlIdentifier typeName) { + @Nonnull + public static AlterTypeStart alterType(@Nonnull CqlIdentifier typeName) { return new DefaultAlterType(typeName); } /** Starts an ALTER TYPE query with the given type name for the given keyspace name. */ - @NonNull + @Nonnull public static AlterTypeStart alterType( - @Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier typeName) { + @Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier typeName) { return new DefaultAlterType(keyspace, typeName); } /** Shortcut for {@link #alterType(CqlIdentifier) alterType(CqlIdentifier.fromCql(typeName)} */ - @NonNull - public static AlterTypeStart alterType(@NonNull String typeName) { + @Nonnull + public static AlterTypeStart alterType(@Nonnull String typeName) { return alterType(CqlIdentifier.fromCql(typeName)); } @@ -377,8 +377,8 @@ public static AlterTypeStart alterType(@NonNull String typeName) { * Shortcut for {@link #alterType(CqlIdentifier,CqlIdentifier) * alterType(CqlIdentifier.fromCql(keyspaceName),CqlIdentifier.fromCql(typeName)} */ - @NonNull - public static AlterTypeStart alterType(@Nullable String keyspace, @NonNull String typeName) { + @Nonnull + public static AlterTypeStart alterType(@Nullable String keyspace, @Nonnull String typeName) { return alterType( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(typeName)); } @@ -387,20 +387,20 @@ public static AlterTypeStart alterType(@Nullable String keyspace, @NonNull Strin * Starts a DROP TYPE query. This assumes the keyspace name is already qualified for the Session * or Statement. */ - @NonNull - public static Drop dropType(@NonNull CqlIdentifier typeName) { + @Nonnull + public static Drop dropType(@Nonnull CqlIdentifier typeName) { return new DefaultDrop(typeName, "TYPE"); } /** Shortcut for {@link #dropType(CqlIdentifier) dropType(CqlIdentifier.fromCql(typeName)}. */ - @NonNull - public static Drop dropType(@NonNull String typeName) { + @Nonnull + public static Drop dropType(@Nonnull String typeName) { return dropType(CqlIdentifier.fromCql(typeName)); } /** Starts a DROP TYPE query for the given view name for the given type name. */ - @NonNull - public static Drop dropType(@Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier typeName) { + @Nonnull + public static Drop dropType(@Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier typeName) { return new DefaultDrop(keyspace, typeName, "TYPE"); } @@ -408,8 +408,8 @@ public static Drop dropType(@Nullable CqlIdentifier keyspace, @NonNull CqlIdenti * Shortcut for {@link #dropType(CqlIdentifier,CqlIdentifier) * dropType(CqlIdentifier.fromCql(keyspace),CqlIdentifier.fromCql(typeName)}. */ - @NonNull - public static Drop dropType(@Nullable String keyspace, @NonNull String typeName) { + @Nonnull + public static Drop dropType(@Nullable String keyspace, @Nonnull String typeName) { return dropType( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(typeName)); } @@ -418,13 +418,13 @@ public static Drop dropType(@Nullable String keyspace, @NonNull String typeName) * Starts a CREATE INDEX query with no name. When this is used a name will be generated on the * server side, usually with a format of tableName_idx_columnName. */ - @NonNull + @Nonnull public static CreateIndexStart createIndex() { return new DefaultCreateIndex(); } /** Starts a CREATE INDEX query with the given name. */ - @NonNull + @Nonnull public static CreateIndexStart createIndex(@Nullable CqlIdentifier indexName) { return new DefaultCreateIndex(indexName); } @@ -432,7 +432,7 @@ public static CreateIndexStart createIndex(@Nullable CqlIdentifier indexName) { /** * Shortcut for {@link #createIndex(CqlIdentifier) createIndex(CqlIdentifier.fromCql(indexName)}. */ - @NonNull + @Nonnull public static CreateIndexStart createIndex(@Nullable String indexName) { return createIndex(indexName == null ? null : CqlIdentifier.fromCql(indexName)); } @@ -441,20 +441,20 @@ public static CreateIndexStart createIndex(@Nullable String indexName) { * Starts a DROP INDEX query. This assumes the keyspace name is already qualified for the Session * or Statement. */ - @NonNull - public static Drop dropIndex(@NonNull CqlIdentifier indexName) { + @Nonnull + public static Drop dropIndex(@Nonnull CqlIdentifier indexName) { return new DefaultDrop(indexName, "INDEX"); } /** Shortcut for {@link #dropIndex(CqlIdentifier) dropIndex(CqlIdentifier.fromCql(indexName)}. */ - @NonNull - public static Drop dropIndex(@NonNull String indexName) { + @Nonnull + public static Drop dropIndex(@Nonnull String indexName) { return dropIndex(CqlIdentifier.fromCql(indexName)); } /** Starts a DROP INDEX query for the given index for the given keyspace name. */ - @NonNull - public static Drop dropIndex(@Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier indexName) { + @Nonnull + public static Drop dropIndex(@Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier indexName) { return new DefaultDrop(keyspace, indexName, "INDEX"); } @@ -462,8 +462,8 @@ public static Drop dropIndex(@Nullable CqlIdentifier keyspace, @NonNull CqlIdent * Shortcut for {@link #dropIndex(CqlIdentifier, CqlIdentifier)} * dropIndex(CqlIdentifier.fromCql(keyspace),CqlIdentifier.fromCql(indexName)}. */ - @NonNull - public static Drop dropIndex(@Nullable String keyspace, @NonNull String indexName) { + @Nonnull + public static Drop dropIndex(@Nullable String keyspace, @Nonnull String indexName) { return dropIndex( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(indexName)); @@ -473,32 +473,32 @@ public static Drop dropIndex(@Nullable String keyspace, @NonNull String indexNam * Starts a CREATE FUNCTION query with the given function name. This assumes the keyspace name is * already qualified for the Session or Statement. */ - @NonNull - public static CreateFunctionStart createFunction(@NonNull CqlIdentifier functionName) { + @Nonnull + public static CreateFunctionStart createFunction(@Nonnull CqlIdentifier functionName) { return new DefaultCreateFunction(functionName); } /** Starts a CREATE FUNCTION query with the given function name for the given keyspace name. */ - @NonNull + @Nonnull public static CreateFunctionStart createFunction( - @Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier functionName) { + @Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier functionName) { return new DefaultCreateFunction(keyspace, functionName); } /** * Shortcut for {@link #createFunction(CqlIdentifier) * createFunction(CqlIdentifier.fromCql(keyspaceName),CqlIdentifier.fromCql(functionName)} */ - @NonNull - public static CreateFunctionStart createFunction(@NonNull String functionName) { + @Nonnull + public static CreateFunctionStart createFunction(@Nonnull String functionName) { return new DefaultCreateFunction(CqlIdentifier.fromCql(functionName)); } /** * Shortcut for {@link #createFunction(CqlIdentifier, CqlIdentifier) * createFunction(CqlIdentifier.fromCql(keyspace, functionName)} */ - @NonNull + @Nonnull public static CreateFunctionStart createFunction( - @Nullable String keyspace, @NonNull String functionName) { + @Nullable String keyspace, @Nonnull String functionName) { return new DefaultCreateFunction( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(functionName)); @@ -508,15 +508,15 @@ public static CreateFunctionStart createFunction( * Starts a DROP FUNCTION query. This assumes the keyspace name is already qualified for the * Session or Statement. */ - @NonNull - public static Drop dropFunction(@NonNull CqlIdentifier functionName) { + @Nonnull + public static Drop dropFunction(@Nonnull CqlIdentifier functionName) { return new DefaultDrop(functionName, "FUNCTION"); } /** Starts a DROP FUNCTION query for the given function name for the given keyspace name. */ - @NonNull + @Nonnull public static Drop dropFunction( - @Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier functionName) { + @Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier functionName) { return new DefaultDrop(keyspace, functionName, "FUNCTION"); } @@ -524,8 +524,8 @@ public static Drop dropFunction( * Shortcut for {@link #dropFunction(CqlIdentifier) * dropFunction(CqlIdentifier.fromCql(functionName)}. */ - @NonNull - public static Drop dropFunction(@NonNull String functionName) { + @Nonnull + public static Drop dropFunction(@Nonnull String functionName) { return new DefaultDrop(CqlIdentifier.fromCql(functionName), "FUNCTION"); } @@ -533,8 +533,8 @@ public static Drop dropFunction(@NonNull String functionName) { * Shortcut for {@link #dropFunction(CqlIdentifier, CqlIdentifier) * dropFunction(CqlIdentifier.fromCql(keyspace),CqlIdentifier.fromCql(functionName)}. */ - @NonNull - public static Drop dropFunction(@Nullable String keyspace, @NonNull String functionName) { + @Nonnull + public static Drop dropFunction(@Nullable String keyspace, @Nonnull String functionName) { return new DefaultDrop( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(functionName), @@ -545,15 +545,15 @@ public static Drop dropFunction(@Nullable String keyspace, @NonNull String funct * Starts a CREATE AGGREGATE query with the given aggregate name. This assumes the keyspace name * is already qualified for the Session or Statement. */ - @NonNull - public static CreateAggregateStart createAggregate(@NonNull CqlIdentifier aggregateName) { + @Nonnull + public static CreateAggregateStart createAggregate(@Nonnull CqlIdentifier aggregateName) { return new DefaultCreateAggregate(aggregateName); } /** Starts a CREATE AGGREGATE query with the given aggregate name for the given keyspace name. */ - @NonNull + @Nonnull public static CreateAggregateStart createAggregate( - @Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier aggregateName) { + @Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier aggregateName) { return new DefaultCreateAggregate(keyspace, aggregateName); } @@ -561,8 +561,8 @@ public static CreateAggregateStart createAggregate( * Shortcut for {@link #createAggregate(CqlIdentifier) * CreateAggregateStart(CqlIdentifier.fromCql(keyspaceName),CqlIdentifier.fromCql(aggregateName)} */ - @NonNull - public static CreateAggregateStart createAggregate(@NonNull String aggregateName) { + @Nonnull + public static CreateAggregateStart createAggregate(@Nonnull String aggregateName) { return new DefaultCreateAggregate(CqlIdentifier.fromCql(aggregateName)); } @@ -570,9 +570,9 @@ public static CreateAggregateStart createAggregate(@NonNull String aggregateName * Shortcut for {@link #createAggregate(CqlIdentifier, CqlIdentifier) * CreateAggregateStart(CqlIdentifier.fromCql(keyspace, aggregateName)} */ - @NonNull + @Nonnull public static CreateAggregateStart createAggregate( - @Nullable String keyspace, @NonNull String aggregateName) { + @Nullable String keyspace, @Nonnull String aggregateName) { return new DefaultCreateAggregate( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(aggregateName)); @@ -582,15 +582,15 @@ public static CreateAggregateStart createAggregate( * Starts an DROP AGGREGATE query. This assumes the keyspace name is already qualified for the * Session or Statement. */ - @NonNull - public static Drop dropAggregate(@NonNull CqlIdentifier aggregateName) { + @Nonnull + public static Drop dropAggregate(@Nonnull CqlIdentifier aggregateName) { return new DefaultDrop(aggregateName, "AGGREGATE"); } /** Starts an DROP AGGREGATE query for the given aggregate name for the given keyspace name. */ - @NonNull + @Nonnull public static Drop dropAggregate( - @Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier aggregateName) { + @Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier aggregateName) { return new DefaultDrop(keyspace, aggregateName, "AGGREGATE"); } @@ -598,8 +598,8 @@ public static Drop dropAggregate( * Shortcut for {@link #dropAggregate(CqlIdentifier) * dropAggregate(CqlIdentifier.fromCql(aggregateName)}. */ - @NonNull - public static Drop dropAggregate(@NonNull String aggregateName) { + @Nonnull + public static Drop dropAggregate(@Nonnull String aggregateName) { return new DefaultDrop(CqlIdentifier.fromCql(aggregateName), "AGGREGATE"); } @@ -607,8 +607,8 @@ public static Drop dropAggregate(@NonNull String aggregateName) { * Shortcut for {@link #dropAggregate(CqlIdentifier, CqlIdentifier) * dropAggregate(CqlIdentifier.fromCql(keyspace),CqlIdentifier.fromCql(aggregateName)}. */ - @NonNull - public static Drop dropAggregate(@Nullable String keyspace, @NonNull String aggregateName) { + @Nonnull + public static Drop dropAggregate(@Nullable String keyspace, @Nonnull String aggregateName) { return new DefaultDrop( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(aggregateName), @@ -620,7 +620,7 @@ public static Drop dropAggregate(@Nullable String keyspace, @NonNull String aggr * * @see CreateTableWithOptions#withCompaction(CompactionStrategy) */ - @NonNull + @Nonnull public static SizeTieredCompactionStrategy sizeTieredCompactionStrategy() { return new DefaultSizeTieredCompactionStrategy(); } @@ -630,7 +630,7 @@ public static SizeTieredCompactionStrategy sizeTieredCompactionStrategy() { * * @see CreateTableWithOptions#withCompaction(CompactionStrategy) */ - @NonNull + @Nonnull public static LeveledCompactionStrategy leveledCompactionStrategy() { return new DefaultLeveledCompactionStrategy(); } @@ -640,7 +640,7 @@ public static LeveledCompactionStrategy leveledCompactionStrategy() { * * @see CreateTableWithOptions#withCompaction(CompactionStrategy) */ - @NonNull + @Nonnull public static TimeWindowCompactionStrategy timeWindowCompactionStrategy() { return new DefaultTimeWindowCompactionStrategy(); } @@ -649,14 +649,14 @@ public static TimeWindowCompactionStrategy timeWindowCompactionStrategy() { * Shortcut for creating a user-defined {@link DataType} for use in UDT and Table builder * definitions, such as {@link CreateTable#withColumn(CqlIdentifier, DataType)}. */ - @NonNull - public static UserDefinedType udt(@NonNull CqlIdentifier name, boolean frozen) { + @Nonnull + public static UserDefinedType udt(@Nonnull CqlIdentifier name, boolean frozen) { return new ShallowUserDefinedType(null, name, frozen); } /** Shortcut for {@link #udt(CqlIdentifier,boolean) udt(CqlIdentifier.fromCql(name),frozen)}. */ - @NonNull - public static UserDefinedType udt(@NonNull String name, boolean frozen) { + @Nonnull + public static UserDefinedType udt(@Nonnull String name, boolean frozen) { return udt(CqlIdentifier.fromCql(name), frozen); } @@ -673,16 +673,16 @@ private RowsPerPartition(String value) { this.value = value; } - @NonNull public static RowsPerPartition ALL = new RowsPerPartition("ALL"); + @Nonnull public static RowsPerPartition ALL = new RowsPerPartition("ALL"); - @NonNull public static RowsPerPartition NONE = new RowsPerPartition("NONE"); + @Nonnull public static RowsPerPartition NONE = new RowsPerPartition("NONE"); - @NonNull + @Nonnull public static RowsPerPartition rows(int rowNumber) { return new RowsPerPartition(Integer.toString(rowNumber)); } - @NonNull + @Nonnull public String getValue() { return value; } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/condition/Condition.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/condition/Condition.java index 01b50166426..1b3651e2643 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/condition/Condition.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/condition/Condition.java @@ -24,7 +24,7 @@ import com.datastax.oss.driver.internal.querybuilder.lhs.ColumnComponentLeftOperand; import com.datastax.oss.driver.internal.querybuilder.lhs.ColumnLeftOperand; import com.datastax.oss.driver.internal.querybuilder.lhs.FieldLeftOperand; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * A condition in a {@link ConditionalStatement}. @@ -52,14 +52,14 @@ public interface Condition extends CqlSnippet { /** Builds a condition on a column for a conditional statement, as in {@code DELETE... IF k=1}. */ - @NonNull - static ConditionBuilder column(@NonNull CqlIdentifier columnId) { + @Nonnull + static ConditionBuilder column(@Nonnull CqlIdentifier columnId) { return new DefaultConditionBuilder(new ColumnLeftOperand(columnId)); } /** Shortcut for {@link #column(CqlIdentifier) column(CqlIdentifier.fromCql(columnName))}. */ - @NonNull - static ConditionBuilder column(@NonNull String columnName) { + @Nonnull + static ConditionBuilder column(@Nonnull String columnName) { return column(CqlIdentifier.fromCql(columnName)); } @@ -67,9 +67,9 @@ static ConditionBuilder column(@NonNull String columnName) { * Builds a condition on a field in a UDT column for a conditional statement, as in {@code * DELETE... IF address.street='test'}. */ - @NonNull + @Nonnull static ConditionBuilder field( - @NonNull CqlIdentifier columnId, @NonNull CqlIdentifier fieldId) { + @Nonnull CqlIdentifier columnId, @Nonnull CqlIdentifier fieldId) { return new DefaultConditionBuilder(new FieldLeftOperand(columnId, fieldId)); } @@ -77,8 +77,8 @@ static ConditionBuilder field( * Shortcut for {@link #field(CqlIdentifier, CqlIdentifier) * field(CqlIdentifier.fromCql(columnName), CqlIdentifier.fromCql(fieldName))}. */ - @NonNull - static ConditionBuilder field(@NonNull String columnName, @NonNull String fieldName) { + @Nonnull + static ConditionBuilder field(@Nonnull String columnName, @Nonnull String fieldName) { return field(CqlIdentifier.fromCql(columnName), CqlIdentifier.fromCql(fieldName)); } @@ -86,8 +86,8 @@ static ConditionBuilder field(@NonNull String columnName, @NonNull St * Builds a condition on an element in a collection column for a conditional statement, as in * {@code DELETE... IF m[0]=1}. */ - @NonNull - static ConditionBuilder element(@NonNull CqlIdentifier columnId, @NonNull Term index) { + @Nonnull + static ConditionBuilder element(@Nonnull CqlIdentifier columnId, @Nonnull Term index) { return new DefaultConditionBuilder(new ColumnComponentLeftOperand(columnId, index)); } @@ -95,8 +95,8 @@ static ConditionBuilder element(@NonNull CqlIdentifier columnId, @Non * Shortcut for {@link #element(CqlIdentifier, Term) element(CqlIdentifier.fromCql(columnName), * index)}. */ - @NonNull - static ConditionBuilder element(@NonNull String columnName, @NonNull Term index) { + @Nonnull + static ConditionBuilder element(@Nonnull String columnName, @Nonnull Term index) { return element(CqlIdentifier.fromCql(columnName), index); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/condition/ConditionalStatement.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/condition/ConditionalStatement.java index 2822c0a2f6f..0dd2aef8da7 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/condition/ConditionalStatement.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/condition/ConditionalStatement.java @@ -24,9 +24,9 @@ import com.datastax.oss.driver.internal.querybuilder.lhs.ColumnComponentLeftOperand; import com.datastax.oss.driver.internal.querybuilder.lhs.ColumnLeftOperand; import com.datastax.oss.driver.internal.querybuilder.lhs.FieldLeftOperand; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Arrays; +import javax.annotation.CheckReturnValue; +import javax.annotation.Nonnull; /** * A statement that can be applied conditionally, such as UPDATE or DELETE. @@ -40,7 +40,7 @@ public interface ConditionalStatement> * *

    If any column conditions were added before, they will be cleared. */ - @NonNull + @Nonnull @CheckReturnValue SelfT ifExists(); @@ -54,9 +54,9 @@ public interface ConditionalStatement> *

    If you add multiple conditions as once, consider {@link #if_(Iterable)} as a more efficient * alternative. */ - @NonNull + @Nonnull @CheckReturnValue - SelfT if_(@NonNull Condition condition); + SelfT if_(@Nonnull Condition condition); /** * Adds multiple IF conditions at once. All conditions are logically joined with AND. If {@link @@ -68,14 +68,14 @@ public interface ConditionalStatement> *

    To create the arguments, use one of the factory methods in {@link Condition}, for example * {@link Condition#column(CqlIdentifier) column}. */ - @NonNull + @Nonnull @CheckReturnValue - SelfT if_(@NonNull Iterable conditions); + SelfT if_(@Nonnull Iterable conditions); /** Var-arg equivalent of {@link #if_(Iterable)}. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT if_(@NonNull Condition... conditions) { + default SelfT if_(@Nonnull Condition... conditions) { return if_(Arrays.asList(conditions)); } @@ -85,8 +85,8 @@ default SelfT if_(@NonNull Condition... conditions) { *

    This is the equivalent of creating a condition with {@link Condition#column(CqlIdentifier)} * and passing it to {@link #if_(Condition)}. */ - @NonNull - default ConditionBuilder ifColumn(@NonNull CqlIdentifier columnId) { + @Nonnull + default ConditionBuilder ifColumn(@Nonnull CqlIdentifier columnId) { return new DefaultConditionBuilder.Fluent<>(this, new ColumnLeftOperand(columnId)); } @@ -96,8 +96,8 @@ default ConditionBuilder ifColumn(@NonNull CqlIdentifier columnId) { *

    This is the equivalent of creating a condition with {@link Condition#column(String)} and * passing it to {@link #if_(Condition)}. */ - @NonNull - default ConditionBuilder ifColumn(@NonNull String columnName) { + @Nonnull + default ConditionBuilder ifColumn(@Nonnull String columnName) { return ifColumn(CqlIdentifier.fromCql(columnName)); } @@ -108,9 +108,9 @@ default ConditionBuilder ifColumn(@NonNull String columnName) { *

    This is the equivalent of creating a condition with {@link Condition#field(CqlIdentifier, * CqlIdentifier)} and passing it to {@link #if_(Condition)}. */ - @NonNull + @Nonnull default ConditionBuilder ifField( - @NonNull CqlIdentifier columnId, @NonNull CqlIdentifier fieldId) { + @Nonnull CqlIdentifier columnId, @Nonnull CqlIdentifier fieldId) { return new DefaultConditionBuilder.Fluent<>(this, new FieldLeftOperand(columnId, fieldId)); } @@ -121,8 +121,8 @@ default ConditionBuilder ifField( *

    This is the equivalent of creating a condition with {@link Condition#field(String, String)} * and passing it to {@link #if_(Condition)}. */ - @NonNull - default ConditionBuilder ifField(@NonNull String columnName, @NonNull String fieldName) { + @Nonnull + default ConditionBuilder ifField(@Nonnull String columnName, @Nonnull String fieldName) { return ifField(CqlIdentifier.fromCql(columnName), CqlIdentifier.fromCql(fieldName)); } @@ -133,8 +133,8 @@ default ConditionBuilder ifField(@NonNull String columnName, @NonNull Str *

    This is the equivalent of creating a condition with {@link Condition#element(CqlIdentifier, * Term)} and passing it to {@link #if_(Condition)}. */ - @NonNull - default ConditionBuilder ifElement(@NonNull CqlIdentifier columnId, @NonNull Term index) { + @Nonnull + default ConditionBuilder ifElement(@Nonnull CqlIdentifier columnId, @Nonnull Term index) { return new DefaultConditionBuilder.Fluent<>( this, new ColumnComponentLeftOperand(columnId, index)); } @@ -146,8 +146,8 @@ default ConditionBuilder ifElement(@NonNull CqlIdentifier columnId, @NonN *

    This is the equivalent of creating a condition with {@link Condition#element(String, Term)} * and passing it to {@link #if_(Condition)}. */ - @NonNull - default ConditionBuilder ifElement(@NonNull String columnName, @NonNull Term index) { + @Nonnull + default ConditionBuilder ifElement(@Nonnull String columnName, @Nonnull Term index) { return ifElement(CqlIdentifier.fromCql(columnName), index); } @@ -164,9 +164,9 @@ default ConditionBuilder ifElement(@NonNull String columnName, @NonNull T * * @see QueryBuilder#raw(String) */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT ifRaw(@NonNull String raw) { + default SelfT ifRaw(@Nonnull String raw) { return if_(QueryBuilder.raw(raw)); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteSelection.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteSelection.java index e8cf7a26855..f82bff1a5f1 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteSelection.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteSelection.java @@ -23,9 +23,9 @@ import com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause; import com.datastax.oss.driver.api.querybuilder.select.Selector; import com.datastax.oss.driver.api.querybuilder.term.Term; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Arrays; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * An in-progress DELETE statement: it targets a table and optionally a list of columns to delete; @@ -48,8 +48,8 @@ public interface DeleteSelection extends OngoingWhereClause { *

    If you add multiple selectors as once, consider {@link #selectors(Iterable)} as a more * efficient alternative. */ - @NonNull - DeleteSelection selector(@NonNull Selector selector); + @Nonnull + DeleteSelection selector(@Nonnull Selector selector); /** * Adds multiple selectors at once. @@ -66,12 +66,12 @@ public interface DeleteSelection extends OngoingWhereClause { * * @see #selector(Selector) */ - @NonNull - DeleteSelection selectors(@NonNull Iterable additionalSelectors); + @Nonnull + DeleteSelection selectors(@Nonnull Iterable additionalSelectors); /** Var-arg equivalent of {@link #selectors(Iterable)}. */ - @NonNull - default DeleteSelection selectors(@NonNull Selector... additionalSelectors) { + @Nonnull + default DeleteSelection selectors(@Nonnull Selector... additionalSelectors) { return selectors(Arrays.asList(additionalSelectors)); } @@ -82,14 +82,14 @@ default DeleteSelection selectors(@NonNull Selector... additionalSelectors) { * * @see Selector#column(CqlIdentifier) */ - @NonNull - default DeleteSelection column(@NonNull CqlIdentifier columnId) { + @Nonnull + default DeleteSelection column(@Nonnull CqlIdentifier columnId) { return selector(Selector.column(columnId)); } /** Shortcut for {@link #column(CqlIdentifier) column(CqlIdentifier.fromCql(columnName))} */ - @NonNull - default DeleteSelection column(@NonNull String columnName) { + @Nonnull + default DeleteSelection column(@Nonnull String columnName) { return column(CqlIdentifier.fromCql(columnName)); } @@ -101,9 +101,9 @@ default DeleteSelection column(@NonNull String columnName) { * * @see Selector#field(CqlIdentifier, CqlIdentifier) */ - @NonNull + @Nonnull default DeleteSelection field( - @NonNull CqlIdentifier udtColumnId, @NonNull CqlIdentifier fieldId) { + @Nonnull CqlIdentifier udtColumnId, @Nonnull CqlIdentifier fieldId) { return selector(Selector.field(udtColumnId, fieldId)); } @@ -113,8 +113,8 @@ default DeleteSelection field( * * @see Selector#field(String, String) */ - @NonNull - default DeleteSelection field(@NonNull String udtColumnName, @NonNull String fieldName) { + @Nonnull + default DeleteSelection field(@Nonnull String udtColumnName, @Nonnull String fieldName) { return field(CqlIdentifier.fromCql(udtColumnName), CqlIdentifier.fromCql(fieldName)); } @@ -126,8 +126,8 @@ default DeleteSelection field(@NonNull String udtColumnName, @NonNull String fie * * @see Selector#element(CqlIdentifier, Term) */ - @NonNull - default DeleteSelection element(@NonNull CqlIdentifier collectionId, @NonNull Term index) { + @Nonnull + default DeleteSelection element(@Nonnull CqlIdentifier collectionId, @Nonnull Term index) { return selector(Selector.element(collectionId, index)); } @@ -137,8 +137,8 @@ default DeleteSelection element(@NonNull CqlIdentifier collectionId, @NonNull Te * * @see Selector#element(String, Term) */ - @NonNull - default DeleteSelection element(@NonNull String collectionName, @NonNull Term index) { + @Nonnull + default DeleteSelection element(@Nonnull String collectionName, @Nonnull Term index) { return element(CqlIdentifier.fromCql(collectionName), index); } @@ -154,8 +154,8 @@ default DeleteSelection element(@NonNull String collectionName, @NonNull Term in * * @see QueryBuilder#raw(String) */ - @NonNull - default DeleteSelection raw(@NonNull String raw) { + @Nonnull + default DeleteSelection raw(@Nonnull String raw) { return selector(QueryBuilder.raw(raw)); } @@ -165,7 +165,7 @@ default DeleteSelection raw(@NonNull String raw) { *

    If this method or {@link #usingTimestamp(BindMarker)} is called multiple times, the last * value is used. */ - @NonNull + @Nonnull DeleteSelection usingTimestamp(long timestamp); /** @@ -174,6 +174,6 @@ default DeleteSelection raw(@NonNull String raw) { *

    If this method or {@link #usingTimestamp(long)} is called multiple times, the last value is * used. Passing {@code null} to this method removes any previous timestamp. */ - @NonNull + @Nonnull DeleteSelection usingTimestamp(@Nullable BindMarker bindMarker); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/insert/Insert.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/insert/Insert.java index 09a29161417..722c6ed61c8 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/insert/Insert.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/insert/Insert.java @@ -19,14 +19,14 @@ import com.datastax.oss.driver.api.querybuilder.BindMarker; import com.datastax.oss.driver.api.querybuilder.BuildableQuery; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** A complete INSERT statement that is ready to be built. */ public interface Insert extends BuildableQuery { /** Adds an IF NOT EXISTS clause to this statement. */ - @NonNull + @Nonnull Insert ifNotExists(); /** @@ -35,7 +35,7 @@ public interface Insert extends BuildableQuery { *

    If this method or {@link #usingTimestamp(BindMarker)} is called multiple times, the last * value is used. */ - @NonNull + @Nonnull Insert usingTimestamp(long timestamp); /** @@ -44,7 +44,7 @@ public interface Insert extends BuildableQuery { *

    If this method or {@link #usingTimestamp(long)} is called multiple times, the last value is * used. Passing {@code null} to this method removes any previous timestamp. */ - @NonNull + @Nonnull Insert usingTimestamp(@Nullable BindMarker bindMarker); /** @@ -58,7 +58,7 @@ public interface Insert extends BuildableQuery { * * @param ttlInSeconds Time, in seconds, the inserted data should live before expiring. */ - @NonNull + @Nonnull Insert usingTtl(int ttlInSeconds); /** @@ -72,6 +72,6 @@ public interface Insert extends BuildableQuery { * * @param bindMarker A bind marker that is understood to be a value in seconds. */ - @NonNull + @Nonnull Insert usingTtl(@Nullable BindMarker bindMarker); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/insert/InsertInto.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/insert/InsertInto.java index 26bee52c377..df809b6fc5d 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/insert/InsertInto.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/insert/InsertInto.java @@ -22,7 +22,7 @@ import com.datastax.oss.driver.api.core.type.codec.TypeCodec; import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry; import com.datastax.oss.driver.api.querybuilder.BindMarker; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** * The beginning of an INSERT statement; at this point only the table is known, it might become a @@ -31,12 +31,12 @@ public interface InsertInto extends OngoingValues { /** Makes this statement an INSERT JSON with the provided JSON string. */ - @NonNull - JsonInsert json(@NonNull String json); + @Nonnull + JsonInsert json(@Nonnull String json); /** Makes this statement an INSERT JSON with a bind marker, as in {@code INSERT JSON ?}. */ - @NonNull - JsonInsert json(@NonNull BindMarker bindMarker); + @Nonnull + JsonInsert json(@Nonnull BindMarker bindMarker); /** * Makes this statement an INSERT JSON with a custom type mapping. The provided {@code Object @@ -50,8 +50,8 @@ public interface InsertInto extends OngoingValues { * handle {@code value}. * @see DriverContext#getCodecRegistry() */ - @NonNull - default JsonInsert json(@NonNull Object value, @NonNull CodecRegistry codecRegistry) { + @Nonnull + default JsonInsert json(@Nonnull Object value, @Nonnull CodecRegistry codecRegistry) { try { return json(value, codecRegistry.codecFor(value)); } catch (CodecNotFoundException e) { @@ -71,6 +71,6 @@ default JsonInsert json(@NonNull Object value, @NonNull CodecRegistry codecRegis * value} will be mapped to a JSON string. The value will be turned into a string with {@link * TypeCodec#format(Object)}, and inlined in the query. */ - @NonNull - JsonInsert json(@NonNull T value, @NonNull TypeCodec codec); + @Nonnull + JsonInsert json(@Nonnull T value, @Nonnull TypeCodec codec); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/insert/JsonInsert.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/insert/JsonInsert.java index f287cd31501..cef9b1e5e35 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/insert/JsonInsert.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/insert/JsonInsert.java @@ -17,7 +17,7 @@ */ package com.datastax.oss.driver.api.querybuilder.insert; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; /** An INSERT JSON statement. */ public interface JsonInsert extends Insert { @@ -27,7 +27,7 @@ public interface JsonInsert extends Insert { * *

    If this or {@link #defaultUnset()} is called multiple times, the last value is used. */ - @NonNull + @Nonnull JsonInsert defaultNull(); /** @@ -35,6 +35,6 @@ public interface JsonInsert extends Insert { * *

    If this or {@link #defaultNull()} is called multiple times, the last value is used. */ - @NonNull + @Nonnull JsonInsert defaultUnset(); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/insert/OngoingValues.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/insert/OngoingValues.java index a3e6572608a..3e4eca7b4db 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/insert/OngoingValues.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/insert/OngoingValues.java @@ -20,8 +20,8 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.querybuilder.term.Term; import com.datastax.oss.driver.internal.core.CqlIdentifiers; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.Nonnull; public interface OngoingValues { @@ -31,15 +31,15 @@ public interface OngoingValues { *

    If this is called twice for the same column, the previous entry is discarded and the new * entry will be added at the end of the list. */ - @NonNull - RegularInsert value(@NonNull CqlIdentifier columnId, @NonNull Term value); + @Nonnull + RegularInsert value(@Nonnull CqlIdentifier columnId, @Nonnull Term value); /** * Shortcut for {@link #value(CqlIdentifier, Term) value(CqlIdentifier.fromCql(columnName), * value)}. */ - @NonNull - default RegularInsert value(@NonNull String columnName, @NonNull Term value) { + @Nonnull + default RegularInsert value(@Nonnull String columnName, @Nonnull Term value) { return value(CqlIdentifier.fromCql(columnName), value); } @@ -54,8 +54,8 @@ default RegularInsert value(@NonNull String columnName, @NonNull Term value) { * implementation calls {@link #value(CqlIdentifier, Term)} in a loop; it should be overridden if * a more efficient alternative exists. */ - @NonNull - default RegularInsert valuesByIds(@NonNull Map newAssignments) { + @Nonnull + default RegularInsert valuesByIds(@Nonnull Map newAssignments) { if (newAssignments.isEmpty()) { throw new IllegalArgumentException("newAssignments can't be empty"); } @@ -67,8 +67,8 @@ default RegularInsert valuesByIds(@NonNull Map newAssignmen } /** Shortcut for {@link #valuesByIds(Map)} when the keys are plain strings. */ - @NonNull - default RegularInsert values(@NonNull Map newAssignments) { + @Nonnull + default RegularInsert values(@Nonnull Map newAssignments) { return valuesByIds(CqlIdentifiers.wrapKeys(newAssignments)); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/ArithmeticRelationBuilder.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/ArithmeticRelationBuilder.java index 50e2a03f347..6e640adae2d 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/ArithmeticRelationBuilder.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/ArithmeticRelationBuilder.java @@ -18,47 +18,47 @@ package com.datastax.oss.driver.api.querybuilder.relation; import com.datastax.oss.driver.api.querybuilder.term.Term; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public interface ArithmeticRelationBuilder { /** Builds an '=' relation with the given term. */ - @NonNull - default ResultT isEqualTo(@NonNull Term rightOperand) { + @Nonnull + default ResultT isEqualTo(@Nonnull Term rightOperand) { return build("=", rightOperand); } /** Builds a '<' relation with the given term. */ - @NonNull - default ResultT isLessThan(@NonNull Term rightOperand) { + @Nonnull + default ResultT isLessThan(@Nonnull Term rightOperand) { return build("<", rightOperand); } /** Builds a '<=' relation with the given term. */ - @NonNull - default ResultT isLessThanOrEqualTo(@NonNull Term rightOperand) { + @Nonnull + default ResultT isLessThanOrEqualTo(@Nonnull Term rightOperand) { return build("<=", rightOperand); } /** Builds a '>' relation with the given term. */ - @NonNull - default ResultT isGreaterThan(@NonNull Term rightOperand) { + @Nonnull + default ResultT isGreaterThan(@Nonnull Term rightOperand) { return build(">", rightOperand); } /** Builds a '>=' relation with the given term. */ - @NonNull - default ResultT isGreaterThanOrEqualTo(@NonNull Term rightOperand) { + @Nonnull + default ResultT isGreaterThanOrEqualTo(@Nonnull Term rightOperand) { return build(">=", rightOperand); } /** Builds a '!=' relation with the given term. */ - @NonNull - default ResultT isNotEqualTo(@NonNull Term rightOperand) { + @Nonnull + default ResultT isNotEqualTo(@Nonnull Term rightOperand) { return build("!=", rightOperand); } - @NonNull - ResultT build(@NonNull String operator, @Nullable Term rightOperand); + @Nonnull + ResultT build(@Nonnull String operator, @Nullable Term rightOperand); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/ColumnRelationBuilder.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/ColumnRelationBuilder.java index 613e72291b7..206f5a6838b 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/ColumnRelationBuilder.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/ColumnRelationBuilder.java @@ -18,32 +18,32 @@ package com.datastax.oss.driver.api.querybuilder.relation; import com.datastax.oss.driver.api.querybuilder.term.Term; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface ColumnRelationBuilder extends ArithmeticRelationBuilder, InRelationBuilder { /** Builds a LIKE relation for the column. */ - @NonNull - default ResultT like(@NonNull Term term) { + @Nonnull + default ResultT like(@Nonnull Term term) { return build(" LIKE ", term); } /** Builds an IS NOT NULL relation for the column. */ - @NonNull + @Nonnull default ResultT isNotNull() { return build(" IS NOT NULL", null); } /** Builds a CONTAINS relation for the column. */ - @NonNull - default ResultT contains(@NonNull Term term) { + @Nonnull + default ResultT contains(@Nonnull Term term) { return build(" CONTAINS ", term); } /** Builds a CONTAINS KEY relation for the column. */ - @NonNull - default ResultT containsKey(@NonNull Term term) { + @Nonnull + default ResultT containsKey(@Nonnull Term term) { return build(" CONTAINS KEY ", term); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/InRelationBuilder.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/InRelationBuilder.java index d3fc8dce91d..eeb7b6f38a3 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/InRelationBuilder.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/InRelationBuilder.java @@ -20,9 +20,9 @@ import com.datastax.oss.driver.api.querybuilder.BindMarker; import com.datastax.oss.driver.api.querybuilder.QueryBuilder; import com.datastax.oss.driver.api.querybuilder.term.Term; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Arrays; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public interface InRelationBuilder { @@ -30,8 +30,8 @@ public interface InRelationBuilder { * Builds an IN relation where the whole set of possible values is a bound variable, as in {@code * IN ?}. */ - @NonNull - default ResultT in(@NonNull BindMarker bindMarker) { + @Nonnull + default ResultT in(@Nonnull BindMarker bindMarker) { return build(" IN ", bindMarker); } @@ -39,17 +39,17 @@ default ResultT in(@NonNull BindMarker bindMarker) { * Builds an IN relation where the arguments are the possible values, as in {@code IN (term1, * term2...)}. */ - @NonNull - default ResultT in(@NonNull Iterable alternatives) { + @Nonnull + default ResultT in(@Nonnull Iterable alternatives) { return build(" IN ", QueryBuilder.tuple(alternatives)); } /** Var-arg equivalent of {@link #in(Iterable)} . */ - @NonNull - default ResultT in(@NonNull Term... alternatives) { + @Nonnull + default ResultT in(@Nonnull Term... alternatives) { return in(Arrays.asList(alternatives)); } - @NonNull - ResultT build(@NonNull String operator, @Nullable Term rightOperand); + @Nonnull + ResultT build(@Nonnull String operator, @Nullable Term rightOperand); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/OngoingWhereClause.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/OngoingWhereClause.java index 16b8072fdff..fc99feef83f 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/OngoingWhereClause.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/OngoingWhereClause.java @@ -27,9 +27,9 @@ import com.datastax.oss.driver.internal.querybuilder.relation.DefaultColumnRelationBuilder; import com.datastax.oss.driver.internal.querybuilder.relation.DefaultMultiColumnRelationBuilder; import com.datastax.oss.driver.internal.querybuilder.relation.DefaultTokenRelationBuilder; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Arrays; +import javax.annotation.CheckReturnValue; +import javax.annotation.Nonnull; /** A statement that is ready to accept relations in its WHERE clause. */ public interface OngoingWhereClause> { @@ -43,9 +43,9 @@ public interface OngoingWhereClause> { *

    If you add multiple selectors as once, consider {@link #where(Iterable)} as a more efficient * alternative. */ - @NonNull + @Nonnull @CheckReturnValue - SelfT where(@NonNull Relation relation); + SelfT where(@Nonnull Relation relation); /** * Adds multiple relations at once. All relations are logically joined with AND. @@ -58,14 +58,14 @@ public interface OngoingWhereClause> { * * @see #where(Relation) */ - @NonNull + @Nonnull @CheckReturnValue - SelfT where(@NonNull Iterable additionalRelations); + SelfT where(@Nonnull Iterable additionalRelations); /** Var-arg equivalent of {@link #where(Iterable)}. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT where(@NonNull Relation... additionalRelations) { + default SelfT where(@Nonnull Relation... additionalRelations) { return where(Arrays.asList(additionalRelations)); } @@ -81,8 +81,8 @@ default SelfT where(@NonNull Relation... additionalRelations) { * This is the equivalent of creating a relation with {@link Relation#column(CqlIdentifier)} and * passing it to {@link #where(Relation)}. */ - @NonNull - default ColumnRelationBuilder whereColumn(@NonNull CqlIdentifier id) { + @Nonnull + default ColumnRelationBuilder whereColumn(@Nonnull CqlIdentifier id) { return new DefaultColumnRelationBuilder.Fluent<>(this, id); } @@ -92,8 +92,8 @@ default ColumnRelationBuilder whereColumn(@NonNull CqlIdentifier id) { *

    This is the equivalent of creating a relation with {@link Relation#column(String)} and * passing it to {@link #where(Relation)}. */ - @NonNull - default ColumnRelationBuilder whereColumn(@NonNull String name) { + @Nonnull + default ColumnRelationBuilder whereColumn(@Nonnull String name) { return whereColumn(CqlIdentifier.fromCql(name)); } @@ -103,9 +103,9 @@ default ColumnRelationBuilder whereColumn(@NonNull String name) { *

    This is the equivalent of creating a relation with {@link Relation#mapValue(CqlIdentifier, * Term)} and passing it to {@link #where(Relation)}. */ - @NonNull + @Nonnull default ColumnComponentRelationBuilder whereMapValue( - @NonNull CqlIdentifier columnId, @NonNull Term index) { + @Nonnull CqlIdentifier columnId, @Nonnull Term index) { return new DefaultColumnComponentRelationBuilder.Fluent<>(this, columnId, index); } @@ -116,9 +116,9 @@ default ColumnComponentRelationBuilder whereMapValue( *

    This is the equivalent of creating a relation with {@link Relation#mapValue(String, Term)} * and passing it to {@link #where(Relation)}. */ - @NonNull + @Nonnull default ColumnComponentRelationBuilder whereMapValue( - @NonNull String columnName, @NonNull Term index) { + @Nonnull String columnName, @Nonnull Term index) { return whereMapValue(CqlIdentifier.fromCql(columnName), index); } @@ -128,9 +128,9 @@ default ColumnComponentRelationBuilder whereMapValue( *

    This is the equivalent of creating a relation with {@link Relation#tokenFromIds(Iterable)} * and passing it to {@link #where(Relation)}. */ - @NonNull + @Nonnull default TokenRelationBuilder whereTokenFromIds( - @NonNull Iterable identifiers) { + @Nonnull Iterable identifiers) { return new DefaultTokenRelationBuilder.Fluent<>(this, identifiers); } @@ -140,8 +140,8 @@ default TokenRelationBuilder whereTokenFromIds( *

    This is the equivalent of creating a relation with {@link Relation#token(CqlIdentifier...)} * and passing it to {@link #where(Relation)}. */ - @NonNull - default TokenRelationBuilder whereToken(@NonNull CqlIdentifier... identifiers) { + @Nonnull + default TokenRelationBuilder whereToken(@Nonnull CqlIdentifier... identifiers) { return whereTokenFromIds(Arrays.asList(identifiers)); } @@ -152,8 +152,8 @@ default TokenRelationBuilder whereToken(@NonNull CqlIdentifier... identif *

    This is the equivalent of creating a relation with {@link Relation#token(Iterable)} and * passing it to {@link #where(Relation)}. */ - @NonNull - default TokenRelationBuilder whereToken(@NonNull Iterable names) { + @Nonnull + default TokenRelationBuilder whereToken(@Nonnull Iterable names) { return whereTokenFromIds(CqlIdentifiers.wrap(names)); } @@ -163,8 +163,8 @@ default TokenRelationBuilder whereToken(@NonNull Iterable names) *

    This is the equivalent of creating a relation with {@link Relation#token(String...)} and * passing it to {@link #where(Relation)}. */ - @NonNull - default TokenRelationBuilder whereToken(@NonNull String... names) { + @Nonnull + default TokenRelationBuilder whereToken(@Nonnull String... names) { return whereToken(Arrays.asList(names)); } @@ -174,9 +174,9 @@ default TokenRelationBuilder whereToken(@NonNull String... names) { *

    This is the equivalent of creating a relation with {@link Relation#columnIds(Iterable)} and * passing it to {@link #where(Relation)}. */ - @NonNull + @Nonnull default MultiColumnRelationBuilder whereColumnIds( - @NonNull Iterable identifiers) { + @Nonnull Iterable identifiers) { return new DefaultMultiColumnRelationBuilder.Fluent<>(this, identifiers); } @@ -186,8 +186,8 @@ default MultiColumnRelationBuilder whereColumnIds( *

    This is the equivalent of creating a relation with {@link * Relation#columns(CqlIdentifier...)} and passing it to {@link #where(Relation)}. */ - @NonNull - default MultiColumnRelationBuilder whereColumns(@NonNull CqlIdentifier... identifiers) { + @Nonnull + default MultiColumnRelationBuilder whereColumns(@Nonnull CqlIdentifier... identifiers) { return whereColumnIds(Arrays.asList(identifiers)); } @@ -198,8 +198,8 @@ default MultiColumnRelationBuilder whereColumns(@NonNull CqlIdentifier... *

    This is the equivalent of creating a relation with {@link Relation#columns(Iterable)} and * passing it to {@link #where(Relation)}. */ - @NonNull - default MultiColumnRelationBuilder whereColumns(@NonNull Iterable names) { + @Nonnull + default MultiColumnRelationBuilder whereColumns(@Nonnull Iterable names) { return whereColumnIds(CqlIdentifiers.wrap(names)); } @@ -209,8 +209,8 @@ default MultiColumnRelationBuilder whereColumns(@NonNull Iterable *

    This is the equivalent of creating a relation with {@link Relation#columns(String...)} and * passing it to {@link #where(Relation)}. */ - @NonNull - default MultiColumnRelationBuilder whereColumns(@NonNull String... names) { + @Nonnull + default MultiColumnRelationBuilder whereColumns(@Nonnull String... names) { return whereColumns(Arrays.asList(names)); } @@ -220,9 +220,9 @@ default MultiColumnRelationBuilder whereColumns(@NonNull String... names) *

    This is the equivalent of creating a relation with {@link * Relation#customIndex(CqlIdentifier, Term)} and passing it to {@link #where(Relation)}. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT whereCustomIndex(@NonNull CqlIdentifier indexId, @NonNull Term expression) { + default SelfT whereCustomIndex(@Nonnull CqlIdentifier indexId, @Nonnull Term expression) { return where(new CustomIndexRelation(indexId, expression)); } @@ -233,9 +233,9 @@ default SelfT whereCustomIndex(@NonNull CqlIdentifier indexId, @NonNull Term exp *

    This is the equivalent of creating a relation with {@link Relation#customIndex(String, * Term)} and passing it to {@link #where(Relation)}. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT whereCustomIndex(@NonNull String indexName, @NonNull Term expression) { + default SelfT whereCustomIndex(@Nonnull String indexName, @Nonnull Term expression) { return whereCustomIndex(CqlIdentifier.fromCql(indexName), expression); } @@ -250,9 +250,9 @@ default SelfT whereCustomIndex(@NonNull String indexName, @NonNull Term expressi * fail at execution time; on the other hand, it can be used as a workaround to handle new CQL * features that are not yet covered by the query builder. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT whereRaw(@NonNull String raw) { + default SelfT whereRaw(@Nonnull String raw) { return where(new DefaultRaw(raw)); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/Relation.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/Relation.java index 41020332643..d3d315cc217 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/Relation.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/relation/Relation.java @@ -28,8 +28,8 @@ import com.datastax.oss.driver.internal.querybuilder.relation.DefaultColumnRelationBuilder; import com.datastax.oss.driver.internal.querybuilder.relation.DefaultMultiColumnRelationBuilder; import com.datastax.oss.driver.internal.querybuilder.relation.DefaultTokenRelationBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Arrays; +import javax.annotation.Nonnull; /** * A relation in a WHERE clause. @@ -63,21 +63,21 @@ public interface Relation extends CqlSnippet { * Relation r = Relation.column("k").isEqualTo(bindMarker()); * } */ - @NonNull - static ColumnRelationBuilder column(@NonNull CqlIdentifier id) { + @Nonnull + static ColumnRelationBuilder column(@Nonnull CqlIdentifier id) { return new DefaultColumnRelationBuilder(id); } /** Shortcut for {@link #column(CqlIdentifier) column(CqlIdentifier.fromCql(name))} */ - @NonNull - static ColumnRelationBuilder column(@NonNull String name) { + @Nonnull + static ColumnRelationBuilder column(@Nonnull String name) { return column(CqlIdentifier.fromCql(name)); } /** Builds a relation testing a value in a map (Cassandra 4 and above). */ - @NonNull + @Nonnull static ColumnComponentRelationBuilder mapValue( - @NonNull CqlIdentifier columnId, @NonNull Term index) { + @Nonnull CqlIdentifier columnId, @Nonnull Term index) { // The concept could easily be extended to list elements and tuple components, so use a generic // name internally, we'll add other shortcuts if necessary. return new DefaultColumnComponentRelationBuilder(columnId, index); @@ -87,21 +87,21 @@ static ColumnComponentRelationBuilder mapValue( * Shortcut for {@link #mapValue(CqlIdentifier, Term) mapValue(CqlIdentifier.fromCql(columnName), * index)} */ - @NonNull + @Nonnull static ColumnComponentRelationBuilder mapValue( - @NonNull String columnName, @NonNull Term index) { + @Nonnull String columnName, @Nonnull Term index) { return mapValue(CqlIdentifier.fromCql(columnName), index); } /** Builds a relation testing a token generated from a set of columns. */ - @NonNull - static TokenRelationBuilder tokenFromIds(@NonNull Iterable identifiers) { + @Nonnull + static TokenRelationBuilder tokenFromIds(@Nonnull Iterable identifiers) { return new DefaultTokenRelationBuilder(identifiers); } /** Var-arg equivalent of {@link #tokenFromIds(Iterable)}. */ - @NonNull - static TokenRelationBuilder token(@NonNull CqlIdentifier... identifiers) { + @Nonnull + static TokenRelationBuilder token(@Nonnull CqlIdentifier... identifiers) { return tokenFromIds(Arrays.asList(identifiers)); } @@ -109,27 +109,27 @@ static TokenRelationBuilder token(@NonNull CqlIdentifier... identifier * Equivalent of {@link #tokenFromIds(Iterable)} with raw strings; the names are converted with * {@link CqlIdentifier#fromCql(String)}. */ - @NonNull - static TokenRelationBuilder token(@NonNull Iterable names) { + @Nonnull + static TokenRelationBuilder token(@Nonnull Iterable names) { return tokenFromIds(CqlIdentifiers.wrap(names)); } /** Var-arg equivalent of {@link #token(Iterable)}. */ - @NonNull - static TokenRelationBuilder token(@NonNull String... names) { + @Nonnull + static TokenRelationBuilder token(@Nonnull String... names) { return token(Arrays.asList(names)); } /** Builds a multi-column relation, as in {@code WHERE (c1, c2, c3) IN ...}. */ - @NonNull + @Nonnull static MultiColumnRelationBuilder columnIds( - @NonNull Iterable identifiers) { + @Nonnull Iterable identifiers) { return new DefaultMultiColumnRelationBuilder(identifiers); } /** Var-arg equivalent of {@link #columnIds(Iterable)}. */ - @NonNull - static MultiColumnRelationBuilder columns(@NonNull CqlIdentifier... identifiers) { + @Nonnull + static MultiColumnRelationBuilder columns(@Nonnull CqlIdentifier... identifiers) { return columnIds(Arrays.asList(identifiers)); } @@ -137,20 +137,20 @@ static MultiColumnRelationBuilder columns(@NonNull CqlIdentifier... id * Equivalent of {@link #columnIds(Iterable)} with raw strings; the names are converted with * {@link CqlIdentifier#fromCql(String)}. */ - @NonNull - static MultiColumnRelationBuilder columns(@NonNull Iterable names) { + @Nonnull + static MultiColumnRelationBuilder columns(@Nonnull Iterable names) { return columnIds(CqlIdentifiers.wrap(names)); } /** Var-arg equivalent of {@link #columns(Iterable)}. */ - @NonNull - static MultiColumnRelationBuilder columns(@NonNull String... names) { + @Nonnull + static MultiColumnRelationBuilder columns(@Nonnull String... names) { return columns(Arrays.asList(names)); } /** Builds a relation on a custom index. */ - @NonNull - static Relation customIndex(@NonNull CqlIdentifier indexId, @NonNull Term expression) { + @Nonnull + static Relation customIndex(@Nonnull CqlIdentifier indexId, @Nonnull Term expression) { return new CustomIndexRelation(indexId, expression); } @@ -158,8 +158,8 @@ static Relation customIndex(@NonNull CqlIdentifier indexId, @NonNull Term expres * Shortcut for {@link #customIndex(CqlIdentifier, Term) * customIndex(CqlIdentifier.fromCql(indexName), expression)} */ - @NonNull - static Relation customIndex(@NonNull String indexName, @NonNull Term expression) { + @Nonnull + static Relation customIndex(@Nonnull String indexName, @Nonnull Term expression) { return customIndex(CqlIdentifier.fromCql(indexName), expression); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableAddColumn.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableAddColumn.java index 701cec1509b..fb3495bdc08 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableAddColumn.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableAddColumn.java @@ -21,7 +21,7 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.querybuilder.SchemaBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface AlterTableAddColumn { /** @@ -30,15 +30,15 @@ public interface AlterTableAddColumn { *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull - AlterTableAddColumnEnd addColumn(@NonNull CqlIdentifier columnName, @NonNull DataType dataType); + @Nonnull + AlterTableAddColumnEnd addColumn(@Nonnull CqlIdentifier columnName, @Nonnull DataType dataType); /** * Shortcut for {@link #addColumn(CqlIdentifier, DataType) * addColumn(CqlIdentifier.asCql(columnName), dataType)}. */ - @NonNull - default AlterTableAddColumnEnd addColumn(@NonNull String columnName, @NonNull DataType dataType) { + @Nonnull + default AlterTableAddColumnEnd addColumn(@Nonnull String columnName, @Nonnull DataType dataType) { return addColumn(CqlIdentifier.fromCql(columnName), dataType); } @@ -48,17 +48,17 @@ default AlterTableAddColumnEnd addColumn(@NonNull String columnName, @NonNull Da *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull + @Nonnull AlterTableAddColumnEnd addStaticColumn( - @NonNull CqlIdentifier columnName, @NonNull DataType dataType); + @Nonnull CqlIdentifier columnName, @Nonnull DataType dataType); /** * Shortcut for {@link #addStaticColumn(CqlIdentifier, DataType) * addStaticColumn(CqlIdentifier.asCql(columnName), dataType)}. */ - @NonNull + @Nonnull default AlterTableAddColumnEnd addStaticColumn( - @NonNull String columnName, @NonNull DataType dataType) { + @Nonnull String columnName, @Nonnull DataType dataType) { return addStaticColumn(CqlIdentifier.fromCql(columnName), dataType); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableDropColumn.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableDropColumn.java index 39d6abd558f..c55dff3875e 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableDropColumn.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableDropColumn.java @@ -18,19 +18,19 @@ package com.datastax.oss.driver.api.querybuilder.schema; import com.datastax.oss.driver.api.core.CqlIdentifier; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface AlterTableDropColumn { /** * Adds column(s) to drop to ALTER TABLE specification. This may be repeated with successive calls * to drop columns. */ - @NonNull - AlterTableDropColumnEnd dropColumns(@NonNull CqlIdentifier... columnNames); + @Nonnull + AlterTableDropColumnEnd dropColumns(@Nonnull CqlIdentifier... columnNames); /** Shortcut for {@link #dropColumns(CqlIdentifier...)}. */ - @NonNull - default AlterTableDropColumnEnd dropColumns(@NonNull String... columnNames) { + @Nonnull + default AlterTableDropColumnEnd dropColumns(@Nonnull String... columnNames) { CqlIdentifier ids[] = new CqlIdentifier[columnNames.length]; for (int i = 0; i < columnNames.length; i++) { ids[i] = CqlIdentifier.fromCql(columnNames[i]); @@ -42,16 +42,16 @@ default AlterTableDropColumnEnd dropColumns(@NonNull String... columnNames) { * Adds a column to drop to ALTER TABLE specification. This may be repeated with successive calls * to drop columns. Shortcut for {@link #dropColumns(CqlIdentifier...) #dropColumns(columnName)}. */ - @NonNull - default AlterTableDropColumnEnd dropColumn(@NonNull CqlIdentifier columnName) { + @Nonnull + default AlterTableDropColumnEnd dropColumn(@Nonnull CqlIdentifier columnName) { return dropColumns(columnName); } /** * Shortcut for {@link #dropColumn(CqlIdentifier) dropColumn(CqlIdentifier.fromCql(columnName))}. */ - @NonNull - default AlterTableDropColumnEnd dropColumn(@NonNull String columnName) { + @Nonnull + default AlterTableDropColumnEnd dropColumn(@Nonnull String columnName) { return dropColumns(CqlIdentifier.fromCql(columnName)); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableRenameColumn.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableRenameColumn.java index 8938b11ca9a..4b153855054 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableRenameColumn.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableRenameColumn.java @@ -18,7 +18,7 @@ package com.datastax.oss.driver.api.querybuilder.schema; import com.datastax.oss.driver.api.core.CqlIdentifier; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface AlterTableRenameColumn { @@ -26,15 +26,15 @@ public interface AlterTableRenameColumn { * Adds a column rename to ALTER TABLE specification. This may be repeated with successive calls * to rename columns. */ - @NonNull - AlterTableRenameColumnEnd renameColumn(@NonNull CqlIdentifier from, @NonNull CqlIdentifier to); + @Nonnull + AlterTableRenameColumnEnd renameColumn(@Nonnull CqlIdentifier from, @Nonnull CqlIdentifier to); /** * Shortcut for {@link #renameColumn(CqlIdentifier,CqlIdentifier) * renameField(CqlIdentifier.fromCql(from),CqlIdentifier.fromCql(to))}. */ - @NonNull - default AlterTableRenameColumnEnd renameColumn(@NonNull String from, @NonNull String to) { + @Nonnull + default AlterTableRenameColumnEnd renameColumn(@Nonnull String from, @Nonnull String to) { return renameColumn(CqlIdentifier.fromCql(from), CqlIdentifier.fromCql(to)); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableStart.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableStart.java index f1537073b19..a7e44e8dddc 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableStart.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableStart.java @@ -22,7 +22,7 @@ import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.querybuilder.BuildableQuery; import com.datastax.oss.driver.api.querybuilder.SchemaBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface AlterTableStart extends AlterTableWithOptions, @@ -31,7 +31,7 @@ public interface AlterTableStart AlterTableRenameColumn { /** Completes ALTER TABLE specifying that compact storage should be removed from the table. */ - @NonNull + @Nonnull BuildableQuery dropCompactStorage(); /** @@ -40,15 +40,15 @@ public interface AlterTableStart *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull - BuildableQuery alterColumn(@NonNull CqlIdentifier columnName, @NonNull DataType dataType); + @Nonnull + BuildableQuery alterColumn(@Nonnull CqlIdentifier columnName, @Nonnull DataType dataType); /** * Shortcut for {@link #alterColumn(CqlIdentifier,DataType) * alterColumn(CqlIdentifier.fromCql(columnName,dataType)}. */ - @NonNull - default BuildableQuery alterColumn(@NonNull String columnName, @NonNull DataType dataType) { + @Nonnull + default BuildableQuery alterColumn(@Nonnull String columnName, @Nonnull DataType dataType) { return alterColumn(CqlIdentifier.fromCql(columnName), dataType); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTypeRenameField.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTypeRenameField.java index 82d9667c9cc..29c0dc61cc5 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTypeRenameField.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTypeRenameField.java @@ -18,7 +18,7 @@ package com.datastax.oss.driver.api.querybuilder.schema; import com.datastax.oss.driver.api.core.CqlIdentifier; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface AlterTypeRenameField { @@ -26,15 +26,15 @@ public interface AlterTypeRenameField { * Adds a field rename to ALTER TYPE specification. This may be repeated with successive calls to * rename fields. */ - @NonNull - AlterTypeRenameFieldEnd renameField(@NonNull CqlIdentifier from, @NonNull CqlIdentifier to); + @Nonnull + AlterTypeRenameFieldEnd renameField(@Nonnull CqlIdentifier from, @Nonnull CqlIdentifier to); /** * Shortcut for {@link #renameField(CqlIdentifier,CqlIdentifier) * renameField(CqlIdentifier.fromCql(from),CqlIdentifier.fromCql(to))}. */ - @NonNull - default AlterTypeRenameFieldEnd renameField(@NonNull String from, @NonNull String to) { + @Nonnull + default AlterTypeRenameFieldEnd renameField(@Nonnull String from, @Nonnull String to) { return renameField(CqlIdentifier.fromCql(from), CqlIdentifier.fromCql(to)); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTypeStart.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTypeStart.java index 6ea197a235f..4218dd71c40 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTypeStart.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTypeStart.java @@ -22,7 +22,7 @@ import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.querybuilder.BuildableQuery; import com.datastax.oss.driver.api.querybuilder.SchemaBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface AlterTypeStart extends AlterTypeRenameField { @@ -32,15 +32,15 @@ public interface AlterTypeStart extends AlterTypeRenameField { *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull - BuildableQuery alterField(@NonNull CqlIdentifier fieldName, @NonNull DataType dataType); + @Nonnull + BuildableQuery alterField(@Nonnull CqlIdentifier fieldName, @Nonnull DataType dataType); /** * Shortcut for {@link #alterField(CqlIdentifier,DataType) * alterField(CqlIdentifier.fromCql(columnName,dataType)}. */ - @NonNull - default BuildableQuery alterField(@NonNull String fieldName, @NonNull DataType dataType) { + @Nonnull + default BuildableQuery alterField(@Nonnull String fieldName, @Nonnull DataType dataType) { return alterField(CqlIdentifier.fromCql(fieldName), dataType); } @@ -50,15 +50,15 @@ default BuildableQuery alterField(@NonNull String fieldName, @NonNull DataType d *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull - BuildableQuery addField(@NonNull CqlIdentifier fieldName, @NonNull DataType dataType); + @Nonnull + BuildableQuery addField(@Nonnull CqlIdentifier fieldName, @Nonnull DataType dataType); /** * Shortcut for {@link #addField(CqlIdentifier, DataType) addField(CqlIdentifier.asCql(fieldName), * dataType)}. */ - @NonNull - default BuildableQuery addField(@NonNull String fieldName, @NonNull DataType dataType) { + @Nonnull + default BuildableQuery addField(@Nonnull String fieldName, @Nonnull DataType dataType) { return addField(CqlIdentifier.fromCql(fieldName), dataType); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateEnd.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateEnd.java index 75d7bf1e681..8c96590a5f2 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateEnd.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateEnd.java @@ -20,7 +20,7 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.querybuilder.BuildableQuery; import com.datastax.oss.driver.api.querybuilder.term.Term; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateAggregateEnd extends BuildableQuery { @@ -28,22 +28,22 @@ public interface CreateAggregateEnd extends BuildableQuery { * Adds INITCOND to the aggregate query. Defines the initial condition, values, of the first * parameter in the SFUNC. */ - @NonNull - CreateAggregateEnd withInitCond(@NonNull Term term); + @Nonnull + CreateAggregateEnd withInitCond(@Nonnull Term term); /** * Adds FINALFUNC to the create aggregate query. This is used to specify what type is returned * from the state function. */ - @NonNull - CreateAggregateEnd withFinalFunc(@NonNull CqlIdentifier finalFunc); + @Nonnull + CreateAggregateEnd withFinalFunc(@Nonnull CqlIdentifier finalFunc); /** * Shortcut for {@link #withFinalFunc(CqlIdentifier) * withFinalFunc(CqlIdentifier.fromCql(finalFuncName))}. */ - @NonNull - default CreateAggregateEnd withFinalFunc(@NonNull String finalFuncName) { + @Nonnull + default CreateAggregateEnd withFinalFunc(@Nonnull String finalFuncName) { return withFinalFunc(CqlIdentifier.fromCql(finalFuncName)); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateStart.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateStart.java index 4b46ed18f97..29eea62f0ca 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateStart.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateStart.java @@ -21,21 +21,21 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.querybuilder.SchemaBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateAggregateStart { /** * Adds IF NOT EXISTS to the create aggregate specification. This indicates that the aggregate * should not be created if it already exists. */ - @NonNull + @Nonnull CreateAggregateStart ifNotExists(); /** * Adds OR REPLACE to the create aggregate specification. This indicates that the aggregate should * replace an existing aggregate with the same name if it exists. */ - @NonNull + @Nonnull CreateAggregateStart orReplace(); /** @@ -46,16 +46,16 @@ public interface CreateAggregateStart { *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull - CreateAggregateStart withParameter(@NonNull DataType paramType); + @Nonnull + CreateAggregateStart withParameter(@Nonnull DataType paramType); /** Adds SFUNC to the create aggregate specification. This is the state function for each row. */ - @NonNull - CreateAggregateStateFunc withSFunc(@NonNull CqlIdentifier sfuncName); + @Nonnull + CreateAggregateStateFunc withSFunc(@Nonnull CqlIdentifier sfuncName); /** Shortcut for {@link #withSFunc(CqlIdentifier) withSFunc(CqlIdentifier.fromCql(sfuncName))}. */ - @NonNull - default CreateAggregateStateFunc withSFunc(@NonNull String sfuncName) { + @Nonnull + default CreateAggregateStateFunc withSFunc(@Nonnull String sfuncName) { return withSFunc(CqlIdentifier.fromCql(sfuncName)); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateStateFunc.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateStateFunc.java index 42b774ec8fc..02a619ca9b4 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateStateFunc.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateAggregateStateFunc.java @@ -21,7 +21,7 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.querybuilder.SchemaBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateAggregateStateFunc { @@ -32,6 +32,6 @@ public interface CreateAggregateStateFunc { *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull - CreateAggregateEnd withSType(@NonNull DataType dataType); + @Nonnull + CreateAggregateEnd withSType(@Nonnull DataType dataType); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionStart.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionStart.java index 17ae78d4b24..c4c45a17462 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionStart.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionStart.java @@ -21,7 +21,7 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.querybuilder.SchemaBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateFunctionStart { @@ -29,14 +29,14 @@ public interface CreateFunctionStart { * Adds IF NOT EXISTS to the create function specification. This indicates that the function * should not be created if it already exists. */ - @NonNull + @Nonnull CreateFunctionStart ifNotExists(); /** * Adds OR REPLACE to the create function specification. This indicates that the function should * replace an existing function with the same name if it exists. */ - @NonNull + @Nonnull CreateFunctionStart orReplace(); /** @@ -47,16 +47,16 @@ public interface CreateFunctionStart { *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull - CreateFunctionStart withParameter(@NonNull CqlIdentifier paramName, @NonNull DataType paramType); + @Nonnull + CreateFunctionStart withParameter(@Nonnull CqlIdentifier paramName, @Nonnull DataType paramType); /** * Shortcut for {@link #withParameter(CqlIdentifier, DataType) * withParameter(CqlIdentifier.asCql(paramName), dataType)}. */ - @NonNull + @Nonnull default CreateFunctionStart withParameter( - @NonNull String paramName, @NonNull DataType paramType) { + @Nonnull String paramName, @Nonnull DataType paramType) { return withParameter(CqlIdentifier.fromCql(paramName), paramType); } @@ -64,13 +64,13 @@ default CreateFunctionStart withParameter( * Adds RETURNS NULL ON NULL to the create function specification. This indicates that the body of * the function should be skipped when null input is provided. */ - @NonNull + @Nonnull CreateFunctionWithNullOption returnsNullOnNull(); /** * Adds CALLED ON NULL to the create function specification. This indicates that the body of the * function not be skipped when null input is provided. */ - @NonNull + @Nonnull CreateFunctionWithNullOption calledOnNull(); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionWithLanguage.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionWithLanguage.java index bc55fd5124a..a729cc03125 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionWithLanguage.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionWithLanguage.java @@ -17,7 +17,7 @@ */ package com.datastax.oss.driver.api.querybuilder.schema; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateFunctionWithLanguage { @@ -29,8 +29,8 @@ public interface CreateFunctionWithLanguage { * postgres-style string literal, which is surrounded in two dollar signs, i.e. $$ myBody $$ * . */ - @NonNull - CreateFunctionEnd as(@NonNull String functionBody); + @Nonnull + CreateFunctionEnd as(@Nonnull String functionBody); /** * Adds AS to the create function specification and quotes the function body. Assumes that if the @@ -39,8 +39,8 @@ public interface CreateFunctionWithLanguage { * ' myBody '. If the function body is already quoted {@link #as(String)} should be used * instead. */ - @NonNull - default CreateFunctionEnd asQuoted(@NonNull String functionBody) { + @Nonnull + default CreateFunctionEnd asQuoted(@Nonnull String functionBody) { if (functionBody.contains("'")) { return as("$$ " + functionBody + " $$"); } else { diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionWithNullOption.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionWithNullOption.java index 037dd1cd522..14430e8311b 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionWithNullOption.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionWithNullOption.java @@ -21,7 +21,7 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.querybuilder.SchemaBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateFunctionWithNullOption { /** @@ -31,6 +31,6 @@ public interface CreateFunctionWithNullOption { *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull - CreateFunctionWithType returnsType(@NonNull DataType dataType); + @Nonnull + CreateFunctionWithType returnsType(@Nonnull DataType dataType); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionWithType.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionWithType.java index b78780bfa7c..a5b507c8d4e 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionWithType.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateFunctionWithType.java @@ -17,21 +17,21 @@ */ package com.datastax.oss.driver.api.querybuilder.schema; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateFunctionWithType { /** * Adds LANGUAGE to the create function specification. This is used to specify what language is * used in the function body. */ - @NonNull - CreateFunctionWithLanguage withLanguage(@NonNull String language); + @Nonnull + CreateFunctionWithLanguage withLanguage(@Nonnull String language); /** * Adds "LANGUAGE java" to create function specification. Shortcut for {@link * #withLanguage(String) withLanguage("java")}. */ - @NonNull + @Nonnull default CreateFunctionWithLanguage withJavaLanguage() { return withLanguage("java"); } @@ -40,7 +40,7 @@ default CreateFunctionWithLanguage withJavaLanguage() { * Adds "LANGUAGE javascript" to create function specification. Shortcut for {@link * #withLanguage(String) withLanguage("javascript")}. */ - @NonNull + @Nonnull default CreateFunctionWithLanguage withJavaScriptLanguage() { return withLanguage("javascript"); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateIndex.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateIndex.java index ed54fd2312f..f14e2be1e62 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateIndex.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateIndex.java @@ -18,8 +18,8 @@ package com.datastax.oss.driver.api.querybuilder.schema; import com.datastax.oss.driver.api.querybuilder.BuildableQuery; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.Nonnull; public interface CreateIndex extends OptionProvider, BuildableQuery { @@ -28,8 +28,8 @@ public interface CreateIndex extends OptionProvider, BuildableQuery * specific options that are provided under the index 'OPTIONS' property. Is equivalent to {@link * #withOption(String, Object) withOption("OPTIONS", sasiOptions)}. */ - @NonNull - default CreateIndex withSASIOptions(@NonNull Map sasiOptions) { + @Nonnull + default CreateIndex withSASIOptions(@Nonnull Map sasiOptions) { return withOption("OPTIONS", sasiOptions); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateIndexOnTable.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateIndexOnTable.java index 62c930d4180..155fb7ecff4 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateIndexOnTable.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateIndexOnTable.java @@ -18,20 +18,20 @@ package com.datastax.oss.driver.api.querybuilder.schema; import com.datastax.oss.driver.api.core.CqlIdentifier; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public interface CreateIndexOnTable { /** Specifies the column to create the index on. */ - @NonNull - default CreateIndex andColumn(@NonNull CqlIdentifier columnName) { + @Nonnull + default CreateIndex andColumn(@Nonnull CqlIdentifier columnName) { return andColumn(columnName, null); } /** Shortcut for {@link #andColumn(CqlIdentifier) andColumn(CqlIdentifier.fromCql(columnName)}. */ - @NonNull - default CreateIndex andColumn(@NonNull String columnName) { + @Nonnull + default CreateIndex andColumn(@Nonnull String columnName) { return andColumn(CqlIdentifier.fromCql(columnName)); } @@ -39,8 +39,8 @@ default CreateIndex andColumn(@NonNull String columnName) { * Specifies to create the index on the given columns' keys, this must be done against a map * column. */ - @NonNull - default CreateIndex andColumnKeys(@NonNull CqlIdentifier columnName) { + @Nonnull + default CreateIndex andColumnKeys(@Nonnull CqlIdentifier columnName) { return andColumn(columnName, "KEYS"); } @@ -48,8 +48,8 @@ default CreateIndex andColumnKeys(@NonNull CqlIdentifier columnName) { * Shortcut for {@link #andColumnKeys(CqlIdentifier) * andColumnKeys(CqlIdentifier.fromCql(columnName)}. */ - @NonNull - default CreateIndex andColumnKeys(@NonNull String columnName) { + @Nonnull + default CreateIndex andColumnKeys(@Nonnull String columnName) { return andColumnKeys(CqlIdentifier.fromCql(columnName)); } @@ -57,8 +57,8 @@ default CreateIndex andColumnKeys(@NonNull String columnName) { * Specifies to create the index on the given columns' values, this must be done against a * map column. */ - @NonNull - default CreateIndex andColumnValues(@NonNull CqlIdentifier columnName) { + @Nonnull + default CreateIndex andColumnValues(@Nonnull CqlIdentifier columnName) { return andColumn(columnName, "VALUES"); } @@ -66,8 +66,8 @@ default CreateIndex andColumnValues(@NonNull CqlIdentifier columnName) { * Shortcut for {@link #andColumnValues(CqlIdentifier) * andColumnValues(CqlIdentifier.fromCql(columnName)}. */ - @NonNull - default CreateIndex andColumnValues(@NonNull String columnName) { + @Nonnull + default CreateIndex andColumnValues(@Nonnull String columnName) { return andColumnValues(CqlIdentifier.fromCql(columnName)); } @@ -75,8 +75,8 @@ default CreateIndex andColumnValues(@NonNull String columnName) { * Specifies to create the index on the given columns' entries (key-value pairs), this must be * done against a map column. */ - @NonNull - default CreateIndex andColumnEntries(@NonNull CqlIdentifier columnName) { + @Nonnull + default CreateIndex andColumnEntries(@Nonnull CqlIdentifier columnName) { return andColumn(columnName, "ENTRIES"); } @@ -84,8 +84,8 @@ default CreateIndex andColumnEntries(@NonNull CqlIdentifier columnName) { * Shortcut for {@link #andColumnEntries(CqlIdentifier) * andColumnEntries(CqlIdentifier.fromCql(columnName)}. */ - @NonNull - default CreateIndex andColumnEntries(@NonNull String columnName) { + @Nonnull + default CreateIndex andColumnEntries(@Nonnull String columnName) { return andColumnEntries(CqlIdentifier.fromCql(columnName)); } @@ -93,8 +93,8 @@ default CreateIndex andColumnEntries(@NonNull String columnName) { * Specifies to create the index on the given columns' entire value, this must be done against a * frozen collection column. */ - @NonNull - default CreateIndex andColumnFull(@NonNull CqlIdentifier columnName) { + @Nonnull + default CreateIndex andColumnFull(@Nonnull CqlIdentifier columnName) { return andColumn(columnName, "FULL"); } @@ -102,8 +102,8 @@ default CreateIndex andColumnFull(@NonNull CqlIdentifier columnName) { * Shortcut for {@link #andColumnFull(CqlIdentifier) * andColumnFull(CqlIdentifier.fromCql(columnName)}. */ - @NonNull - default CreateIndex andColumnFull(@NonNull String columnName) { + @Nonnull + default CreateIndex andColumnFull(@Nonnull String columnName) { return andColumnFull(CqlIdentifier.fromCql(columnName)); } @@ -112,15 +112,15 @@ default CreateIndex andColumnFull(@NonNull String columnName) { * not be used in the general case, unless there is an additional index type to use beyond KEYS, * VALUES, ENTRIES, or FULL. */ - @NonNull - CreateIndex andColumn(@NonNull CqlIdentifier columnName, @Nullable String indexType); + @Nonnull + CreateIndex andColumn(@Nonnull CqlIdentifier columnName, @Nullable String indexType); /** * Shortcut for {@link #andColumn(CqlIdentifier,String) * andColumn(CqlIdentifier.fromCql(columnName),indexType}. */ - @NonNull - default CreateIndex andColumn(@NonNull String columnName, @NonNull String indexType) { + @Nonnull + default CreateIndex andColumn(@Nonnull String columnName, @Nonnull String indexType) { return andColumn(CqlIdentifier.fromCql(columnName), indexType); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateIndexStart.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateIndexStart.java index 3786b8346b6..65216855dbb 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateIndexStart.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateIndexStart.java @@ -18,9 +18,9 @@ package com.datastax.oss.driver.api.querybuilder.schema; import com.datastax.oss.driver.api.core.CqlIdentifier; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public interface CreateIndexStart { @@ -28,15 +28,15 @@ public interface CreateIndexStart { * Adds IF NOT EXISTS to the create index specification. This indicates that the index should not * be created if it already exists. */ - @NonNull + @Nonnull CreateIndexStart ifNotExists(); /** * Adds CUSTOM specification to the index for the given class name. The class name will added to * the end of the CREATE INDEX specification with USING 'classname'. */ - @NonNull - CreateIndexStart custom(@NonNull String className); + @Nonnull + CreateIndexStart custom(@Nonnull String className); /** * Declares that the index is a "SSTable Attached Secondary Index" (SASI) type index. This is a @@ -44,21 +44,21 @@ public interface CreateIndexStart { * * @see CreateIndex#withSASIOptions(Map) */ - @NonNull + @Nonnull default CreateIndexStart usingSASI() { return custom("org.apache.cassandra.index.sasi.SASIIndex"); } /** Indicates which table this index is on. */ - @NonNull - CreateIndexOnTable onTable(@Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier table); + @Nonnull + CreateIndexOnTable onTable(@Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier table); /** * Indicates which table this index is on. This assumes the keyspace name is already qualified for * the Session or Statement. */ - @NonNull - default CreateIndexOnTable onTable(@NonNull CqlIdentifier table) { + @Nonnull + default CreateIndexOnTable onTable(@Nonnull CqlIdentifier table) { return onTable(null, table); } @@ -66,15 +66,15 @@ default CreateIndexOnTable onTable(@NonNull CqlIdentifier table) { * Shortcut for {@link #onTable(CqlIdentifier,CqlIdentifier) * onTable(CqlIdentifier.fromCql(keyspace),CqlIdentifier.fromCql(table))}. */ - @NonNull - default CreateIndexOnTable onTable(@Nullable String keyspace, @NonNull String table) { + @Nonnull + default CreateIndexOnTable onTable(@Nullable String keyspace, @Nonnull String table) { return onTable( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(table)); } /** Shortcut for {@link #onTable(CqlIdentifier) onTable(CqlIdentifier.fromCql(table))}. */ - @NonNull - default CreateIndexOnTable onTable(@NonNull String table) { + @Nonnull + default CreateIndexOnTable onTable(@Nonnull String table) { return onTable(CqlIdentifier.fromCql(table)); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateKeyspaceStart.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateKeyspaceStart.java index 57abf5f35bc..9cddf57ba55 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateKeyspaceStart.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateKeyspaceStart.java @@ -17,13 +17,13 @@ */ package com.datastax.oss.driver.api.querybuilder.schema; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateKeyspaceStart extends KeyspaceReplicationOptions { /** * Adds IF NOT EXISTS to the create keyspace specification. This indicates that the keyspace * should not be created it already exists. */ - @NonNull + @Nonnull CreateKeyspaceStart ifNotExists(); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateMaterializedViewPrimaryKey.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateMaterializedViewPrimaryKey.java index 14b8c7583f6..ae11e3e0ac0 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateMaterializedViewPrimaryKey.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateMaterializedViewPrimaryKey.java @@ -19,7 +19,7 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.querybuilder.BuildableQuery; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateMaterializedViewPrimaryKey extends CreateMaterializedViewPrimaryKeyStart, @@ -30,15 +30,15 @@ public interface CreateMaterializedViewPrimaryKey * *

    Clustering columns are added in the order of their declaration. */ - @NonNull - CreateMaterializedViewPrimaryKey withClusteringColumn(@NonNull CqlIdentifier columnName); + @Nonnull + CreateMaterializedViewPrimaryKey withClusteringColumn(@Nonnull CqlIdentifier columnName); /** * Shortcut for {@link #withClusteringColumn(CqlIdentifier) * withClusteringColumn(CqlIdentifier.asCql(columnName)}. */ - @NonNull - default CreateMaterializedViewPrimaryKey withClusteringColumn(@NonNull String columnName) { + @Nonnull + default CreateMaterializedViewPrimaryKey withClusteringColumn(@Nonnull String columnName) { return withClusteringColumn(CqlIdentifier.fromCql(columnName)); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateMaterializedViewPrimaryKeyStart.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateMaterializedViewPrimaryKeyStart.java index c214c01f6d1..1b4e0460c1f 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateMaterializedViewPrimaryKeyStart.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateMaterializedViewPrimaryKeyStart.java @@ -18,7 +18,7 @@ package com.datastax.oss.driver.api.querybuilder.schema; import com.datastax.oss.driver.api.core.CqlIdentifier; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateMaterializedViewPrimaryKeyStart { @@ -27,15 +27,15 @@ public interface CreateMaterializedViewPrimaryKeyStart { * *

    Partition keys are added in the order of their declaration. */ - @NonNull - CreateMaterializedViewPrimaryKey withPartitionKey(@NonNull CqlIdentifier columnName); + @Nonnull + CreateMaterializedViewPrimaryKey withPartitionKey(@Nonnull CqlIdentifier columnName); /** * Shortcut for {@link #withPartitionKey(CqlIdentifier) * withPartitionKey(CqlIdentifier.asCql(columnName)}. */ - @NonNull - default CreateMaterializedViewPrimaryKey withPartitionKey(@NonNull String columnName) { + @Nonnull + default CreateMaterializedViewPrimaryKey withPartitionKey(@Nonnull String columnName) { return withPartitionKey(CqlIdentifier.fromCql(columnName)); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateMaterializedViewSelection.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateMaterializedViewSelection.java index 28f141f5017..1dff9757d98 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateMaterializedViewSelection.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateMaterializedViewSelection.java @@ -19,22 +19,22 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.internal.core.CqlIdentifiers; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Arrays; +import javax.annotation.Nonnull; public interface CreateMaterializedViewSelection { /** Selects all columns from the base table. */ - @NonNull + @Nonnull CreateMaterializedViewWhereStart all(); /** Selects a particular column by its CQL identifier. */ - @NonNull - CreateMaterializedViewSelectionWithColumns column(@NonNull CqlIdentifier columnName); + @Nonnull + CreateMaterializedViewSelectionWithColumns column(@Nonnull CqlIdentifier columnName); /** Shortcut for {@link #column(CqlIdentifier) column(CqlIdentifier.fromCql(columnName))} */ - @NonNull - default CreateMaterializedViewSelectionWithColumns column(@NonNull String columnName) { + @Nonnull + default CreateMaterializedViewSelectionWithColumns column(@Nonnull String columnName) { return column(CqlIdentifier.fromCql(columnName)); } @@ -43,12 +43,12 @@ default CreateMaterializedViewSelectionWithColumns column(@NonNull String column * *

    This is the same as calling {@link #column(CqlIdentifier)} for each element. */ - @NonNull - CreateMaterializedViewSelectionWithColumns columnsIds(@NonNull Iterable columnIds); + @Nonnull + CreateMaterializedViewSelectionWithColumns columnsIds(@Nonnull Iterable columnIds); /** Var-arg equivalent of {@link #columnsIds(Iterable)}. */ - @NonNull - default CreateMaterializedViewSelectionWithColumns columns(@NonNull CqlIdentifier... columnIds) { + @Nonnull + default CreateMaterializedViewSelectionWithColumns columns(@Nonnull CqlIdentifier... columnIds) { return columnsIds(Arrays.asList(columnIds)); } @@ -57,15 +57,15 @@ default CreateMaterializedViewSelectionWithColumns columns(@NonNull CqlIdentifie * *

    This is the same as calling {@link #column(String)} for each element. */ - @NonNull + @Nonnull default CreateMaterializedViewSelectionWithColumns columns( - @NonNull Iterable columnNames) { + @Nonnull Iterable columnNames) { return columnsIds(CqlIdentifiers.wrap(columnNames)); } /** Var-arg equivalent of {@link #columns(Iterable)}. */ - @NonNull - default CreateMaterializedViewSelectionWithColumns columns(@NonNull String... columnNames) { + @Nonnull + default CreateMaterializedViewSelectionWithColumns columns(@Nonnull String... columnNames) { return columns(Arrays.asList(columnNames)); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateMaterializedViewStart.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateMaterializedViewStart.java index 1926d6ce83c..dcd4af9d3a7 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateMaterializedViewStart.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateMaterializedViewStart.java @@ -18,8 +18,8 @@ package com.datastax.oss.driver.api.querybuilder.schema; import com.datastax.oss.driver.api.core.CqlIdentifier; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; public interface CreateMaterializedViewStart { @@ -27,36 +27,36 @@ public interface CreateMaterializedViewStart { * Adds IF NOT EXISTS to the create table specification. This indicates that the table should not * be created if it already exists. */ - @NonNull + @Nonnull CreateMaterializedViewStart ifNotExists(); /** * Specifies the base table for the materialized view. This assumes the keyspace name is already * qualified for the Session or Statement. */ - @NonNull - CreateMaterializedViewSelection asSelectFrom(@NonNull CqlIdentifier table); + @Nonnull + CreateMaterializedViewSelection asSelectFrom(@Nonnull CqlIdentifier table); /** * Shortcut for {@link #asSelectFrom(CqlIdentifier) asSelectFrom(CqlIdentifier.fromCql(table)}. */ - @NonNull - default CreateMaterializedViewSelection asSelectFrom(@NonNull String table) { + @Nonnull + default CreateMaterializedViewSelection asSelectFrom(@Nonnull String table) { return asSelectFrom(CqlIdentifier.fromCql(table)); } /** Specifies the base table for the materialized view. */ - @NonNull + @Nonnull CreateMaterializedViewSelection asSelectFrom( - @Nullable CqlIdentifier keyspace, @NonNull CqlIdentifier table); + @Nullable CqlIdentifier keyspace, @Nonnull CqlIdentifier table); /** * Shortcut for {@link #asSelectFrom(CqlIdentifier,CqlIdentifier) * asSelectFrom(CqlIdentifier.fromCql(keyspace),CqlIdentifier.fromCql(table)}. */ - @NonNull + @Nonnull default CreateMaterializedViewSelection asSelectFrom( - @Nullable String keyspace, @NonNull String table) { + @Nullable String keyspace, @Nonnull String table) { return asSelectFrom( keyspace == null ? null : CqlIdentifier.fromCql(keyspace), CqlIdentifier.fromCql(table)); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTable.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTable.java index 08a6f85c424..67307bc3944 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTable.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTable.java @@ -22,7 +22,7 @@ import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.querybuilder.BuildableQuery; import com.datastax.oss.driver.api.querybuilder.SchemaBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateTable extends BuildableQuery, OngoingPartitionKey, CreateTableWithOptions { @@ -37,15 +37,15 @@ public interface CreateTable extends BuildableQuery, OngoingPartitionKey, Create *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull - CreateTable withClusteringColumn(@NonNull CqlIdentifier columnName, @NonNull DataType dataType); + @Nonnull + CreateTable withClusteringColumn(@Nonnull CqlIdentifier columnName, @Nonnull DataType dataType); /** * Shortcut for {@link #withClusteringColumn(CqlIdentifier, DataType) * withClusteringColumn(CqlIdentifier.asCql(columnName), dataType)}. */ - @NonNull - default CreateTable withClusteringColumn(@NonNull String columnName, @NonNull DataType dataType) { + @Nonnull + default CreateTable withClusteringColumn(@Nonnull String columnName, @Nonnull DataType dataType) { return withClusteringColumn(CqlIdentifier.fromCql(columnName), dataType); } @@ -55,15 +55,15 @@ default CreateTable withClusteringColumn(@NonNull String columnName, @NonNull Da *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull - CreateTable withColumn(@NonNull CqlIdentifier columnName, @NonNull DataType dataType); + @Nonnull + CreateTable withColumn(@Nonnull CqlIdentifier columnName, @Nonnull DataType dataType); /** * Shortcut for {@link #withColumn(CqlIdentifier, DataType) * withColumn(CqlIdentifier.asCql(columnName), dataType)}. */ - @NonNull - default CreateTable withColumn(@NonNull String columnName, @NonNull DataType dataType) { + @Nonnull + default CreateTable withColumn(@Nonnull String columnName, @Nonnull DataType dataType) { return withColumn(CqlIdentifier.fromCql(columnName), dataType); } @@ -76,15 +76,15 @@ default CreateTable withColumn(@NonNull String columnName, @NonNull DataType dat *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull - CreateTable withStaticColumn(@NonNull CqlIdentifier columnName, @NonNull DataType dataType); + @Nonnull + CreateTable withStaticColumn(@Nonnull CqlIdentifier columnName, @Nonnull DataType dataType); /** * Shortcut for {@link #withStaticColumn(CqlIdentifier, DataType) * withStaticColumn(CqlIdentifier.asCql(columnName), dataType)}. */ - @NonNull - default CreateTable withStaticColumn(@NonNull String columnName, @NonNull DataType dataType) { + @Nonnull + default CreateTable withStaticColumn(@Nonnull String columnName, @Nonnull DataType dataType) { return withStaticColumn(CqlIdentifier.fromCql(columnName), dataType); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTableStart.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTableStart.java index 82949bceb56..6ef67a68d1f 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTableStart.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTableStart.java @@ -17,7 +17,7 @@ */ package com.datastax.oss.driver.api.querybuilder.schema; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateTableStart extends OngoingPartitionKey { @@ -25,6 +25,6 @@ public interface CreateTableStart extends OngoingPartitionKey { * Adds IF NOT EXISTS to the create table specification. This indicates that the table should not * be created if it already exists. */ - @NonNull + @Nonnull CreateTableStart ifNotExists(); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTableWithOptions.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTableWithOptions.java index 4dd3193da15..6cd5ca945c0 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTableWithOptions.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTableWithOptions.java @@ -18,12 +18,12 @@ package com.datastax.oss.driver.api.querybuilder.schema; import com.datastax.oss.driver.api.querybuilder.BuildableQuery; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateTableWithOptions extends BuildableQuery, RelationStructure { /** Enables COMPACT STORAGE in the CREATE TABLE statement. */ - @NonNull + @Nonnull CreateTableWithOptions withCompactStorage(); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTypeStart.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTypeStart.java index ab19bd7ad84..02d23e08da8 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTypeStart.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTypeStart.java @@ -17,7 +17,7 @@ */ package com.datastax.oss.driver.api.querybuilder.schema; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface CreateTypeStart extends OngoingCreateType { @@ -25,6 +25,6 @@ public interface CreateTypeStart extends OngoingCreateType { * Adds IF NOT EXISTS to the create type specification. This indicates that the type should not be * created if it already exists. */ - @NonNull + @Nonnull CreateTypeStart ifNotExists(); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/Drop.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/Drop.java index 418f806395f..77ca105e5f6 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/Drop.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/Drop.java @@ -18,11 +18,11 @@ package com.datastax.oss.driver.api.querybuilder.schema; import com.datastax.oss.driver.api.querybuilder.BuildableQuery; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface Drop extends BuildableQuery { /** Adds 'IF EXISTS" to the drop specification. */ - @NonNull + @Nonnull Drop ifExists(); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/KeyspaceOptions.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/KeyspaceOptions.java index 16da0f13dd2..869e3c1a638 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/KeyspaceOptions.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/KeyspaceOptions.java @@ -17,8 +17,8 @@ */ package com.datastax.oss.driver.api.querybuilder.schema; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.CheckReturnValue; +import javax.annotation.Nonnull; public interface KeyspaceOptions> extends OptionProvider { @@ -27,7 +27,7 @@ public interface KeyspaceOptions> * Adjusts durable writes configuration for this keyspace. If set to false, data written to the * keyspace will bypass the commit log. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT withDurableWrites(boolean durableWrites) { return withOption("durable_writes", durableWrites); diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/KeyspaceReplicationOptions.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/KeyspaceReplicationOptions.java index 95113cf987f..9eff6fc2731 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/KeyspaceReplicationOptions.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/KeyspaceReplicationOptions.java @@ -18,8 +18,8 @@ package com.datastax.oss.driver.api.querybuilder.schema; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.Nonnull; public interface KeyspaceReplicationOptions { /** @@ -28,7 +28,7 @@ public interface KeyspaceReplicationOptions { *

    Note that using this will overwrite any previous use of this method or {@link * #withNetworkTopologyStrategy(Map)}. */ - @NonNull + @Nonnull default TargetT withSimpleStrategy(int replicationFactor) { ImmutableMap replication = ImmutableMap.builder() @@ -49,8 +49,8 @@ default TargetT withSimpleStrategy(int replicationFactor) { * @param replications Mapping of data center name to replication factor to use for that data * center. */ - @NonNull - default TargetT withNetworkTopologyStrategy(@NonNull Map replications) { + @Nonnull + default TargetT withNetworkTopologyStrategy(@Nonnull Map replications) { ImmutableMap.Builder replicationBuilder = ImmutableMap.builder().put("class", "NetworkTopologyStrategy"); @@ -66,6 +66,6 @@ default TargetT withNetworkTopologyStrategy(@NonNull Map replic * strategy, otherwise it is advisable to use {@link #withSimpleStrategy(int)} or {@link * #withNetworkTopologyStrategy(Map)}. */ - @NonNull - TargetT withReplicationOptions(@NonNull Map replicationOptions); + @Nonnull + TargetT withReplicationOptions(@Nonnull Map replicationOptions); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/OngoingCreateType.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/OngoingCreateType.java index 18409b349b9..620a1eec482 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/OngoingCreateType.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/OngoingCreateType.java @@ -21,7 +21,7 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.querybuilder.SchemaBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface OngoingCreateType { @@ -33,15 +33,15 @@ public interface OngoingCreateType { *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull - CreateType withField(@NonNull CqlIdentifier identifier, @NonNull DataType dataType); + @Nonnull + CreateType withField(@Nonnull CqlIdentifier identifier, @Nonnull DataType dataType); /** * Shortcut for {@link #withField(CqlIdentifier, DataType)} (CqlIdentifier, DataType) * withField(CqlIdentifier.asCql(columnName), dataType)}. */ - @NonNull - default CreateType withField(@NonNull String columnName, @NonNull DataType dataType) { + @Nonnull + default CreateType withField(@Nonnull String columnName, @Nonnull DataType dataType) { return withField(CqlIdentifier.fromCql(columnName), dataType); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/OngoingPartitionKey.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/OngoingPartitionKey.java index bf3f70f982a..89bf4c72879 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/OngoingPartitionKey.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/OngoingPartitionKey.java @@ -21,7 +21,7 @@ import com.datastax.oss.driver.api.core.type.DataType; import com.datastax.oss.driver.api.core.type.DataTypes; import com.datastax.oss.driver.api.querybuilder.SchemaBuilder; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.Nonnull; public interface OngoingPartitionKey { @@ -36,15 +36,15 @@ public interface OngoingPartitionKey { *

    To create the data type, use the constants and static methods in {@link DataTypes}, or * {@link SchemaBuilder#udt(CqlIdentifier, boolean)}. */ - @NonNull - CreateTable withPartitionKey(@NonNull CqlIdentifier columnName, @NonNull DataType dataType); + @Nonnull + CreateTable withPartitionKey(@Nonnull CqlIdentifier columnName, @Nonnull DataType dataType); /** * Shortcut for {@link #withPartitionKey(CqlIdentifier, DataType) * withPartitionKey(CqlIdentifier.asCql(columnName), dataType)}. */ - @NonNull - default CreateTable withPartitionKey(@NonNull String columnName, @NonNull DataType dataType) { + @Nonnull + default CreateTable withPartitionKey(@Nonnull String columnName, @Nonnull DataType dataType) { return withPartitionKey(CqlIdentifier.fromCql(columnName), dataType); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/OptionProvider.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/OptionProvider.java index 5a503ffa93a..8be1bbb3c82 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/OptionProvider.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/OptionProvider.java @@ -17,19 +17,19 @@ */ package com.datastax.oss.driver.api.querybuilder.schema; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.CheckReturnValue; +import javax.annotation.Nonnull; public interface OptionProvider> { /** * Adds a free-form option. This is useful for custom options or new options that have not yet * been added to this API. */ - @NonNull + @Nonnull @CheckReturnValue - SelfT withOption(@NonNull String name, @NonNull Object value); + SelfT withOption(@Nonnull String name, @Nonnull Object value); - @NonNull + @Nonnull Map getOptions(); } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/RelationOptions.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/RelationOptions.java index 022562def81..6faefef4db9 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/RelationOptions.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/RelationOptions.java @@ -22,8 +22,8 @@ import com.datastax.oss.driver.api.querybuilder.SchemaBuilder; import com.datastax.oss.driver.api.querybuilder.schema.compaction.CompactionStrategy; import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.CheckReturnValue; +import javax.annotation.Nonnull; public interface RelationOptions> extends OptionProvider { @@ -38,7 +38,7 @@ public interface RelationOptions> *

  • 0.1 for the leveled compaction strategy. * */ - @NonNull + @Nonnull @CheckReturnValue default SelfT withBloomFilterFpChance(double bloomFilterFpChance) { return withOption("bloom_filter_fp_chance", bloomFilterFpChance); @@ -52,7 +52,7 @@ default SelfT withBloomFilterFpChance(double bloomFilterFpChance) { * *

    If no call is made to this method, the default value set is {@code false}. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT withCDC(boolean enabled) { return withOption("cdc", enabled); @@ -67,9 +67,9 @@ default SelfT withCDC(boolean enabled) { * @param keys If true, caches all keys, otherwise none. * @param rowsPerPartition Whether to cache ALL, NONE or the first N rows per partition. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT withCaching(boolean keys, @NonNull RowsPerPartition rowsPerPartition) { + default SelfT withCaching(boolean keys, @Nonnull RowsPerPartition rowsPerPartition) { return withOption( "caching", ImmutableMap.of( @@ -77,9 +77,9 @@ default SelfT withCaching(boolean keys, @NonNull RowsPerPartition rowsPerPartiti } /** Defines documentation for this relation. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT withComment(@NonNull String comment) { + default SelfT withComment(@Nonnull String comment) { return withOption("comment", comment); } @@ -90,9 +90,9 @@ default SelfT withComment(@NonNull String comment) { * @see SchemaBuilder#leveledCompactionStrategy() * @see SchemaBuilder#timeWindowCompactionStrategy() */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT withCompaction(@NonNull CompactionStrategy compactionStrategy) { + default SelfT withCompaction(@Nonnull CompactionStrategy compactionStrategy) { return withOption("compaction", compactionStrategy.getOptions()); } @@ -102,7 +102,7 @@ default SelfT withCompaction(@NonNull CompactionStrategy compactionStrategy) * * @see #withCompression(String, int, double) */ - @NonNull + @Nonnull @CheckReturnValue default SelfT withLZ4Compression(int chunkLengthKB, double crcCheckChance) { return withCompression("LZ4Compressor", chunkLengthKB, crcCheckChance); @@ -114,7 +114,7 @@ default SelfT withLZ4Compression(int chunkLengthKB, double crcCheckChance) { * * @see #withCompression(String, int, double) */ - @NonNull + @Nonnull @CheckReturnValue default SelfT withLZ4Compression() { return withCompression("LZ4Compressor"); @@ -126,7 +126,7 @@ default SelfT withLZ4Compression() { * * @see #withCompression(String, int, double) */ - @NonNull + @Nonnull @CheckReturnValue default SelfT withSnappyCompression(int chunkLengthKB, double crcCheckChance) { return withCompression("SnappyCompressor", chunkLengthKB, crcCheckChance); @@ -138,7 +138,7 @@ default SelfT withSnappyCompression(int chunkLengthKB, double crcCheckChance) { * * @see #withCompression(String, int, double) */ - @NonNull + @Nonnull @CheckReturnValue default SelfT withSnappyCompression() { return withCompression("SnappyCompressor"); @@ -150,7 +150,7 @@ default SelfT withSnappyCompression() { * * @see #withCompression(String, int, double) */ - @NonNull + @Nonnull @CheckReturnValue default SelfT withDeflateCompression(int chunkLengthKB, double crcCheckChance) { return withCompression("DeflateCompressor", chunkLengthKB, crcCheckChance); @@ -162,7 +162,7 @@ default SelfT withDeflateCompression(int chunkLengthKB, double crcCheckChance) { * * @see #withCompression(String, int, double) */ - @NonNull + @Nonnull @CheckReturnValue default SelfT withDeflateCompression() { return withCompression("DeflateCompressor"); @@ -178,9 +178,9 @@ default SelfT withDeflateCompression() { * * @see #withCompression(String, int, double) */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT withCompression(@NonNull String compressionAlgorithmName) { + default SelfT withCompression(@Nonnull String compressionAlgorithmName) { return withOption("compression", ImmutableMap.of("class", compressionAlgorithmName)); } @@ -196,10 +196,10 @@ default SelfT withCompression(@NonNull String compressionAlgorithmName) { * @param crcCheckChance The probability (0.0 to 1.0) that checksum will be checked on each read. * Defaults to 1.0. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT withCompression( - @NonNull String compressionAlgorithmName, int chunkLengthKB, double crcCheckChance) { + @Nonnull String compressionAlgorithmName, int chunkLengthKB, double crcCheckChance) { return withOption( "compression", ImmutableMap.of( @@ -212,7 +212,7 @@ default SelfT withCompression( } /** Defines that compression should be disabled. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT withNoCompression() { return withOption("compression", ImmutableMap.of("sstable_compression", "")); @@ -227,7 +227,7 @@ default SelfT withNoCompression() { * @param dcLocalReadRepairChance the probability. * @return this {@code TableOptions} object. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT withDcLocalReadRepairChance(double dcLocalReadRepairChance) { return withOption("dclocal_read_repair_chance", dcLocalReadRepairChance); @@ -238,7 +238,7 @@ default SelfT withDcLocalReadRepairChance(double dcLocalReadRepairChance) { * *

    If no call is made to this method, the default value is 0 (no TTL). */ - @NonNull + @Nonnull @CheckReturnValue default SelfT withDefaultTimeToLiveSeconds(int ttl) { return withOption("default_time_to_live", ttl); @@ -253,7 +253,7 @@ default SelfT withDefaultTimeToLiveSeconds(int ttl) { * *

    If no call is made to this method, the default value set is 864000 secs (10 days). */ - @NonNull + @Nonnull @CheckReturnValue default SelfT withGcGraceSeconds(int gcGraceSeconds) { return withOption("gc_grace_seconds", gcGraceSeconds); @@ -266,7 +266,7 @@ default SelfT withGcGraceSeconds(int gcGraceSeconds) { * *

    If no call is made to this method, the default value is 0 (unset). */ - @NonNull + @Nonnull @CheckReturnValue default SelfT withMemtableFlushPeriodInMs(int memtableFlushPeriodInMs) { return withOption("memtable_flush_period_in_ms", memtableFlushPeriodInMs); @@ -279,7 +279,7 @@ default SelfT withMemtableFlushPeriodInMs(int memtableFlushPeriodInMs) { * *

    If no call is made to this method, the default value set is 128. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT withMinIndexInterval(int min) { return withOption("min_index_interval", min); @@ -292,7 +292,7 @@ default SelfT withMinIndexInterval(int min) { * * @see #withMinIndexInterval(int) */ - @NonNull + @Nonnull @CheckReturnValue default SelfT withMaxIndexInterval(int max) { return withOption("max_index_interval", max); @@ -304,7 +304,7 @@ default SelfT withMaxIndexInterval(int max) { * *

    If no call is made to this method, the default value set is 0.1. */ - @NonNull + @Nonnull @CheckReturnValue default SelfT withReadRepairChance(double readRepairChance) { return withOption("read_repair_chance", readRepairChance); @@ -331,9 +331,9 @@ default SelfT withReadRepairChance(double readRepairChance) { * *

    If no call is made to this method, the default value set is {@code 99percentile}. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT withSpeculativeRetry(@NonNull String speculativeRetry) { + default SelfT withSpeculativeRetry(@Nonnull String speculativeRetry) { return withOption("speculative_retry", speculativeRetry); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/RelationStructure.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/RelationStructure.java index 3716cd03256..f2e759b2a2e 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/RelationStructure.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/RelationStructure.java @@ -20,9 +20,9 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder; import com.datastax.oss.driver.internal.core.CqlIdentifiers; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Map; +import javax.annotation.CheckReturnValue; +import javax.annotation.Nonnull; public interface RelationStructure> extends RelationOptions { @@ -34,9 +34,9 @@ public interface RelationStructure> * defined for a given identifier, it will be removed and the new ordering will appear in its * position in the provided map. */ - @NonNull + @Nonnull @CheckReturnValue - SelfT withClusteringOrderByIds(@NonNull Map orderings); + SelfT withClusteringOrderByIds(@Nonnull Map orderings); /** * Shortcut for {@link #withClusteringOrderByIds(Map)} with the columns specified as @@ -45,9 +45,9 @@ public interface RelationStructure> *

    Note that it's possible for two different case-sensitive names to resolve to the same * identifier, for example "foo" and "Foo"; if this happens, a runtime exception will be thrown. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT withClusteringOrder(@NonNull Map orderings) { + default SelfT withClusteringOrder(@Nonnull Map orderings) { return withClusteringOrderByIds(CqlIdentifiers.wrapKeys(orderings)); } @@ -57,17 +57,17 @@ default SelfT withClusteringOrder(@NonNull Map ordering *

    If clustering order was already defined for this identifier, it will be removed and the new * clause will be appended at the end of the current clustering order. */ - @NonNull + @Nonnull @CheckReturnValue - SelfT withClusteringOrder(@NonNull CqlIdentifier columnName, @NonNull ClusteringOrder order); + SelfT withClusteringOrder(@Nonnull CqlIdentifier columnName, @Nonnull ClusteringOrder order); /** * Shortcut for {@link #withClusteringOrder(CqlIdentifier, ClusteringOrder) * withClusteringOrder(CqlIdentifier.fromCql(columnName), order)}. */ - @NonNull + @Nonnull @CheckReturnValue - default SelfT withClusteringOrder(@NonNull String columnName, @NonNull ClusteringOrder order) { + default SelfT withClusteringOrder(@Nonnull String columnName, @Nonnull ClusteringOrder order) { return withClusteringOrder(CqlIdentifier.fromCql(columnName), order); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/compaction/CompactionStrategy.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/compaction/CompactionStrategy.java index 922f596b603..0b0660b69c5 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/compaction/CompactionStrategy.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/compaction/CompactionStrategy.java @@ -18,31 +18,31 @@ package com.datastax.oss.driver.api.querybuilder.schema.compaction; import com.datastax.oss.driver.api.querybuilder.schema.OptionProvider; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.CheckReturnValue; +import javax.annotation.Nonnull; public interface CompactionStrategy> extends OptionProvider { - @NonNull + @Nonnull @CheckReturnValue default SelfT withEnabled(boolean enabled) { return withOption("enabled", enabled); } - @NonNull + @Nonnull @CheckReturnValue default SelfT withTombstoneCompactionIntervalInSeconds(int seconds) { return withOption("tombstone_compaction_interval", seconds); } - @NonNull + @Nonnull @CheckReturnValue default SelfT withTombstoneThreshold(double threshold) { return withOption("tombstone_threshold", threshold); } - @NonNull + @Nonnull @CheckReturnValue default SelfT withUncheckedTombstoneCompaction(boolean enabled) { return withOption("unchecked_tombstone_compaction", enabled); diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/compaction/LeveledCompactionStrategy.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/compaction/LeveledCompactionStrategy.java index 5839a2155a9..9b5a762a2b3 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/compaction/LeveledCompactionStrategy.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/compaction/LeveledCompactionStrategy.java @@ -17,13 +17,13 @@ */ package com.datastax.oss.driver.api.querybuilder.schema.compaction; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.CheckReturnValue; +import javax.annotation.Nonnull; public interface LeveledCompactionStrategy> extends CompactionStrategy { - @NonNull + @Nonnull @CheckReturnValue default SelfT withSSTableSizeInMB(int ssTableSizeInMB) { return withOption("sstable_size_in_mb", ssTableSizeInMB); diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/compaction/SizeTieredCompactionStrategy.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/compaction/SizeTieredCompactionStrategy.java index b33f6d73744..0e93886998d 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/compaction/SizeTieredCompactionStrategy.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/compaction/SizeTieredCompactionStrategy.java @@ -17,50 +17,50 @@ */ package com.datastax.oss.driver.api.querybuilder.schema.compaction; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.CheckReturnValue; +import javax.annotation.Nonnull; public interface SizeTieredCompactionStrategy> extends CompactionStrategy { - @NonNull + @Nonnull @CheckReturnValue default SelfT withMaxThreshold(int maxThreshold) { return withOption("max_threshold", maxThreshold); } - @NonNull + @Nonnull @CheckReturnValue default SelfT withMinThreshold(int minThreshold) { return withOption("min_threshold", minThreshold); } - @NonNull + @Nonnull @CheckReturnValue default SelfT withMinSSTableSizeInBytes(long bytes) { return withOption("min_sstable_size", bytes); } - @NonNull + @Nonnull @CheckReturnValue default SelfT withOnlyPurgeRepairedTombstones(boolean enabled) { return withOption("only_purge_repaired_tombstones", enabled); } - @NonNull + @Nonnull @CheckReturnValue default SelfT withBucketHigh(double bucketHigh) { return withOption("bucket_high", bucketHigh); } - @NonNull + @Nonnull @CheckReturnValue default SelfT withBucketLow(double bucketHigh) { return withOption("bucket_low", bucketHigh); } // 2.1 only - @NonNull + @Nonnull @CheckReturnValue default SelfT withColdReadsToOmit(double ratio) { return withOption("cold_reads_to_omit", ratio); diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/compaction/TimeWindowCompactionStrategy.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/compaction/TimeWindowCompactionStrategy.java index a6a1a129da5..c3e26e512e1 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/compaction/TimeWindowCompactionStrategy.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/schema/compaction/TimeWindowCompactionStrategy.java @@ -17,8 +17,8 @@ */ package com.datastax.oss.driver.api.querybuilder.schema.compaction; -import edu.umd.cs.findbugs.annotations.CheckReturnValue; -import edu.umd.cs.findbugs.annotations.NonNull; +import javax.annotation.CheckReturnValue; +import javax.annotation.Nonnull; public interface TimeWindowCompactionStrategy> extends CompactionStrategy, SizeTieredCompactionStrategy { @@ -34,22 +34,22 @@ enum TimestampResolution { MILLISECONDS } - @NonNull + @Nonnull @CheckReturnValue - default SelfT withCompactionWindow(long size, @NonNull CompactionWindowUnit unit) { + default SelfT withCompactionWindow(long size, @Nonnull CompactionWindowUnit unit) { return withOption("compaction_window_size", size) .withOption("compaction_window_unit", unit.toString()); } - @NonNull + @Nonnull @CheckReturnValue default SelfT withUnsafeAggressiveSSTableExpiration(boolean enabled) { return withOption("unsafe_aggressive_sstable_expiration", enabled); } - @NonNull + @Nonnull @CheckReturnValue - default SelfT withTimestampResolution(@NonNull TimestampResolution timestampResolution) { + default SelfT withTimestampResolution(@Nonnull TimestampResolution timestampResolution) { return withOption("timestamp_resolution", timestampResolution.toString()); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/OngoingSelection.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/OngoingSelection.java index dcf59daf06f..5bcca9a4ce6 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/OngoingSelection.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/OngoingSelection.java @@ -27,10 +27,10 @@ import com.datastax.oss.driver.api.querybuilder.QueryBuilder; import com.datastax.oss.driver.api.querybuilder.term.Term; import com.datastax.oss.driver.shaded.guava.common.collect.Iterables; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Arrays; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A SELECT query that accepts additional selectors (that is, elements in the SELECT clause to @@ -49,8 +49,8 @@ public interface OngoingSelection { *

    If you add multiple selectors as once, consider {@link #selectors(Iterable)} as a more * efficient alternative. */ - @NonNull - Select selector(@NonNull Selector selector); + @Nonnull + Select selector(@Nonnull Selector selector); /** * Adds multiple selectors at once. @@ -65,12 +65,12 @@ public interface OngoingSelection { * can only be used on its own). * @see #selector(Selector) */ - @NonNull - Select selectors(@NonNull Iterable additionalSelectors); + @Nonnull + Select selectors(@Nonnull Iterable additionalSelectors); /** Var-arg equivalent of {@link #selectors(Iterable)}. */ - @NonNull - default Select selectors(@NonNull Selector... additionalSelectors) { + @Nonnull + default Select selectors(@Nonnull Selector... additionalSelectors) { return selectors(Arrays.asList(additionalSelectors)); } @@ -84,7 +84,7 @@ default Select selectors(@NonNull Selector... additionalSelectors) { * * @see Selector#all() */ - @NonNull + @Nonnull default Select all() { return selector(Selector.all()); } @@ -96,7 +96,7 @@ default Select all() { * * @see Selector#countAll() */ - @NonNull + @Nonnull default Select countAll() { return selector(Selector.countAll()); } @@ -108,14 +108,14 @@ default Select countAll() { * * @see Selector#column(CqlIdentifier) */ - @NonNull - default Select column(@NonNull CqlIdentifier columnId) { + @Nonnull + default Select column(@Nonnull CqlIdentifier columnId) { return selector(Selector.column(columnId)); } /** Shortcut for {@link #column(CqlIdentifier) column(CqlIdentifier.fromCql(columnName))} */ - @NonNull - default Select column(@NonNull String columnName) { + @Nonnull + default Select column(@Nonnull String columnName) { return column(CqlIdentifier.fromCql(columnName)); } @@ -124,14 +124,14 @@ default Select column(@NonNull String columnName) { * *

    This is the same as calling {@link #column(CqlIdentifier)} for each element. */ - @NonNull - default Select columnsIds(@NonNull Iterable columnIds) { + @Nonnull + default Select columnsIds(@Nonnull Iterable columnIds) { return selectors(Iterables.transform(columnIds, Selector::column)); } /** Var-arg equivalent of {@link #columnsIds(Iterable)}. */ - @NonNull - default Select columns(@NonNull CqlIdentifier... columnIds) { + @Nonnull + default Select columns(@Nonnull CqlIdentifier... columnIds) { return columnsIds(Arrays.asList(columnIds)); } @@ -140,14 +140,14 @@ default Select columns(@NonNull CqlIdentifier... columnIds) { * *

    This is the same as calling {@link #column(String)} for each element. */ - @NonNull - default Select columns(@NonNull Iterable columnNames) { + @Nonnull + default Select columns(@Nonnull Iterable columnNames) { return selectors(Iterables.transform(columnNames, Selector::column)); } /** Var-arg equivalent of {@link #columns(Iterable)}. */ - @NonNull - default Select columns(@NonNull String... columnNames) { + @Nonnull + default Select columns(@Nonnull String... columnNames) { return columns(Arrays.asList(columnNames)); } @@ -160,8 +160,8 @@ default Select columns(@NonNull String... columnNames) { * * @see Selector#add(Selector, Selector) */ - @NonNull - default Select add(@NonNull Selector left, @NonNull Selector right) { + @Nonnull + default Select add(@Nonnull Selector left, @Nonnull Selector right) { return selector(Selector.add(left, right)); } @@ -174,8 +174,8 @@ default Select add(@NonNull Selector left, @NonNull Selector right) { * * @see Selector#subtract(Selector, Selector) */ - @NonNull - default Select subtract(@NonNull Selector left, @NonNull Selector right) { + @Nonnull + default Select subtract(@Nonnull Selector left, @Nonnull Selector right) { return selector(Selector.subtract(left, right)); } @@ -191,8 +191,8 @@ default Select subtract(@NonNull Selector left, @NonNull Selector right) { * * @see Selector#multiply(Selector, Selector) */ - @NonNull - default Select multiply(@NonNull Selector left, @NonNull Selector right) { + @Nonnull + default Select multiply(@Nonnull Selector left, @Nonnull Selector right) { return selector(Selector.multiply(left, right)); } @@ -208,8 +208,8 @@ default Select multiply(@NonNull Selector left, @NonNull Selector right) { * * @see Selector#divide(Selector, Selector) */ - @NonNull - default Select divide(@NonNull Selector left, @NonNull Selector right) { + @Nonnull + default Select divide(@Nonnull Selector left, @Nonnull Selector right) { return selector(Selector.divide(left, right)); } @@ -226,8 +226,8 @@ default Select divide(@NonNull Selector left, @NonNull Selector right) { * * @see Selector#remainder(Selector, Selector) */ - @NonNull - default Select remainder(@NonNull Selector left, @NonNull Selector right) { + @Nonnull + default Select remainder(@Nonnull Selector left, @Nonnull Selector right) { return selector(Selector.remainder(left, right)); } @@ -243,8 +243,8 @@ default Select remainder(@NonNull Selector left, @NonNull Selector right) { * * @see Selector#negate(Selector) */ - @NonNull - default Select negate(@NonNull Selector argument) { + @Nonnull + default Select negate(@Nonnull Selector argument) { return selector(Selector.negate(argument)); } @@ -255,8 +255,8 @@ default Select negate(@NonNull Selector argument) { * * @see Selector#field(Selector, CqlIdentifier) */ - @NonNull - default Select field(@NonNull Selector udt, @NonNull CqlIdentifier fieldId) { + @Nonnull + default Select field(@Nonnull Selector udt, @Nonnull CqlIdentifier fieldId) { return selector(Selector.field(udt, fieldId)); } @@ -264,8 +264,8 @@ default Select field(@NonNull Selector udt, @NonNull CqlIdentifier fieldId) { * Shortcut for {@link #field(Selector, CqlIdentifier) field(udt, * CqlIdentifier.fromCql(fieldName))}. */ - @NonNull - default Select field(@NonNull Selector udt, @NonNull String fieldName) { + @Nonnull + default Select field(@Nonnull Selector udt, @Nonnull String fieldName) { return field(udt, CqlIdentifier.fromCql(fieldName)); } @@ -278,8 +278,8 @@ default Select field(@NonNull Selector udt, @NonNull String fieldName) { * * @see Selector#field(CqlIdentifier, CqlIdentifier) */ - @NonNull - default Select field(@NonNull CqlIdentifier udtColumnId, @NonNull CqlIdentifier fieldId) { + @Nonnull + default Select field(@Nonnull CqlIdentifier udtColumnId, @Nonnull CqlIdentifier fieldId) { return field(Selector.column(udtColumnId), fieldId); } @@ -289,8 +289,8 @@ default Select field(@NonNull CqlIdentifier udtColumnId, @NonNull CqlIdentifier * * @see Selector#field(String, String) */ - @NonNull - default Select field(@NonNull String udtColumnName, @NonNull String fieldName) { + @Nonnull + default Select field(@Nonnull String udtColumnName, @Nonnull String fieldName) { return field(CqlIdentifier.fromCql(udtColumnName), CqlIdentifier.fromCql(fieldName)); } @@ -304,8 +304,8 @@ default Select field(@NonNull String udtColumnName, @NonNull String fieldName) { * * @see Selector#element(Selector, Term) */ - @NonNull - default Select element(@NonNull Selector collection, @NonNull Term index) { + @Nonnull + default Select element(@Nonnull Selector collection, @Nonnull Term index) { return selector(Selector.element(collection, index)); } @@ -317,8 +317,8 @@ default Select element(@NonNull Selector collection, @NonNull Term index) { * * @see Selector#element(CqlIdentifier, Term) */ - @NonNull - default Select element(@NonNull CqlIdentifier collectionId, @NonNull Term index) { + @Nonnull + default Select element(@Nonnull CqlIdentifier collectionId, @Nonnull Term index) { return element(Selector.column(collectionId), index); } @@ -328,8 +328,8 @@ default Select element(@NonNull CqlIdentifier collectionId, @NonNull Term index) * * @see Selector#element(String, Term) */ - @NonNull - default Select element(@NonNull String collectionName, @NonNull Term index) { + @Nonnull + default Select element(@Nonnull String collectionName, @Nonnull Term index) { return element(CqlIdentifier.fromCql(collectionName), index); } @@ -349,8 +349,8 @@ default Select element(@NonNull String collectionName, @NonNull Term index) { * only left-bound. * @see Selector#range(Selector, Term, Term) */ - @NonNull - default Select range(@NonNull Selector collection, @Nullable Term left, @Nullable Term right) { + @Nonnull + default Select range(@Nonnull Selector collection, @Nullable Term left, @Nullable Term right) { return selector(Selector.range(collection, left, right)); } @@ -362,9 +362,9 @@ default Select range(@NonNull Selector collection, @Nullable Term left, @Nullabl * * @see Selector#range(CqlIdentifier, Term, Term) */ - @NonNull + @Nonnull default Select range( - @NonNull CqlIdentifier collectionId, @Nullable Term left, @Nullable Term right) { + @Nonnull CqlIdentifier collectionId, @Nullable Term left, @Nullable Term right) { return range(Selector.column(collectionId), left, right); } @@ -374,8 +374,8 @@ default Select range( * * @see Selector#range(String, Term, Term) */ - @NonNull - default Select range(@NonNull String collectionName, @Nullable Term left, @Nullable Term right) { + @Nonnull + default Select range(@Nonnull String collectionName, @Nullable Term left, @Nullable Term right) { return range(CqlIdentifier.fromCql(collectionName), left, right); } @@ -392,14 +392,14 @@ default Select range(@NonNull String collectionName, @Nullable Term left, @Nulla * @throws IllegalArgumentException if any of the selectors is aliased. * @see Selector#listOf(Iterable) */ - @NonNull - default Select listOf(@NonNull Iterable elementSelectors) { + @Nonnull + default Select listOf(@Nonnull Iterable elementSelectors) { return selector(Selector.listOf(elementSelectors)); } /** Var-arg equivalent of {@link #listOf(Iterable)}. */ - @NonNull - default Select listOf(@NonNull Selector... elementSelectors) { + @Nonnull + default Select listOf(@Nonnull Selector... elementSelectors) { return listOf(Arrays.asList(elementSelectors)); } @@ -416,14 +416,14 @@ default Select listOf(@NonNull Selector... elementSelectors) { * @throws IllegalArgumentException if any of the selectors is aliased. * @see Selector#setOf(Iterable) */ - @NonNull - default Select setOf(@NonNull Iterable elementSelectors) { + @Nonnull + default Select setOf(@Nonnull Iterable elementSelectors) { return selector(Selector.setOf(elementSelectors)); } /** Var-arg equivalent of {@link #setOf(Iterable)}. */ - @NonNull - default Select setOf(@NonNull Selector... elementSelectors) { + @Nonnull + default Select setOf(@Nonnull Selector... elementSelectors) { return setOf(Arrays.asList(elementSelectors)); } @@ -438,14 +438,14 @@ default Select setOf(@NonNull Selector... elementSelectors) { * @throws IllegalArgumentException if any of the selectors is aliased. * @see Selector#tupleOf(Iterable) */ - @NonNull - default Select tupleOf(@NonNull Iterable elementSelectors) { + @Nonnull + default Select tupleOf(@Nonnull Iterable elementSelectors) { return selector(Selector.tupleOf(elementSelectors)); } /** Var-arg equivalent of {@link #tupleOf(Iterable)}. */ - @NonNull - default Select tupleOf(@NonNull Selector... elementSelectors) { + @Nonnull + default Select tupleOf(@Nonnull Selector... elementSelectors) { return tupleOf(Arrays.asList(elementSelectors)); } @@ -473,8 +473,8 @@ default Select tupleOf(@NonNull Selector... elementSelectors) { * @throws IllegalArgumentException if any of the selectors is aliased. * @see Selector#mapOf(Map) */ - @NonNull - default Select mapOf(@NonNull Map elementSelectors) { + @Nonnull + default Select mapOf(@Nonnull Map elementSelectors) { return selector(Selector.mapOf(elementSelectors)); } @@ -491,11 +491,11 @@ default Select mapOf(@NonNull Map elementSelectors) { * @see #mapOf(Map) * @see Selector#mapOf(Map, DataType, DataType) */ - @NonNull + @Nonnull default Select mapOf( - @NonNull Map elementSelectors, - @NonNull DataType keyType, - @NonNull DataType valueType) { + @Nonnull Map elementSelectors, + @Nonnull DataType keyType, + @Nonnull DataType valueType) { return selector(Selector.mapOf(elementSelectors, keyType, valueType)); } @@ -509,8 +509,8 @@ default Select mapOf( * * @see Selector#typeHint(Selector, DataType) */ - @NonNull - default Select typeHint(@NonNull Selector selector, @NonNull DataType targetType) { + @Nonnull + default Select typeHint(@Nonnull Selector selector, @Nonnull DataType targetType) { return selector(Selector.typeHint(selector, targetType)); } @@ -525,9 +525,9 @@ default Select typeHint(@NonNull Selector selector, @NonNull DataType targetType * @throws IllegalArgumentException if any of the selectors is aliased. * @see Selector#function(CqlIdentifier, Iterable) */ - @NonNull + @Nonnull default Select function( - @NonNull CqlIdentifier functionId, @NonNull Iterable arguments) { + @Nonnull CqlIdentifier functionId, @Nonnull Iterable arguments) { return selector(Selector.function(functionId, arguments)); } @@ -536,8 +536,8 @@ default Select function( * * @see Selector#function(CqlIdentifier, Selector...) */ - @NonNull - default Select function(@NonNull CqlIdentifier functionId, @NonNull Selector... arguments) { + @Nonnull + default Select function(@Nonnull CqlIdentifier functionId, @Nonnull Selector... arguments) { return function(functionId, Arrays.asList(arguments)); } @@ -547,8 +547,8 @@ default Select function(@NonNull CqlIdentifier functionId, @NonNull Selector... * * @see Selector#function(String, Iterable) */ - @NonNull - default Select function(@NonNull String functionName, @NonNull Iterable arguments) { + @Nonnull + default Select function(@Nonnull String functionName, @Nonnull Iterable arguments) { return function(CqlIdentifier.fromCql(functionName), arguments); } @@ -557,8 +557,8 @@ default Select function(@NonNull String functionName, @NonNull Iterable arguments) { + @Nonnull CqlIdentifier functionId, + @Nonnull Iterable arguments) { return selector(Selector.function(keyspaceId, functionId, arguments)); } @@ -586,11 +586,11 @@ default Select function( * * @see Selector#function(CqlIdentifier, CqlIdentifier, Selector...) */ - @NonNull + @Nonnull default Select function( @Nullable CqlIdentifier keyspaceId, - @NonNull CqlIdentifier functionId, - @NonNull Selector... arguments) { + @Nonnull CqlIdentifier functionId, + @Nonnull Selector... arguments) { return function(keyspaceId, functionId, Arrays.asList(arguments)); } @@ -600,11 +600,11 @@ default Select function( * * @see Selector#function(String, String, Iterable) */ - @NonNull + @Nonnull default Select function( @Nullable String keyspaceName, - @NonNull String functionName, - @NonNull Iterable arguments) { + @Nonnull String functionName, + @Nonnull Iterable arguments) { return function( keyspaceName == null ? null : CqlIdentifier.fromCql(keyspaceName), CqlIdentifier.fromCql(functionName), @@ -616,9 +616,9 @@ default Select function( * * @see Selector#function(String, String, Selector...) */ - @NonNull + @Nonnull default Select function( - @Nullable String keyspaceName, @NonNull String functionName, @NonNull Selector... arguments) { + @Nullable String keyspaceName, @Nonnull String functionName, @Nonnull Selector... arguments) { return function(keyspaceName, functionName, Arrays.asList(arguments)); } @@ -628,8 +628,8 @@ default Select function( * * @see Selector#writeTime(CqlIdentifier) */ - @NonNull - default Select writeTime(@NonNull CqlIdentifier columnId) { + @Nonnull + default Select writeTime(@Nonnull CqlIdentifier columnId) { return selector(Selector.writeTime(columnId)); } @@ -638,8 +638,8 @@ default Select writeTime(@NonNull CqlIdentifier columnId) { * * @see Selector#writeTime(String) */ - @NonNull - default Select writeTime(@NonNull String columnName) { + @Nonnull + default Select writeTime(@Nonnull String columnName) { return writeTime(CqlIdentifier.fromCql(columnName)); } @@ -649,8 +649,8 @@ default Select writeTime(@NonNull String columnName) { * * @see Selector#ttl(CqlIdentifier) */ - @NonNull - default Select ttl(@NonNull CqlIdentifier columnId) { + @Nonnull + default Select ttl(@Nonnull CqlIdentifier columnId) { return selector(Selector.ttl(columnId)); } @@ -659,8 +659,8 @@ default Select ttl(@NonNull CqlIdentifier columnId) { * * @see Selector#ttl(String) */ - @NonNull - default Select ttl(@NonNull String columnName) { + @Nonnull + default Select ttl(@Nonnull String columnName) { return ttl(CqlIdentifier.fromCql(columnName)); } @@ -676,8 +676,8 @@ default Select ttl(@NonNull String columnName) { * @throws IllegalArgumentException if the selector is aliased. * @see Selector#cast(Selector, DataType) */ - @NonNull - default Select cast(@NonNull Selector selector, @NonNull DataType targetType) { + @Nonnull + default Select cast(@Nonnull Selector selector, @Nonnull DataType targetType) { return selector(Selector.cast(selector, targetType)); } @@ -686,14 +686,14 @@ default Select cast(@NonNull Selector selector, @NonNull DataType targetType) { * * @see Selector#toDate(CqlIdentifier) */ - @NonNull - default Select toDate(@NonNull CqlIdentifier columnId) { + @Nonnull + default Select toDate(@Nonnull CqlIdentifier columnId) { return selector(Selector.toDate(columnId)); } /** Shortcut for {@link #toDate(CqlIdentifier) toDate(CqlIdentifier.fromCql(columnName))}. */ - @NonNull - default Select toDate(@NonNull String columnName) { + @Nonnull + default Select toDate(@Nonnull String columnName) { return toDate(CqlIdentifier.fromCql(columnName)); } @@ -702,8 +702,8 @@ default Select toDate(@NonNull String columnName) { * * @see Selector#toTimestamp(CqlIdentifier) */ - @NonNull - default Select toTimestamp(@NonNull CqlIdentifier columnId) { + @Nonnull + default Select toTimestamp(@Nonnull CqlIdentifier columnId) { return selector(Selector.toTimestamp(columnId)); } @@ -711,8 +711,8 @@ default Select toTimestamp(@NonNull CqlIdentifier columnId) { * Shortcut for {@link #toTimestamp(CqlIdentifier) * toTimestamp(CqlIdentifier.fromCql(columnName))}. */ - @NonNull - default Select toTimestamp(@NonNull String columnName) { + @Nonnull + default Select toTimestamp(@Nonnull String columnName) { return toTimestamp(CqlIdentifier.fromCql(columnName)); } @@ -721,8 +721,8 @@ default Select toTimestamp(@NonNull String columnName) { * * @see Selector#toUnixTimestamp(CqlIdentifier) */ - @NonNull - default Select toUnixTimestamp(@NonNull CqlIdentifier columnId) { + @Nonnull + default Select toUnixTimestamp(@Nonnull CqlIdentifier columnId) { return selector(Selector.toUnixTimestamp(columnId)); } @@ -730,8 +730,8 @@ default Select toUnixTimestamp(@NonNull CqlIdentifier columnId) { * Shortcut for {@link #toUnixTimestamp(CqlIdentifier) * toUnixTimestamp(CqlIdentifier.fromCql(columnName))}. */ - @NonNull - default Select toUnixTimestamp(@NonNull String columnName) { + @Nonnull + default Select toUnixTimestamp(@Nonnull String columnName) { return toUnixTimestamp(CqlIdentifier.fromCql(columnName)); } @@ -751,7 +751,7 @@ default Select toUnixTimestamp(@NonNull String columnName) { * value}. * @see QueryBuilder#literal(Object) */ - @NonNull + @Nonnull default Select literal(@Nullable Object value) { return literal(value, CodecRegistry.DEFAULT); } @@ -768,8 +768,8 @@ default Select literal(@Nullable Object value) { * handle {@code value}. * @see QueryBuilder#literal(Object, CodecRegistry) */ - @NonNull - default Select literal(@Nullable Object value, @NonNull CodecRegistry codecRegistry) { + @Nonnull + default Select literal(@Nullable Object value, @Nonnull CodecRegistry codecRegistry) { return literal(value, (value == null) ? null : codecRegistry.codecFor(value)); } @@ -781,7 +781,7 @@ default Select literal(@Nullable Object value, @NonNull CodecRegistry codecRegis * * @see QueryBuilder#literal(Object, TypeCodec) */ - @NonNull + @Nonnull default Select literal(@Nullable T value, @Nullable TypeCodec codec) { return selector(QueryBuilder.literal(value, codec)); } @@ -797,8 +797,8 @@ default Select literal(@Nullable T value, @Nullable TypeCodec codec) { *

    This is a shortcut for {@link #selector(Selector) * selector(QueryBuilder.raw(rawExpression))}. */ - @NonNull - default Select raw(@NonNull String rawExpression) { + @Nonnull + default Select raw(@Nonnull String rawExpression) { return selector(QueryBuilder.raw(rawExpression)); } @@ -817,12 +817,12 @@ default Select raw(@NonNull String rawExpression) { * query will fail at runtime. * */ - @NonNull - Select as(@NonNull CqlIdentifier alias); + @Nonnull + Select as(@Nonnull CqlIdentifier alias); /** Shortcut for {@link #as(CqlIdentifier) as(CqlIdentifier.fromCql(alias))} */ - @NonNull - default Select as(@NonNull String alias) { + @Nonnull + default Select as(@Nonnull String alias) { return as(CqlIdentifier.fromCql(alias)); } } diff --git a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/Select.java b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/Select.java index a22b45c35bd..64af71ea974 100644 --- a/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/Select.java +++ b/query-builder/src/main/java/com/datastax/oss/driver/api/querybuilder/select/Select.java @@ -25,10 +25,10 @@ import com.datastax.oss.driver.api.querybuilder.relation.OngoingWhereClause; import com.datastax.oss.driver.internal.core.CqlIdentifiers; import com.datastax.oss.driver.shaded.guava.common.collect.Iterables; -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Arrays; import java.util.Map; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * A complete SELECT query. @@ -44,12 +44,12 @@ public interface Select extends OngoingSelection, OngoingWhereClause